| Message ID | 20211210093448.1860864-1-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [isar-cip-core] conf/machine/*: Add variable to set version of kernel defconfig | expand |
On 10.12.21 10:34, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > This fixes an issue, that the defconfig from kernel 4.19.X does not > work with kernel 5.10.X. The kernel boots but cannot find any qemu hard > disk. > > The fix adds the new Variable > KERNEL_DEFCONFIG_VERSION to select to correct path in [1]. > > This fixes issue [17]. > > [1]: https://gitlab.com/cip-project/cip-kernel/cip-kernel-config > [17]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/17 > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > conf/machine/hihope-rzg2m.conf | 3 ++- > conf/machine/qemu-amd64.conf | 3 ++- > conf/machine/qemu-arm.conf | 3 ++- > conf/machine/qemu-arm64.conf | 3 ++- > conf/machine/simatic-ipc227e.conf | 3 ++- > kas/opt/4.19.yml | 2 ++ > kas/opt/4.4.yml | 2 ++ > kas/opt/5.10.yml | 2 ++ > 8 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf > index 4f4ee81..74f03df 100644 > --- a/conf/machine/hihope-rzg2m.conf > +++ b/conf/machine/hihope-rzg2m.conf > @@ -13,7 +13,8 @@ DISTRO_ARCH = "arm64" > > IMAGE_TYPE ?= "wic-img" > > -KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig" > +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" This variable must be set by the kernel recipe, not the machine. Jan > +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig" > USE_CIP_KERNEL_CONFIG = "1" > DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb" > IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}" > diff --git a/conf/machine/qemu-amd64.conf b/conf/machine/qemu-amd64.conf > index c90d957..af20bf4 100644 > --- a/conf/machine/qemu-amd64.conf > +++ b/conf/machine/qemu-amd64.conf > @@ -10,4 +10,5 @@ DISTRO_ARCH = "amd64" > > IMAGE_TYPE ?= "ext4-img" > USE_CIP_KERNEL_CONFIG = "1" > -KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/cip_qemu_defconfig" > +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" > +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_qemu_defconfig" > diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf > index 81a22c1..f9e665d 100644 > --- a/conf/machine/qemu-arm.conf > +++ b/conf/machine/qemu-arm.conf > @@ -11,4 +11,5 @@ DISTRO_ARCH = "armhf" > > IMAGE_TYPE ?= "ext4-img" > USE_CIP_KERNEL_CONFIG = "1" > -KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm/qemu_arm_defconfig" > +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" > +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig" > diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf > index eb34703..1a48093 100644 > --- a/conf/machine/qemu-arm64.conf > +++ b/conf/machine/qemu-arm64.conf > @@ -10,4 +10,5 @@ DISTRO_ARCH = "arm64" > > IMAGE_TYPE ?= "ext4-img" > USE_CIP_KERNEL_CONFIG = "1" > -KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm64/qemu_arm64_defconfig" > +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" > +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/qemu_arm64_defconfig" > diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf > index 3c9638f..d8c7fec 100644 > --- a/conf/machine/simatic-ipc227e.conf > +++ b/conf/machine/simatic-ipc227e.conf > @@ -11,4 +11,5 @@ DISTRO_ARCH = "amd64" > IMAGE_TYPE ?= "wic-img" > IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" > USE_CIP_KERNEL_CONFIG = "1" > -KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/siemens_ipc227e_defconfig" > +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" > +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig" > diff --git a/kas/opt/4.19.yml b/kas/opt/4.19.yml > index 5ff1683..581ea93 100644 > --- a/kas/opt/4.19.yml > +++ b/kas/opt/4.19.yml > @@ -16,3 +16,5 @@ local_conf_header: > kernel-version: | > PREFERRED_VERSION_linux-cip = "4.19.%" > PREFERRED_VERSION_linux-cip-rt = "4.19.%" > + defconfig: | > + KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip" > diff --git a/kas/opt/4.4.yml b/kas/opt/4.4.yml > index 65a4775..dae1b52 100644 > --- a/kas/opt/4.4.yml > +++ b/kas/opt/4.4.yml > @@ -16,3 +16,5 @@ local_conf_header: > kernel-version: | > PREFERRED_VERSION_linux-cip = "4.4.%" > PREFERRED_VERSION_linux-cip-rt = "4.4.%" > + defconfig: | > + KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip" > diff --git a/kas/opt/5.10.yml b/kas/opt/5.10.yml > index 612b7f9..e048450 100644 > --- a/kas/opt/5.10.yml > +++ b/kas/opt/5.10.yml > @@ -16,3 +16,5 @@ local_conf_header: > kernel-version: | > PREFERRED_VERSION_linux-cip = "5.10.%" > PREFERRED_VERSION_linux-cip-rt = "5.10.%" > + defconfig: | > + KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" >
On 12/10/21 10:58, Jan Kiszka wrote: > On 10.12.21 10:34, Q. Gylstorff wrote: >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> This fixes an issue, that the defconfig from kernel 4.19.X does not >> work with kernel 5.10.X. The kernel boots but cannot find any qemu hard >> disk. >> >> The fix adds the new Variable >> KERNEL_DEFCONFIG_VERSION to select to correct path in [1]. >> >> This fixes issue [17]. >> >> [1]: https://gitlab.com/cip-project/cip-kernel/cip-kernel-config >> [17]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/17 >> >> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> --- >> conf/machine/hihope-rzg2m.conf | 3 ++- >> conf/machine/qemu-amd64.conf | 3 ++- >> conf/machine/qemu-arm.conf | 3 ++- >> conf/machine/qemu-arm64.conf | 3 ++- >> conf/machine/simatic-ipc227e.conf | 3 ++- >> kas/opt/4.19.yml | 2 ++ >> kas/opt/4.4.yml | 2 ++ >> kas/opt/5.10.yml | 2 ++ >> 8 files changed, 16 insertions(+), 5 deletions(-) >> >> diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf >> index 4f4ee81..74f03df 100644 >> --- a/conf/machine/hihope-rzg2m.conf >> +++ b/conf/machine/hihope-rzg2m.conf >> @@ -13,7 +13,8 @@ DISTRO_ARCH = "arm64" >> >> IMAGE_TYPE ?= "wic-img" >> >> -KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig" >> +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" > > This variable must be set by the kernel recipe, not the machine. > > Jan Ok, my reasoning was that I want the variable near it usage for readability. It is only used when the KERNEL_DEFCONFIG is from [1]. Quirin [1]: https://gitlab.com/cip-project/cip-kernel/cip-kernel-config > >> +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig" >> USE_CIP_KERNEL_CONFIG = "1" >> DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb" >> IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}" >> diff --git a/conf/machine/qemu-amd64.conf b/conf/machine/qemu-amd64.conf >> index c90d957..af20bf4 100644 >> --- a/conf/machine/qemu-amd64.conf >> +++ b/conf/machine/qemu-amd64.conf >> @@ -10,4 +10,5 @@ DISTRO_ARCH = "amd64" >> >> IMAGE_TYPE ?= "ext4-img" >> USE_CIP_KERNEL_CONFIG = "1" >> -KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/cip_qemu_defconfig" >> +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" >> +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_qemu_defconfig" >> diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf >> index 81a22c1..f9e665d 100644 >> --- a/conf/machine/qemu-arm.conf >> +++ b/conf/machine/qemu-arm.conf >> @@ -11,4 +11,5 @@ DISTRO_ARCH = "armhf" >> >> IMAGE_TYPE ?= "ext4-img" >> USE_CIP_KERNEL_CONFIG = "1" >> -KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm/qemu_arm_defconfig" >> +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" >> +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig" >> diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf >> index eb34703..1a48093 100644 >> --- a/conf/machine/qemu-arm64.conf >> +++ b/conf/machine/qemu-arm64.conf >> @@ -10,4 +10,5 @@ DISTRO_ARCH = "arm64" >> >> IMAGE_TYPE ?= "ext4-img" >> USE_CIP_KERNEL_CONFIG = "1" >> -KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm64/qemu_arm64_defconfig" >> +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" >> +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/qemu_arm64_defconfig" >> diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf >> index 3c9638f..d8c7fec 100644 >> --- a/conf/machine/simatic-ipc227e.conf >> +++ b/conf/machine/simatic-ipc227e.conf >> @@ -11,4 +11,5 @@ DISTRO_ARCH = "amd64" >> IMAGE_TYPE ?= "wic-img" >> IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" >> USE_CIP_KERNEL_CONFIG = "1" >> -KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/siemens_ipc227e_defconfig" >> +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" >> +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig" >> diff --git a/kas/opt/4.19.yml b/kas/opt/4.19.yml >> index 5ff1683..581ea93 100644 >> --- a/kas/opt/4.19.yml >> +++ b/kas/opt/4.19.yml >> @@ -16,3 +16,5 @@ local_conf_header: >> kernel-version: | >> PREFERRED_VERSION_linux-cip = "4.19.%" >> PREFERRED_VERSION_linux-cip-rt = "4.19.%" >> + defconfig: | >> + KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip" >> diff --git a/kas/opt/4.4.yml b/kas/opt/4.4.yml >> index 65a4775..dae1b52 100644 >> --- a/kas/opt/4.4.yml >> +++ b/kas/opt/4.4.yml >> @@ -16,3 +16,5 @@ local_conf_header: >> kernel-version: | >> PREFERRED_VERSION_linux-cip = "4.4.%" >> PREFERRED_VERSION_linux-cip-rt = "4.4.%" >> + defconfig: | >> + KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip" >> diff --git a/kas/opt/5.10.yml b/kas/opt/5.10.yml >> index 612b7f9..e048450 100644 >> --- a/kas/opt/5.10.yml >> +++ b/kas/opt/5.10.yml >> @@ -16,3 +16,5 @@ local_conf_header: >> kernel-version: | >> PREFERRED_VERSION_linux-cip = "5.10.%" >> PREFERRED_VERSION_linux-cip-rt = "5.10.%" >> + defconfig: | >> + KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" >> >
On 10.12.21 11:38, Gylstorff Quirin wrote: > > > On 12/10/21 10:58, Jan Kiszka wrote: >> On 10.12.21 10:34, Q. Gylstorff wrote: >>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >>> >>> This fixes an issue, that the defconfig from kernel 4.19.X does not >>> work with kernel 5.10.X. The kernel boots but cannot find any qemu hard >>> disk. >>> >>> The fix adds the new Variable >>> KERNEL_DEFCONFIG_VERSION to select to correct path in [1]. >>> >>> This fixes issue [17]. >>> >>> [1]: https://gitlab.com/cip-project/cip-kernel/cip-kernel-config >>> [17]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/17 >>> >>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >>> --- >>> conf/machine/hihope-rzg2m.conf | 3 ++- >>> conf/machine/qemu-amd64.conf | 3 ++- >>> conf/machine/qemu-arm.conf | 3 ++- >>> conf/machine/qemu-arm64.conf | 3 ++- >>> conf/machine/simatic-ipc227e.conf | 3 ++- >>> kas/opt/4.19.yml | 2 ++ >>> kas/opt/4.4.yml | 2 ++ >>> kas/opt/5.10.yml | 2 ++ >>> 8 files changed, 16 insertions(+), 5 deletions(-) >>> >>> diff --git a/conf/machine/hihope-rzg2m.conf >>> b/conf/machine/hihope-rzg2m.conf >>> index 4f4ee81..74f03df 100644 >>> --- a/conf/machine/hihope-rzg2m.conf >>> +++ b/conf/machine/hihope-rzg2m.conf >>> @@ -13,7 +13,8 @@ DISTRO_ARCH = "arm64" >>> IMAGE_TYPE ?= "wic-img" >>> -KERNEL_DEFCONFIG = >>> "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig" >>> +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" >> >> This variable must be set by the kernel recipe, not the machine. >> >> Jan > > Ok, my reasoning was that I want the variable near it usage for > readability. It is only used when the KERNEL_DEFCONFIG is from [1]. > The machine config has no knowledge about the kernel version that is going to be used. Jan
On 12/10/21 11:40, Jan Kiszka wrote: > On 10.12.21 11:38, Gylstorff Quirin wrote: >> >> >> On 12/10/21 10:58, Jan Kiszka wrote: >>> On 10.12.21 10:34, Q. Gylstorff wrote: >>>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >>>> >>>> This fixes an issue, that the defconfig from kernel 4.19.X does not >>>> work with kernel 5.10.X. The kernel boots but cannot find any qemu hard >>>> disk. >>>> >>>> The fix adds the new Variable >>>> KERNEL_DEFCONFIG_VERSION to select to correct path in [1]. >>>> >>>> This fixes issue [17]. >>>> >>>> [1]: https://gitlab.com/cip-project/cip-kernel/cip-kernel-config >>>> [17]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/17 >>>> >>>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >>>> --- >>>> conf/machine/hihope-rzg2m.conf | 3 ++- >>>> conf/machine/qemu-amd64.conf | 3 ++- >>>> conf/machine/qemu-arm.conf | 3 ++- >>>> conf/machine/qemu-arm64.conf | 3 ++- >>>> conf/machine/simatic-ipc227e.conf | 3 ++- >>>> kas/opt/4.19.yml | 2 ++ >>>> kas/opt/4.4.yml | 2 ++ >>>> kas/opt/5.10.yml | 2 ++ >>>> 8 files changed, 16 insertions(+), 5 deletions(-) >>>> >>>> diff --git a/conf/machine/hihope-rzg2m.conf >>>> b/conf/machine/hihope-rzg2m.conf >>>> index 4f4ee81..74f03df 100644 >>>> --- a/conf/machine/hihope-rzg2m.conf >>>> +++ b/conf/machine/hihope-rzg2m.conf >>>> @@ -13,7 +13,8 @@ DISTRO_ARCH = "arm64" >>>> IMAGE_TYPE ?= "wic-img" >>>> -KERNEL_DEFCONFIG = >>>> "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig" >>>> +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" >>> >>> This variable must be set by the kernel recipe, not the machine. >>> >>> Jan >> >> Ok, my reasoning was that I want the variable near it usage for >> readability. It is only used when the KERNEL_DEFCONFIG is from [1]. >> > > The machine config has no knowledge about the kernel version that is > going to be used. > > Jan > OK I will change it. I will also add it to the rt kernels. Quirin
diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf index 4f4ee81..74f03df 100644 --- a/conf/machine/hihope-rzg2m.conf +++ b/conf/machine/hihope-rzg2m.conf @@ -13,7 +13,8 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE ?= "wic-img" -KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig" +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig" USE_CIP_KERNEL_CONFIG = "1" DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb" IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}" diff --git a/conf/machine/qemu-amd64.conf b/conf/machine/qemu-amd64.conf index c90d957..af20bf4 100644 --- a/conf/machine/qemu-amd64.conf +++ b/conf/machine/qemu-amd64.conf @@ -10,4 +10,5 @@ DISTRO_ARCH = "amd64" IMAGE_TYPE ?= "ext4-img" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/cip_qemu_defconfig" +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_qemu_defconfig" diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf index 81a22c1..f9e665d 100644 --- a/conf/machine/qemu-arm.conf +++ b/conf/machine/qemu-arm.conf @@ -11,4 +11,5 @@ DISTRO_ARCH = "armhf" IMAGE_TYPE ?= "ext4-img" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm/qemu_arm_defconfig" +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig" diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf index eb34703..1a48093 100644 --- a/conf/machine/qemu-arm64.conf +++ b/conf/machine/qemu-arm64.conf @@ -10,4 +10,5 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE ?= "ext4-img" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm64/qemu_arm64_defconfig" +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/qemu_arm64_defconfig" diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf index 3c9638f..d8c7fec 100644 --- a/conf/machine/simatic-ipc227e.conf +++ b/conf/machine/simatic-ipc227e.conf @@ -11,4 +11,5 @@ DISTRO_ARCH = "amd64" IMAGE_TYPE ?= "wic-img" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/siemens_ipc227e_defconfig" +KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig" diff --git a/kas/opt/4.19.yml b/kas/opt/4.19.yml index 5ff1683..581ea93 100644 --- a/kas/opt/4.19.yml +++ b/kas/opt/4.19.yml @@ -16,3 +16,5 @@ local_conf_header: kernel-version: | PREFERRED_VERSION_linux-cip = "4.19.%" PREFERRED_VERSION_linux-cip-rt = "4.19.%" + defconfig: | + KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip" diff --git a/kas/opt/4.4.yml b/kas/opt/4.4.yml index 65a4775..dae1b52 100644 --- a/kas/opt/4.4.yml +++ b/kas/opt/4.4.yml @@ -16,3 +16,5 @@ local_conf_header: kernel-version: | PREFERRED_VERSION_linux-cip = "4.4.%" PREFERRED_VERSION_linux-cip-rt = "4.4.%" + defconfig: | + KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip" diff --git a/kas/opt/5.10.yml b/kas/opt/5.10.yml index 612b7f9..e048450 100644 --- a/kas/opt/5.10.yml +++ b/kas/opt/5.10.yml @@ -16,3 +16,5 @@ local_conf_header: kernel-version: | PREFERRED_VERSION_linux-cip = "5.10.%" PREFERRED_VERSION_linux-cip-rt = "5.10.%" + defconfig: | + KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"