From 7b49fa121babfc0f016b1eb8d1714e760f05373c Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:02:07 +0200 Subject: [PATCH] kernel: fragments not supported on s390x Add !s390x tag to skip these group of fragments for s390x. Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/common/acpi.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/cpu.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/dax.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/security.conf | 1 + tools/packaging/kernel/configs/fragments/common/serial.conf | 2 ++ 5 files changed, 9 insertions(+) diff --git a/tools/packaging/kernel/configs/fragments/common/acpi.conf b/tools/packaging/kernel/configs/fragments/common/acpi.conf index e183d2435..1ee7cd329 100644 --- a/tools/packaging/kernel/configs/fragments/common/acpi.conf +++ b/tools/packaging/kernel/configs/fragments/common/acpi.conf @@ -1,3 +1,5 @@ +# !s390x + # enable ACPI support. # This could do with REVIEW # https://github.com/kata-containers/packaging/issues/483 diff --git a/tools/packaging/kernel/configs/fragments/common/cpu.conf b/tools/packaging/kernel/configs/fragments/common/cpu.conf index 04ff9f24d..8e6651df7 100644 --- a/tools/packaging/kernel/configs/fragments/common/cpu.conf +++ b/tools/packaging/kernel/configs/fragments/common/cpu.conf @@ -1,3 +1,5 @@ +# !s390x + # Items to do with CPU frequency, power etc. CONFIG_CPU_FREQ=y diff --git a/tools/packaging/kernel/configs/fragments/common/dax.conf b/tools/packaging/kernel/configs/fragments/common/dax.conf index 4d847def1..7f8824e13 100644 --- a/tools/packaging/kernel/configs/fragments/common/dax.conf +++ b/tools/packaging/kernel/configs/fragments/common/dax.conf @@ -1,3 +1,5 @@ +# !s390x + # Enable DAX and NVDIMM support so we can map in our rootfs # Need HOTREMOVE, or ZONE_DEVICE will not get enabled diff --git a/tools/packaging/kernel/configs/fragments/common/security.conf b/tools/packaging/kernel/configs/fragments/common/security.conf index 6f3043503..cfe09c648 100644 --- a/tools/packaging/kernel/configs/fragments/common/security.conf +++ b/tools/packaging/kernel/configs/fragments/common/security.conf @@ -1,3 +1,4 @@ +# !s390x # Let's enable stack protection checks, and strong checks # Estimated cost (detailed in the kernel config files) diff --git a/tools/packaging/kernel/configs/fragments/common/serial.conf b/tools/packaging/kernel/configs/fragments/common/serial.conf index c663fe1c7..47d0baa56 100644 --- a/tools/packaging/kernel/configs/fragments/common/serial.conf +++ b/tools/packaging/kernel/configs/fragments/common/serial.conf @@ -1,3 +1,5 @@ +# !s390x + # We need some sort of 'serial' for virtio-serial consoles - at the moment. # We might not need all of thse though... # FIXME - https://github.com/kata-containers/packaging/issues/483