| Message ID | 20260817113420.750731-3-felix.moessbauer@siemens.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | Fix single-name single-content rule for kernel packages | expand |
On 17.08.26 13:34, Felix Moessbauer wrote: > This defconfig is a reasonable default for all amd64 machines. We now > make it the default for that architecture for linux-cip and > linux-mainline. Further, we only add it to the SRC_URI if actually > needed. > You should leave a reasoning here as well. > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb | 3 ++- > meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb | 4 ++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb b/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb > index 1f4d75bc..e2775c8d 100644 > --- a/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb > +++ b/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb > @@ -13,4 +13,5 @@ SRC_URI += " \ > > SRCREV = "af3adf9f9c633ac0e1d68487d7fad22285dda8a3" > > -KERNEL_DEFCONFIG:qemuamd64-cip = "x86_64_defconfig" > +SRC_URI:append:amd64 = " file://${KERNEL_DEFCONFIG}" We already have file://x86_64_defconfig in SRC_URI - drop that other statement then. > +KERNEL_DEFCONFIG:amd64 = "x86_64_defconfig" > diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb b/meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb > index 10444680..786a9db8 100644 > --- a/meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb > +++ b/meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb > @@ -11,7 +11,6 @@ ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else > > SRC_URI += " \ > https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz \ > - file://x86_64_defconfig \ > file://ftpm-module.cfg \ > file://subdir \ > file://no-root-nfs.cfg;apply=no" > @@ -20,7 +19,8 @@ SRC_URI[sha256sum] = "e35ac999f40a6874493d8d60f33f1150d7a89ae5841c428da82257fbcd > > S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" > > -KERNEL_DEFCONFIG:qemuamd64 = "x86_64_defconfig" > +SRC_URI:append:amd64 = " file://${KERNEL_DEFCONFIG}" > +KERNEL_DEFCONFIG:amd64 = "x86_64_defconfig" > > LINUX_VERSION_EXTENSION = "-isar" > Jan
diff --git a/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb b/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb index 1f4d75bc..e2775c8d 100644 --- a/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb +++ b/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb @@ -13,4 +13,5 @@ SRC_URI += " \ SRCREV = "af3adf9f9c633ac0e1d68487d7fad22285dda8a3" -KERNEL_DEFCONFIG:qemuamd64-cip = "x86_64_defconfig" +SRC_URI:append:amd64 = " file://${KERNEL_DEFCONFIG}" +KERNEL_DEFCONFIG:amd64 = "x86_64_defconfig" diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb b/meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb index 10444680..786a9db8 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb @@ -11,7 +11,6 @@ ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else SRC_URI += " \ https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz \ - file://x86_64_defconfig \ file://ftpm-module.cfg \ file://subdir \ file://no-root-nfs.cfg;apply=no" @@ -20,7 +19,8 @@ SRC_URI[sha256sum] = "e35ac999f40a6874493d8d60f33f1150d7a89ae5841c428da82257fbcd S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" -KERNEL_DEFCONFIG:qemuamd64 = "x86_64_defconfig" +SRC_URI:append:amd64 = " file://${KERNEL_DEFCONFIG}" +KERNEL_DEFCONFIG:amd64 = "x86_64_defconfig" LINUX_VERSION_EXTENSION = "-isar"
This defconfig is a reasonable default for all amd64 machines. We now make it the default for that architecture for linux-cip and linux-mainline. Further, we only add it to the SRC_URI if actually needed. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb | 3 ++- meta-isar/recipes-kernel/linux/linux-mainline_6.12.85.bb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)