On 20/03/2023 09:51, Alex Lennon wrote:
Thanks - have you any idea what’s gone on upstream? Can’t quite see how the commit has gone off the branch unless somebody has done some weird force push?
As Pawel suggested, morello/master has been rebased on 6.1, following morello/next. The rebase of next was announced a few weeks ago [1], master was then aligned with next last week. It does mean force-pushing unfortunately. Will make sure to send an email to both lists when rebasing master next time round.
If you want to use a fixed revision, I think Pawel's patch makes sense - it may disappear from master as we rebase, but it will always remain reachable at least through a morello-last-* tag.
Going forward, it may be better to use a release tag than an arbitrary revision.
Kevin
[1] https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org/...
On 20 Mar 2023, at 08:35, Pawel Zalewski pzalewski@thegoodpenguin.co.uk wrote:
Hi Alex,
This is not tested as I am ahead where the repo tree is split between meta-morello and meta-morello-toolchain layers, but you can give this a go:
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 c188ade..99a117e 100644 --- a/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb +++ b/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb @@ -11,10 +11,9 @@ PROVIDES = "${OUTPUTS_NAME}-native" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
SRC_URI = " \
- git://git.morello-project.org/morello/kernel/linux;protocol=https;branch=${SRCBRANCH}
\
- git://git.morello-project.org/morello/kernel/linux;protocol=https;nobranch=1
\ "
-SRCBRANCH = "morello/master" SRCREV = "87d06928f90fe910311210a0149d03f3420f593c"
S = "${WORKDIR}/git/usr" diff --git a/recipes-kernel/linux/linux-morello.inc b/recipes-kernel/linux/linux-morello.inc index 30f681f..8ab7833 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;branch=${SRCBRANCH}
\
- git://git.morello-project.org/morello/kernel/linux;protocol=https;nobranch=1
\ "
PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/recipes-kernel/linux/linux-morello_1.5.bb b/recipes-kernel/linux/linux-morello_1.5.bb index db43225..169776b 100644 --- a/recipes-kernel/linux/linux-morello_1.5.bb +++ b/recipes-kernel/linux/linux-morello_1.5.bb @@ -3,7 +3,6 @@ require linux-morello.inc LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
SRCREV = "87d06928f90fe910311210a0149d03f3420f593c" -SRCBRANCH = "morello/master"
LINUX_VERSION = "5.18" LINUX_VERSION_EXTENSION= "-yocto-purecap"
Pawel
linux-morello-distros mailing list -- linux-morello-distros@op-lists.linaro.org To unsubscribe send an email to linux-morello-distros-leave@op-lists.linaro.org