[OS-BUILD PATCHv3 0/2] redhat/configs: enable KEXEC_SIG for aarch64 RHEL

[Coiby Xu (via Email Bridge)]

From: Coiby Xu on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1442

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1994858

KEXEC_SIG needs to enabled for aarch64 so the kernel image's signature
can be verified when loading a kernel image via kexec with secureboot
enabled. Note this option has already been enabled for aarch64 Fedora.

Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt;

---
 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG                            
                                 |  1 -
 redhat/configs/common/generic/s390x/CONFIG_KEXEC_SIG                                     
                                 |  1 -
 redhat/configs/common/generic/x86/CONFIG_KEXEC_SIG                                       
                                 |  1 -
 redhat/configs/fedora/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG =>
redhat/configs/common/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG |  0 
 redhat/configs/common/generic/CONFIG_KEXEC_SIG                                           
                                 |  2 +-
 redhat/configs/fedora/generic/arm/aarch64/CONFIG_KEXEC_SIG                               
                                 |  1 -
 redhat/configs/fedora/generic/s390x/CONFIG_KEXEC_SIG                                     
                                 |  1 -
 redhat/configs/fedora/generic/x86/CONFIG_KEXEC_SIG                                       
                                 |  1 -
 8 files changed, 1 insertions(+), 7 deletions(-)

[OS-BUILD PATCHv3 1/2] redhat/configs: enable KEXEC_SIG for aarch64 RHEL

[Coiby Xu (via Email Bridge)]

From: Coiby Xu <coxu(a)redhat.com&gt;

redhat/configs: enable KEXEC_SIG for aarch64 RHEL

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1994858

KEXEC_SIG needs to be enabled for aarch64 so the kernel image's signature
can be verified when loading a kernel image via kexec with secureboot
enabled. Since this option has already been enabled for x86 and s390x
and POWER doesn't have this option, unify it to
common/generic/CONFIG_KEXEC_SIG.

Suggested-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt;

diff --git a/redhat/configs/common/generic/CONFIG_KEXEC_SIG
b/redhat/configs/common/generic/CONFIG_KEXEC_SIG
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_KEXEC_SIG
+++ b/redhat/configs/common/generic/CONFIG_KEXEC_SIG
@@ -1 +1 @@
-# CONFIG_KEXEC_SIG is not set
+CONFIG_KEXEC_SIG=y
diff --git a/redhat/configs/common/generic/s390x/CONFIG_KEXEC_SIG
b/redhat/configs/common/generic/s390x/CONFIG_KEXEC_SIG
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/s390x/CONFIG_KEXEC_SIG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEXEC_SIG=y
diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG
b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KEXEC_SIG is not set
diff --git a/redhat/configs/common/generic/x86/CONFIG_KEXEC_SIG
b/redhat/configs/common/generic/x86/CONFIG_KEXEC_SIG
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/x86/CONFIG_KEXEC_SIG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEXEC_SIG=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_KEXEC_SIG
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_KEXEC_SIG
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_KEXEC_SIG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEXEC_SIG=y
diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_KEXEC_SIG
b/redhat/configs/fedora/generic/s390x/CONFIG_KEXEC_SIG
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/s390x/CONFIG_KEXEC_SIG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEXEC_SIG=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_KEXEC_SIG
b/redhat/configs/fedora/generic/x86/CONFIG_KEXEC_SIG
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/x86/CONFIG_KEXEC_SIG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEXEC_SIG=y

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1442

[OS-BUILD PATCHv3 2/2] redhat/configs: enable KEXEC_IMAGE_VERIFY_SIG for RHEL

[Coiby Xu (via Email Bridge)]

From: Coiby Xu <coxu(a)redhat.com&gt;

redhat/configs: enable  KEXEC_IMAGE_VERIFY_SIG for RHEL

CONFIG_KEXEC_IMAGE_VERIFY_SIG is enabled so kernel image signature
verification support could be enabled for aarch64. This option has
already been enabled for Fedora.

Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt;

diff --git a/redhat/configs/fedora/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
b/redhat/configs/common/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
rename from redhat/configs/fedora/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
rename to redhat/configs/common/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
+++ b/redhat/configs/common/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1442

[Jarod Wilson (via Email Bridge)]

From: Jarod Wilson on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1442#note_7200...

Acked-by: Jarod Wilson <jarod(a)redhat.com&gt;
(via approve button)

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1442#note_7212...

This change needs to be rebased and force pushed. We rebase os-build with
every .0 release, and that was done yesterday.

[Mark Salter (via Email Bridge)]

From: Mark Salter on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1442#note_7212...

Acked-by: Mark Salter <msalter(a)redhat.com&gt;
(via approve button)