musl-morello-1.5.inc is not referenced anywhere but contains the branch and srcrev. Remove this file and transfer the data to musl-morello-common.inc, which appears to be used by musl-morello-a64.inc and musl-morello-c64.inc
Signed-off-by: Jon Mason jon.mason@arm.com --- recipes-core/musl/musl-morello-1.5.inc | 4 ---- recipes-core/musl/musl-morello-common.inc | 10 +++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 recipes-core/musl/musl-morello-1.5.inc
diff --git a/recipes-core/musl/musl-morello-1.5.inc b/recipes-core/musl/musl-morello-1.5.inc deleted file mode 100644 index 750120da99ce..000000000000 --- a/recipes-core/musl/musl-morello-1.5.inc +++ /dev/null @@ -1,4 +0,0 @@ -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" - -SRCBRANCH = "morello/master" -SRCTAG = "morello-release-1.5.0" \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-common.inc b/recipes-core/musl/musl-morello-common.inc index 158331c6f980..c0ada533a6da 100644 --- a/recipes-core/musl/musl-morello-common.inc +++ b/recipes-core/musl/musl-morello-common.inc @@ -6,11 +6,15 @@ FILESEXTRAPATHS:prepend := "${THISDIR}:"
SUMMARY = "CHERI enabled musl libc" SRC_URI = " \ - git://git.morello-project.org/morello/musl-libc;protocol=https;tag=${SRCTAG};branch=${SRCBRANCH} \ + git://git.morello-project.org/morello/musl-libc;protocol=https;branch=${SRCBRANCH} \ file://files/compiler_rt.cmake \ "
-SRCREV ="" +# morello-release-1.5.0 +SRCREV = "df8f6409fb58efe35a3300b91a1f1941e2f89022" +SRCBRANCH = "morello/master" + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68"
PV = "git${SRCPV}" S = "${WORKDIR}/git" @@ -60,4 +64,4 @@ do_configure() { do_compile() { export CFLAGS="" oe_runmake -} \ No newline at end of file +}