| Message ID | 20250801133958.22623-1-reatmon@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-ti,master] linux-ti-*: Move KERNEL_BASE_CLASS default | expand |
On Fri, Aug 01, 2025 at 08:39:58AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > If you are trying to build a TI kernel and not building a TI machine Based on the original report, it breaks during parsing of meta-ti for any non-TI machine, not even trying to build a kernel... > then KERNEL_BASE_CLASS is not defined and you get a parse error. Move > the default setting out of ti-soc.inc and into ti-kernel.inc. > > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > meta-ti-bsp/conf/machine/include/ti-soc.inc | 3 --- > meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 4 ++-- > meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb | 3 ++- > meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb | 3 ++- > meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc | 2 ++ > 5 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc > index 3f11e31d..018e9bfb 100644 > --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc > +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc > @@ -12,9 +12,6 @@ UBOOT_RD_ENTRYPOINT = "0x84000000" > # TI platforms all use devicetrees with overlays > MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" > > -# All machines should start off pointing at the default base kernel class > -KERNEL_BASE_CLASS = "kernel" > - > # Tell the kernel class to install the DTBs in the same directory structure as > # the kernel > KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb" > 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 51723fc0..92fb1e6c 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 > @@ -3,10 +3,10 @@ SUMMARY = "Mainline Linux kernel for TI devices" > LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" > > -inherit ${KERNEL_BASE_CLASS} > - > require recipes-kernel/linux/ti-kernel.inc > > +inherit ${KERNEL_BASE_CLASS} > + > DEPENDS += "gmp-native libmpc-native" > > KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" > 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 51e4b604..d36485fb 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 > @@ -3,10 +3,11 @@ SUMMARY = "Linux kernel for TI devices" > LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" > > +require recipes-kernel/linux/ti-kernel.inc > + > inherit ${KERNEL_BASE_CLASS} > > require recipes-kernel/linux/setup-defconfig.inc > -require recipes-kernel/linux/ti-kernel.inc > include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} > > DEPENDS += "gmp-native libmpc-native" > 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 321cdcbb..b6d882d8 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 > @@ -3,10 +3,11 @@ SUMMARY = "Linux kernel for TI devices" > LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" > > +require recipes-kernel/linux/ti-kernel.inc > + > inherit ${KERNEL_BASE_CLASS} > > require recipes-kernel/linux/setup-defconfig.inc > -require recipes-kernel/linux/ti-kernel.inc > include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} > > DEPENDS += "gmp-native libmpc-native" > diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc > index ef4ba4a1..32b6c95d 100644 > --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc > +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc > @@ -4,6 +4,8 @@ KERNEL_GIT_BRANCH ?= "branch=${BRANCH}" > > KERNEL_DEFCONFIG ?= "file://defconfig" > > +KERNEL_BASE_CLASS ?= "kernel" > + > KERNEL_REPRODUCIBILITY_PATCHES ?= "" > > SRC_URI = " \ > -- > 2.17.1
On 8/1/2025 9:39 AM, Denys Dmytriyenko wrote: > On Fri, Aug 01, 2025 at 08:39:58AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: >> If you are trying to build a TI kernel and not building a TI machine > > Based on the original report, it breaks during parsing of meta-ti for any > non-TI machine, not even trying to build a kernel... Good point. > >> then KERNEL_BASE_CLASS is not defined and you get a parse error. Move >> the default setting out of ti-soc.inc and into ti-kernel.inc. >> >> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >> --- >> meta-ti-bsp/conf/machine/include/ti-soc.inc | 3 --- >> meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 4 ++-- >> meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb | 3 ++- >> meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb | 3 ++- >> meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc | 2 ++ >> 5 files changed, 8 insertions(+), 7 deletions(-) >> >> diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc >> index 3f11e31d..018e9bfb 100644 >> --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc >> +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc >> @@ -12,9 +12,6 @@ UBOOT_RD_ENTRYPOINT = "0x84000000" >> # TI platforms all use devicetrees with overlays >> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" >> >> -# All machines should start off pointing at the default base kernel class >> -KERNEL_BASE_CLASS = "kernel" >> - >> # Tell the kernel class to install the DTBs in the same directory structure as >> # the kernel >> KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb" >> 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 51723fc0..92fb1e6c 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 >> @@ -3,10 +3,10 @@ SUMMARY = "Mainline Linux kernel for TI devices" >> LICENSE = "GPL-2.0-only" >> LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" >> >> -inherit ${KERNEL_BASE_CLASS} >> - >> require recipes-kernel/linux/ti-kernel.inc >> >> +inherit ${KERNEL_BASE_CLASS} >> + >> DEPENDS += "gmp-native libmpc-native" >> >> KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" >> 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 51e4b604..d36485fb 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 >> @@ -3,10 +3,11 @@ SUMMARY = "Linux kernel for TI devices" >> LICENSE = "GPL-2.0-only" >> LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" >> >> +require recipes-kernel/linux/ti-kernel.inc >> + >> inherit ${KERNEL_BASE_CLASS} >> >> require recipes-kernel/linux/setup-defconfig.inc >> -require recipes-kernel/linux/ti-kernel.inc >> include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} >> >> DEPENDS += "gmp-native libmpc-native" >> 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 321cdcbb..b6d882d8 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 >> @@ -3,10 +3,11 @@ SUMMARY = "Linux kernel for TI devices" >> LICENSE = "GPL-2.0-only" >> LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" >> >> +require recipes-kernel/linux/ti-kernel.inc >> + >> inherit ${KERNEL_BASE_CLASS} >> >> require recipes-kernel/linux/setup-defconfig.inc >> -require recipes-kernel/linux/ti-kernel.inc >> include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} >> >> DEPENDS += "gmp-native libmpc-native" >> diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc >> index ef4ba4a1..32b6c95d 100644 >> --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc >> +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc >> @@ -4,6 +4,8 @@ KERNEL_GIT_BRANCH ?= "branch=${BRANCH}" >> >> KERNEL_DEFCONFIG ?= "file://defconfig" >> >> +KERNEL_BASE_CLASS ?= "kernel" >> + >> KERNEL_REPRODUCIBILITY_PATCHES ?= "" >> >> SRC_URI = " \ >> -- >> 2.17.1
meta-ti / na / 20250801133958.22623-1-reatmon PRC Results: PASS master ===================== PASS
meta-ti / na / 20250801133958.22623-1-reatmon PRC Results: PASS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- check-yocto-patches: PASS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Patches ---------------------------------------- All patches passed -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- apply-yocto-patch: PASS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- master ===================== Summary: - Patch Series: [meta-ti][master][PATCH] linux-ti-*: Move KERNEL_BASE_CLASS default - Submitter: From: Ryan Eatmon <reatmon@ti.com> - Date: Date: Fri, 1 Aug 2025 08:39:58 -0500 - Num Patches: 1 - Mailing List (public inbox) Commit SHA: 4a6419bb5add15bfab8802eb7999858d9ebd2772 Applied to: - Repository: lcpd-prc-meta-ti - Base Branch: master-next - Commit Author: LCPD Automation Script <lcpdbld@list.ti.com> - Commit Subject: CI/CD Auto-Merger: cicd.master.202508010100 - Commit SHA: 414080e9729f0e76bb66808fb048f5eba8fe6c8a Patches ---------------------------------------- All patches applied -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- check-yocto-repo: PASS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- master ===================== PASS
diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc index 3f11e31d..018e9bfb 100644 --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc @@ -12,9 +12,6 @@ UBOOT_RD_ENTRYPOINT = "0x84000000" # TI platforms all use devicetrees with overlays MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" -# All machines should start off pointing at the default base kernel class -KERNEL_BASE_CLASS = "kernel" - # Tell the kernel class to install the DTBs in the same directory structure as # the kernel KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb" 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 51723fc0..92fb1e6c 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 @@ -3,10 +3,10 @@ SUMMARY = "Mainline Linux kernel for TI devices" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -inherit ${KERNEL_BASE_CLASS} - require recipes-kernel/linux/ti-kernel.inc +inherit ${KERNEL_BASE_CLASS} + DEPENDS += "gmp-native libmpc-native" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" 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 51e4b604..d36485fb 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 @@ -3,10 +3,11 @@ SUMMARY = "Linux kernel for TI devices" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +require recipes-kernel/linux/ti-kernel.inc + inherit ${KERNEL_BASE_CLASS} require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/ti-kernel.inc include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} DEPENDS += "gmp-native libmpc-native" 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 321cdcbb..b6d882d8 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 @@ -3,10 +3,11 @@ SUMMARY = "Linux kernel for TI devices" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +require recipes-kernel/linux/ti-kernel.inc + inherit ${KERNEL_BASE_CLASS} require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/ti-kernel.inc include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} DEPENDS += "gmp-native libmpc-native" diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc index ef4ba4a1..32b6c95d 100644 --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc @@ -4,6 +4,8 @@ KERNEL_GIT_BRANCH ?= "branch=${BRANCH}" KERNEL_DEFCONFIG ?= "file://defconfig" +KERNEL_BASE_CLASS ?= "kernel" + KERNEL_REPRODUCIBILITY_PATCHES ?= "" SRC_URI = " \
If you are trying to build a TI kernel and not building a TI machine then KERNEL_BASE_CLASS is not defined and you get a parse error. Move the default setting out of ti-soc.inc and into ti-kernel.inc. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- meta-ti-bsp/conf/machine/include/ti-soc.inc | 3 --- meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 4 ++-- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb | 3 ++- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb | 3 ++- meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc | 2 ++ 5 files changed, 8 insertions(+), 7 deletions(-)