Remove SRVTAG and use SRCREV to match standard Yocto practice. Also, rename files with version to have the versions separated to allow for versionless bbappends to be used.
Signed-off-by: Jon Mason jon.mason@arm.com --- conf/machine/include/morello-common.inc | 5 ++++- recipes-core/busybox/busybox-morello.inc | 4 ++-- .../{busybox-morello-1.5.bb => busybox-morello_1.5.bb} | 2 +- recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb | 6 +++--- recipes-kernel/linux/linux-morello.inc | 4 ++-- .../linux/{linux-morello-1.5.bb => linux-morello_1.5.bb} | 6 ++++-- 6 files changed, 16 insertions(+), 11 deletions(-) rename recipes-core/busybox/{busybox-morello-1.5.bb => busybox-morello_1.5.bb} (79%) rename recipes-kernel/linux/{linux-morello-1.5.bb => linux-morello_1.5.bb} (57%)
diff --git a/conf/machine/include/morello-common.inc b/conf/machine/include/morello-common.inc index cea499653c3c..84af1345cd95 100644 --- a/conf/machine/include/morello-common.inc +++ b/conf/machine/include/morello-common.inc @@ -2,6 +2,9 @@ require ${COREBASE}/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc
MACHINEOVERRIDES =. "morello"
+PREFERRED_PROVIDER_virtual/kernel = "linux-morello" +PREFERRED_VERSION_virtual/kernel = "1.5" + LLVM_SHARED_SOURCE ?= "${TMPDIR}/work-shared/${MACHINE}/llvm-morello-source"
MUSL_INSTALL_DIR ??="" @@ -23,4 +26,4 @@ GLOBAL_ARCH_FLAGS ?= "${C64_ARCH_FLAGS}" TMPDIR_BSP = "tmp-bsp" TMPDIR_LINUX = "tmp-linux"
-APP_DIR ?= "pure-cap-apps" \ No newline at end of file +APP_DIR ?= "pure-cap-apps" diff --git a/recipes-core/busybox/busybox-morello.inc b/recipes-core/busybox/busybox-morello.inc index 695321356432..7c5fd9d4a144 100644 --- a/recipes-core/busybox/busybox-morello.inc +++ b/recipes-core/busybox/busybox-morello.inc @@ -13,7 +13,7 @@ PROVIDES += "virtual/morello-busybox" RPROVIDES:${PN} += "busybox-morello"
SRC_URI = " \ - git://git.morello-project.org/morello/morello-busybox;protocol=https;tag=${SRCTAG};branch=${SRCBRANCH} \ + git://git.morello-project.org/morello/morello-busybox;protocol=https;branch=${SRCBRANCH} \ file://files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch \ "
@@ -49,4 +49,4 @@ do_compile() { do_install() { install -d ${D}/busybox install -m 0755 ${S}/busybox ${D}/busybox/busybox -} \ No newline at end of file +} diff --git a/recipes-core/busybox/busybox-morello-1.5.bb b/recipes-core/busybox/busybox-morello_1.5.bb similarity index 79% rename from recipes-core/busybox/busybox-morello-1.5.bb rename to recipes-core/busybox/busybox-morello_1.5.bb index 46411b6a1d2c..0fdc60ce58dc 100644 --- a/recipes-core/busybox/busybox-morello-1.5.bb +++ b/recipes-core/busybox/busybox-morello_1.5.bb @@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \ file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383dae"
SRCBRANCH = "morello/master" -SRCTAG = "morello-release-1.5.0" \ No newline at end of file +SRCREV = "0f2436d16ddbca4467808735b1357b46e67aeddf" diff --git a/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb b/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb index 5041b9d4b811..c188adecfebd 100644 --- a/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb +++ b/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb @@ -11,11 +11,11 @@ PROVIDES = "${OUTPUTS_NAME}-native" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
SRC_URI = " \ - git://git.morello-project.org/morello/kernel/linux;protocol=https;tag=${SRCTAG};branch=${SRCBRANCH} \ + git://git.morello-project.org/morello/kernel/linux;protocol=https;branch=${SRCBRANCH} \ "
SRCBRANCH = "morello/master" -SRCTAG = "morello-release-1.5.0" +SRCREV = "87d06928f90fe910311210a0149d03f3420f593c"
S = "${WORKDIR}/git/usr"
@@ -31,4 +31,4 @@ do_compile(){ do_install(){ install -d ${D}${bindir} install -m 0744 ${S}/gen_init_cpio ${D}${bindir}/gen_init_cpio -} \ No newline at end of file +} diff --git a/recipes-kernel/linux/linux-morello.inc b/recipes-kernel/linux/linux-morello.inc index a5effbb50694..cb9f1db54ae8 100644 --- a/recipes-kernel/linux/linux-morello.inc +++ b/recipes-kernel/linux/linux-morello.inc @@ -12,7 +12,7 @@ DEPENDS += "rsync-native" PROVIDES += "virtual/${OUTPUTS_NAME}"
SRC_URI = " \ - git://git.morello-project.org/morello/kernel/linux;protocol=https;tag=${SRCTAG};branch=${SRCBRANCH} \ + git://git.morello-project.org/morello/kernel/linux;protocol=https;branch=${SRCBRANCH} \ "
PV = "${LINUX_VERSION}+git${SRCPV}" @@ -44,4 +44,4 @@ do_configure:prepend(){
do_install:append() { oe_runmake headers_install ARCH=arm64 INSTALL_HDR_PATH=${STAGING_KERNEL_BUILDDIR}/kernel-headers -} \ No newline at end of file +} diff --git a/recipes-kernel/linux/linux-morello-1.5.bb b/recipes-kernel/linux/linux-morello_1.5.bb similarity index 57% rename from recipes-kernel/linux/linux-morello-1.5.bb rename to recipes-kernel/linux/linux-morello_1.5.bb index ea3e0cadebe6..db43225633d3 100644 --- a/recipes-kernel/linux/linux-morello-1.5.bb +++ b/recipes-kernel/linux/linux-morello_1.5.bb @@ -2,8 +2,10 @@ require linux-morello.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+SRCREV = "87d06928f90fe910311210a0149d03f3420f593c" SRCBRANCH = "morello/master" -SRCTAG = "morello-release-1.5.0"
LINUX_VERSION = "5.18" -LINUX_VERSION_EXTENSION= "-yocto-purecap" \ No newline at end of file +LINUX_VERSION_EXTENSION= "-yocto-purecap" + +COMPATIBLE_MACHINE = "morello"