| Message ID | be7c406d-ee6c-4270-b9d7-52b6f24078c2@siemens.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [isar-cip-core,1/2] linux-cip: Switch x86 targets to new cip_merged_defconfig | expand |
On 24.05.24 12:50, Jan Kiszka wrote: > From: Jan Kiszka <jan.kiszka@siemens.com> > > This also prepares for a generic x86 target. > Found a config regression: qemu-amd64 lost its keyboard input in the text console. Not a major problem, but it would be good to understand how it happened. Jan > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > conf/machine/qemu-amd64.conf | 4 ++-- > conf/machine/simatic-ipc227e.conf | 4 ++-- > recipes-kernel/linux/cip-kernel-config.inc | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/conf/machine/qemu-amd64.conf b/conf/machine/qemu-amd64.conf > index da7e59cc..d7866468 100644 > --- a/conf/machine/qemu-amd64.conf > +++ b/conf/machine/qemu-amd64.conf > @@ -1,7 +1,7 @@ > # > # CIP Core, generic profile > # > -# Copyright (c) Siemens AG, 2019 > +# Copyright (c) Siemens AG, 2019-2024 > # > # SPDX-License-Identifier: MIT > # > @@ -10,4 +10,4 @@ DISTRO_ARCH = "amd64" > > IMAGE_FSTYPES ?= "ext4" > USE_CIP_KERNEL_CONFIG = "1" > -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_qemu_defconfig" > +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_merged_defconfig" > diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf > index 95e2c9a9..33f82b16 100644 > --- a/conf/machine/simatic-ipc227e.conf > +++ b/conf/machine/simatic-ipc227e.conf > @@ -1,7 +1,7 @@ > # > # CIP Core, generic profile > # > -# Copyright (c) Siemens AG, 2019 > +# Copyright (c) Siemens AG, 2019-2024 > # > # SPDX-License-Identifier: MIT > # > @@ -12,4 +12,4 @@ IMAGE_FSTYPES ?= "wic" > WKS_FILE ?= "x86_64-generic.wks" > IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}" > USE_CIP_KERNEL_CONFIG = "1" > -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig" > +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_merged_defconfig" > diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc > index 40c378bf..6839e1a9 100644 > --- a/recipes-kernel/linux/cip-kernel-config.inc > +++ b/recipes-kernel/linux/cip-kernel-config.inc > @@ -14,4 +14,4 @@ SRC_URI:append = " ${@ \ > if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \ > }" > > -SRCREV_cip-kernel-config ?= "ee86aca8abbe7a41536bcb53142fbf0f57b1c9b7" > +SRCREV_cip-kernel-config ?= "5a81b70b8a158d44991da73cf01f310bcd2bff72"
On 5/24/24 10:25 PM, Jan Kiszka wrote: > On 24.05.24 12:50, Jan Kiszka wrote: >> From: Jan Kiszka <jan.kiszka@siemens.com> >> >> This also prepares for a generic x86 target. >> > > Found a config regression: qemu-amd64 lost its keyboard input in the > text console. Not a major problem, but it would be good to understand > how it happened. It looks like this was disabled by plathome_obsvx2_defconfig and toshiba_atom_baytrail_cip_defconfig. All other config assumed the default of enabled for CONFIG_INPUT_KEYBOARD. I posted a MR with a fix https://gitlab.com/cip-project/cip-kernel/cip-kernel-config/-/merge_requests/99. Quirin > > Jan > >> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> >> --- >> conf/machine/qemu-amd64.conf | 4 ++-- >> conf/machine/simatic-ipc227e.conf | 4 ++-- >> recipes-kernel/linux/cip-kernel-config.inc | 2 +- >> 3 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/conf/machine/qemu-amd64.conf b/conf/machine/qemu-amd64.conf >> index da7e59cc..d7866468 100644 >> --- a/conf/machine/qemu-amd64.conf >> +++ b/conf/machine/qemu-amd64.conf >> @@ -1,7 +1,7 @@ >> # >> # CIP Core, generic profile >> # >> -# Copyright (c) Siemens AG, 2019 >> +# Copyright (c) Siemens AG, 2019-2024 >> # >> # SPDX-License-Identifier: MIT >> # >> @@ -10,4 +10,4 @@ DISTRO_ARCH = "amd64" >> >> IMAGE_FSTYPES ?= "ext4" >> USE_CIP_KERNEL_CONFIG = "1" >> -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_qemu_defconfig" >> +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_merged_defconfig" >> diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf >> index 95e2c9a9..33f82b16 100644 >> --- a/conf/machine/simatic-ipc227e.conf >> +++ b/conf/machine/simatic-ipc227e.conf >> @@ -1,7 +1,7 @@ >> # >> # CIP Core, generic profile >> # >> -# Copyright (c) Siemens AG, 2019 >> +# Copyright (c) Siemens AG, 2019-2024 >> # >> # SPDX-License-Identifier: MIT >> # >> @@ -12,4 +12,4 @@ IMAGE_FSTYPES ?= "wic" >> WKS_FILE ?= "x86_64-generic.wks" >> IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}" >> USE_CIP_KERNEL_CONFIG = "1" >> -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig" >> +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_merged_defconfig" >> diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc >> index 40c378bf..6839e1a9 100644 >> --- a/recipes-kernel/linux/cip-kernel-config.inc >> +++ b/recipes-kernel/linux/cip-kernel-config.inc >> @@ -14,4 +14,4 @@ SRC_URI:append = " ${@ \ >> if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \ >> }" >> >> -SRCREV_cip-kernel-config ?= "ee86aca8abbe7a41536bcb53142fbf0f57b1c9b7" >> +SRCREV_cip-kernel-config ?= "5a81b70b8a158d44991da73cf01f310bcd2bff72" >
On 28.05.24 16:47, Gylstorff Quirin wrote: > > > On 5/24/24 10:25 PM, Jan Kiszka wrote: >> On 24.05.24 12:50, Jan Kiszka wrote: >>> From: Jan Kiszka <jan.kiszka@siemens.com> >>> >>> This also prepares for a generic x86 target. >>> >> >> Found a config regression: qemu-amd64 lost its keyboard input in the >> text console. Not a major problem, but it would be good to understand >> how it happened. > > It looks like this was disabled by plathome_obsvx2_defconfig and > toshiba_atom_baytrail_cip_defconfig. All other config assumed the > default of enabled for CONFIG_INPUT_KEYBOARD. > > I posted a MR with a fix > https://gitlab.com/cip-project/cip-kernel/cip-kernel-config/-/merge_requests/99. > Thanks a lot! We will pick this revision up here once its merged. Jan
diff --git a/conf/machine/qemu-amd64.conf b/conf/machine/qemu-amd64.conf index da7e59cc..d7866468 100644 --- a/conf/machine/qemu-amd64.conf +++ b/conf/machine/qemu-amd64.conf @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2024 # # SPDX-License-Identifier: MIT # @@ -10,4 +10,4 @@ DISTRO_ARCH = "amd64" IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_qemu_defconfig" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_merged_defconfig" diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf index 95e2c9a9..33f82b16 100644 --- a/conf/machine/simatic-ipc227e.conf +++ b/conf/machine/simatic-ipc227e.conf @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2024 # # SPDX-License-Identifier: MIT # @@ -12,4 +12,4 @@ IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "x86_64-generic.wks" IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_merged_defconfig" diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc index 40c378bf..6839e1a9 100644 --- a/recipes-kernel/linux/cip-kernel-config.inc +++ b/recipes-kernel/linux/cip-kernel-config.inc @@ -14,4 +14,4 @@ SRC_URI:append = " ${@ \ if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \ }" -SRCREV_cip-kernel-config ?= "ee86aca8abbe7a41536bcb53142fbf0f57b1c9b7" +SRCREV_cip-kernel-config ?= "5a81b70b8a158d44991da73cf01f310bcd2bff72"