| Message ID | 20250625180650.17820-1-reatmon@ti.com |
|---|---|
| State | Under Review |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master,1/7] meta-ti/linux: Update for S changes | expand |
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb index 805c3a84..067c9ddf 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb @@ -53,7 +53,7 @@ PB-MIKROBUS-0.dtbo \ PB-MIKROBUS-1.dtbo \ " -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" # 6.1.83 version for 32-bit SRCREV:armv7a = "be9b910b08dfd674e47a2643f35080b005ac3792" diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb index e3521505..6e221d1b 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb @@ -53,7 +53,7 @@ ${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \ ${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \ " -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" # 6.12.22 version for 32-bit SRCREV:armv7a = "d7f560ef48a867b94959f040b4c3c57053f4e32d" diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb index c6dcdfd2..cc7a56ac 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb @@ -53,7 +53,7 @@ ${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \ ${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \ " -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" # 6.6.58 version for 32-bit SRCREV:armv7a = "0d043a88f69f48789e43526d7a807ab744708071" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index 4e9ae3a1..388110ad 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -11,7 +11,7 @@ DEPENDS += "gmp-native libmpc-native" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" # 6.12 Mainline version SRCREV = "adc218676eef25575469234709c2d87185ca223a" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb index 7c91a3d4..97fa6463 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb @@ -19,7 +19,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ ${EXTRA_DTC_ARGS}" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" BRANCH ?= "ti-linux-6.1.y" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb index 3ea4e6a6..58a6ac2e 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb @@ -19,7 +19,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ ${EXTRA_DTC_ARGS}" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" BRANCH ?= "ti-linux-6.12.y" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb index 1eaa859d..4714bba1 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb @@ -19,7 +19,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ ${EXTRA_DTC_ARGS}" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" BRANCH ?= "ti-linux-6.6.y"
The kernel class operates a little differently. The kernel is downloaded and then moved to the "global" shared location and a symlink is created to point to that location. Since we cannot set S = "${WORKDIR}/git" anymore, just choose a new name under UNPACKDIR. The value for BB_GIT_DEFAULT_DESTSUFFIX is the subdir name that is used by default when fetching git repositories, so just use that name. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb | 2 +- meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb | 2 +- meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)