From: Thomas Huth on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3830
While working on a merge request for Centos Stream (see https://gitlab.com/redhat/centos-stream/src/kernel/centos- stream-9/-/merge_requests/6695#note_2438236147 ) I noticed that some config switches in kernel-ark are not set in an optimal way yet. So here are some patches to get them fixed!
Signed-off-by: Thomas Huth thuth@redhat.com
--- redhat/configs/common/debug/s390x/CONFIG_KERNEL_IMAGE_BASE | 1 + redhat/configs/fedora/generic/s390x/CONFIG_AP => redhat/configs/common/generic/s390x/CONFIG_AP | 0 redhat/configs/fedora/generic/s390x/CONFIG_KERNEL_IMAGE_BASE => redhat/configs/common/generic/s390x/CONFIG_KERNEL_IMAGE_BASE | 0 redhat/configs/fedora/debug/s390x/CONFIG_ZCRYPT_DEBUG | 1 - redhat/configs/fedora/generic/s390x/CONFIG_ZCRYPT_DEBUG | 1 - redhat/configs/rhel/debug/s390x/CONFIG_ZCRYPT_DEBUG | 1 - redhat/configs/rhel/generic/s390x/CONFIG_ZCRYPT_DEBUG | 1 - redhat/configs/rhel/generic/CONFIG_AP | 1 - redhat/configs/rhel/generic/CONFIG_KERNEL_IMAGE_BASE | 1 - 9 files changed, 1 insertions(+), 6 deletions(-)
From: Thomas Huth thuth@redhat.com
redhat/configs: Consolidate the CONFIG_AP switch
CONFIG_AP is enabled in both, the rhel and the fedora config folder, so we can consolidate this in the common folder instead (and make sure that it resides in the s390x sub-folder since this affects s390x only).
Signed-off-by: Thomas Huth thuth@redhat.com
diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_AP b/redhat/configs/common/generic/s390x/CONFIG_AP rename from redhat/configs/fedora/generic/s390x/CONFIG_AP rename to redhat/configs/common/generic/s390x/CONFIG_AP index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/s390x/CONFIG_AP +++ b/redhat/configs/common/generic/s390x/CONFIG_AP diff --git a/redhat/configs/rhel/generic/CONFIG_AP b/redhat/configs/rhel/generic/CONFIG_AP deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_AP +++ /dev/null @@ -1 +0,0 @@ -CONFIG_AP=y
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3830
From: Thomas Huth thuth@redhat.com
redhat/configs: Remove the obsolete CONFIG_ZCRYPT_DEBUG switches
CONFIG_ZCRYPT_DEBUG has been renamed to CONFIG_AP_DEBUG in upstream commit b3840c8bfc27 ("s390/ap: rename ap debug configuration option"), and the new switches have been added by other commits already, so we can simply drop the unused old ones now.
Signed-off-by: Thomas Huth thuth@redhat.com
diff --git a/redhat/configs/fedora/debug/s390x/CONFIG_ZCRYPT_DEBUG b/redhat/configs/fedora/debug/s390x/CONFIG_ZCRYPT_DEBUG deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/debug/s390x/CONFIG_ZCRYPT_DEBUG +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ZCRYPT_DEBUG=y diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_ZCRYPT_DEBUG b/redhat/configs/fedora/generic/s390x/CONFIG_ZCRYPT_DEBUG deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/s390x/CONFIG_ZCRYPT_DEBUG +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ZCRYPT_DEBUG is not set diff --git a/redhat/configs/rhel/debug/s390x/CONFIG_ZCRYPT_DEBUG b/redhat/configs/rhel/debug/s390x/CONFIG_ZCRYPT_DEBUG deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/debug/s390x/CONFIG_ZCRYPT_DEBUG +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ZCRYPT_DEBUG=y diff --git a/redhat/configs/rhel/generic/s390x/CONFIG_ZCRYPT_DEBUG b/redhat/configs/rhel/generic/s390x/CONFIG_ZCRYPT_DEBUG deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/s390x/CONFIG_ZCRYPT_DEBUG +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ZCRYPT_DEBUG is not set
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3830
From: Thomas Huth thuth@redhat.com
redhat/configs: Update the CONFIG_KERNEL_IMAGE_BASE kernel config option
CONFIG_KERNEL_IMAGE_BASE should be set to 0x7FFFE0000000 when KASAN is enabled (see arch/s390/Kconfig and arch/s390/configs/kasan.config). Since the debug kernel uses KASAN, add a config file for this value there. And while we're at it, also consolidate the generic settings from the rhel and fedora folders into the common folder instead.
Signed-off-by: Thomas Huth thuth@redhat.com
diff --git a/redhat/configs/common/debug/s390x/CONFIG_KERNEL_IMAGE_BASE b/redhat/configs/common/debug/s390x/CONFIG_KERNEL_IMAGE_BASE new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/debug/s390x/CONFIG_KERNEL_IMAGE_BASE @@ -0,0 +1 @@ +CONFIG_KERNEL_IMAGE_BASE=0x7FFFE0000000 diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_KERNEL_IMAGE_BASE b/redhat/configs/common/generic/s390x/CONFIG_KERNEL_IMAGE_BASE rename from redhat/configs/fedora/generic/s390x/CONFIG_KERNEL_IMAGE_BASE rename to redhat/configs/common/generic/s390x/CONFIG_KERNEL_IMAGE_BASE index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/s390x/CONFIG_KERNEL_IMAGE_BASE +++ b/redhat/configs/common/generic/s390x/CONFIG_KERNEL_IMAGE_BASE diff --git a/redhat/configs/rhel/generic/CONFIG_KERNEL_IMAGE_BASE b/redhat/configs/rhel/generic/CONFIG_KERNEL_IMAGE_BASE deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_KERNEL_IMAGE_BASE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_KERNEL_IMAGE_BASE=0x3FFE0000000
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3830
kernel@lists.fedoraproject.org
-
Thomas Huth (via Email Bridge)