From: Bruno Meneguele <bmeneg(a)redhat.com>
redhat/configs: enable INTEGRITY_SIGNATURE to all arches
CONFIG_INTEGRITY_SIGNATURE has been enabled for all supported arches in
RHEL-8 and also in Fedora, but I missed it in ARK and, consequently, s390x
missed the CONFIG_IMA_APPRAISE_MODSIG option, which should be set.
However, enabling as generic option also force we to generically disable
CONFIG_IMA_APPRAISE_BUILD_POLICY, which is fine for now.
Signed-off-by: Bruno Meneguele <bmeneg(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_INTEGRITY_SIGNATURE
b/redhat/configs/ark/generic/CONFIG_INTEGRITY_SIGNATURE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_INTEGRITY_SIGNATURE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEGRITY_SIGNATURE is not set
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_IMA_APPRAISE_BUILD_POLICY
b/redhat/configs/ark/generic/x86/x86_64/CONFIG_IMA_APPRAISE_BUILD_POLICY
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_IMA_APPRAISE_BUILD_POLICY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_INTEGRITY_SIGNATURE
b/redhat/configs/ark/generic/x86/x86_64/CONFIG_INTEGRITY_SIGNATURE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_INTEGRITY_SIGNATURE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEGRITY_SIGNATURE=y
diff --git a/redhat/configs/ark/generic/powerpc/CONFIG_IMA_APPRAISE_BUILD_POLICY
b/redhat/configs/common/generic/CONFIG_IMA_APPRAISE_BUILD_POLICY
rename from redhat/configs/ark/generic/powerpc/CONFIG_IMA_APPRAISE_BUILD_POLICY
rename to redhat/configs/common/generic/CONFIG_IMA_APPRAISE_BUILD_POLICY
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/powerpc/CONFIG_IMA_APPRAISE_BUILD_POLICY
+++ b/redhat/configs/common/generic/CONFIG_IMA_APPRAISE_BUILD_POLICY
diff --git a/redhat/configs/ark/generic/powerpc/CONFIG_INTEGRITY_SIGNATURE
b/redhat/configs/common/generic/CONFIG_INTEGRITY_SIGNATURE
rename from redhat/configs/ark/generic/powerpc/CONFIG_INTEGRITY_SIGNATURE
rename to redhat/configs/common/generic/CONFIG_INTEGRITY_SIGNATURE
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/powerpc/CONFIG_INTEGRITY_SIGNATURE
+++ b/redhat/configs/common/generic/CONFIG_INTEGRITY_SIGNATURE
diff --git a/redhat/configs/fedora/generic/CONFIG_IMA_APPRAISE_BUILD_POLICY
b/redhat/configs/fedora/generic/CONFIG_IMA_APPRAISE_BUILD_POLICY
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/CONFIG_IMA_APPRAISE_BUILD_POLICY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
diff --git a/redhat/configs/fedora/generic/CONFIG_INTEGRITY_SIGNATURE
b/redhat/configs/fedora/generic/CONFIG_INTEGRITY_SIGNATURE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/CONFIG_INTEGRITY_SIGNATURE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEGRITY_SIGNATURE=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1166