diff mbox series

[isar-cip-core] qemu-arm: Roll back to qemu_arm_defconfig

Message ID f288734d-b198-4b2d-8b60-92924eda838d@siemens.com (mailing list archive)
State New
Headers show
Series [isar-cip-core] qemu-arm: Roll back to qemu_arm_defconfig | expand

Commit Message

Jan Kiszka Dec. 11, 2024, 10:45 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

As long as the root cause of losing CONFIG_AUDIT while generating the
merged defconfig is not fully understood and resolved, move back to the
known-to-work qemu-specific config. That unbreaks our IEC test case [2].

There was a second issue, affecting the qemu_arm_defconfig directly. To
fix that, we also need to update the cip-kernel-config revision along
this.

[1] https://lore.kernel.org/cip-dev/5ed0fb0d-b505-4155-b330-069881cd9072@siemens.com/
[2] https://gitlab.com/cip-project/cip-core/isar-cip-core/-/jobs/8580918327

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 conf/machine/qemu-arm.conf                 | 2 +-
 recipes-kernel/linux/cip-kernel-config.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf
index 17c08832..d2dd81f4 100644
--- a/conf/machine/qemu-arm.conf
+++ b/conf/machine/qemu-arm.conf
@@ -11,7 +11,7 @@  DISTRO_ARCH = "armhf"
 
 IMAGE_FSTYPES ?= "ext4"
 USE_CIP_KERNEL_CONFIG = "1"
-KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig"
+KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig"
 
 # watchdog is not yet supported in our QEMU executor for this platform, disable it
 WDOG_TIMEOUT = "0"
diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc
index cbc7e3e3..d26ff3fb 100644
--- a/recipes-kernel/linux/cip-kernel-config.inc
+++ b/recipes-kernel/linux/cip-kernel-config.inc
@@ -14,7 +14,7 @@  SRC_URI:append = " ${@ \
     if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
     }"
 
-SRCREV_cip-kernel-config ?= "bb2485db01c5ce14ec571b9fb9e03f90c686a69f"
+SRCREV_cip-kernel-config ?= "b14ada5877ab5280188f3549c21891b7a830896c"
 
 do_fetch[vardeps] += "SRCREV_cip-kernel-config"