3:30 a.m.
From: Philipp Rudo on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1144
The last commit addresses
https://bugzilla.redhat.com/show_bug.cgi?id=1876435
and is preceded by two cleanups.
The first commit is strictly speaking independent. If requested I can
move it
to a separate MR.
3:30 a.m.
New subject: [OS-BUILD PATCH 1/3] configs/process_configs.sh: make use of
dummy-tools
From: Philipp Rudo <prudo(a)redhat.com>
configs/process_configs.sh: make use of dummy-tools
Using cc-option adds a dependency on the compiler in the configuration
environment. This usually breaks the config creation when the target
architecture is not the host architecture. As a remedy f88717cf44eb
("Temporarily switch TUNE_DEFAULT to y") unset failing configs to their
defaults. In the meantime upstream introduced the scripts/dummy-tools,
which are meant to disable cc-option checks by always returning 'y'.
Make use of the dummy-tools and revert the workaround.
Using the dummy-tools process_configs.sh finds new unset configs. These
are added to pending-common and set to their default.
Signed-off-by: Philipp Rudo <prudo(a)redhat.com>
diff a/redhat/configs/pending-common/generic/CONFIG_INIT_STACK_ALL_PATTERN
b/redhat/configs/pending-common/generic/CONFIG_INIT_STACK_ALL_PATTERN
--- /dev/null
+++ b/redhat/configs/pending-common/generic/CONFIG_INIT_STACK_ALL_PATTERN
@@ -0,0 +1 @@
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
diff a/redhat/configs/pending-common/generic/CONFIG_INIT_STACK_ALL_ZERO
b/redhat/configs/pending-common/generic/CONFIG_INIT_STACK_ALL_ZERO
--- /dev/null
+++ b/redhat/configs/pending-common/generic/CONFIG_INIT_STACK_ALL_ZERO
@@ -0,0 +1 @@
+# CONFIG_INIT_STACK_ALL_ZERO is not set
diff a/redhat/configs/pending-common/generic/arm/aarch64/CONFIG_RELR
b/redhat/configs/pending-common/generic/arm/aarch64/CONFIG_RELR
--- /dev/null
+++ b/redhat/configs/pending-common/generic/arm/aarch64/CONFIG_RELR
@@ -0,0 +1 @@
+CONFIG_RELR=y
diff a/redhat/configs/pending-common/generic/s390x/CONFIG_TUNE_DEFAULT
b/redhat/configs/pending-common/generic/s390x/CONFIG_TUNE_DEFAULT
--- a/redhat/configs/pending-common/generic/s390x/CONFIG_TUNE_DEFAULT
+++ /dev/null
@@ -1,4 +0,0 @@
-# Broken in commit 5474080a3a0a ("s390/Kconfig: make use of 'depends on
-# cc-option'"); refer to
-# https://lore.kernel.org/lkml/20191209164155.GA78160@dev.jcline.org/
-CONFIG_TUNE_DEFAULT=y
diff a/redhat/configs/pending-common/generic/s390x/CONFIG_TUNE_Z14
b/redhat/configs/pending-common/generic/s390x/CONFIG_TUNE_Z14
--- a/redhat/configs/pending-common/generic/s390x/CONFIG_TUNE_Z14
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TUNE_Z14 is not set
diff a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh
--- a/redhat/configs/process_configs.sh
+++ b/redhat/configs/process_configs.sh
@@ -193,11 +193,11 @@ function commit_new_configs()
fi
echo -n "Checking for new configs in $cfg ... "
- make ARCH="$arch" KCONFIG_CONFIG="$cfgorig" listnewconfig >&
.listnewconfig
+ make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/
KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
grep -E 'CONFIG_' .listnewconfig > .newoptions
if test -s .newoptions
then
- make ARCH="$arch" KCONFIG_CONFIG="$cfgorig" helpnewconfig
>& .helpnewconfig
+ make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/
KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig
parsenewconfigs
fi
rm .newoptions
@@ -227,7 +227,7 @@ function process_configs()
fi
echo -n "Processing $cfg ... "
- make ARCH="$arch" KCONFIG_CONFIG="$cfgorig" listnewconfig >&
.listnewconfig
+ make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/
KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
grep -E 'CONFIG_' .listnewconfig > .newoptions
if test -n "$NEWOPTIONS" && test -s .newoptions
then
@@ -252,7 +252,7 @@ function process_configs()
rm .listnewconfig
- make ARCH="$arch" KCONFIG_CONFIG="$cfgorig" olddefconfig >
/dev/null || exit 1
+ make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/
KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
echo "# $arch" > "$cfgtmp"
cat "$cfgorig" >> "$cfgtmp"
if test -n "$CHECKOPTIONS"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1144
3:30 a.m.
New subject: [OS-BUILD PATCH 2/3] configs/common/s390: Clean up
CONFIG_{MARCH,TUNE}_Z*
From: Philipp Rudo <prudo(a)redhat.com>
configs/common/s390: Clean up CONFIG_{MARCH,TUNE}_Z*
Most of the configs are identical for fedora and ark so move them to
common/generic/s390x.
While at it move the remaining configs in fedora/generic to
fedora/generic/s390x.
Signed-off-by: Philipp Rudo <prudo(a)redhat.com>
diff a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z10
b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z10
--- a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z10
+++ b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z10
diff a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z14
b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z14
--- a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z14
+++ b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z14
diff a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z196
b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z196
--- a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z196
+++ b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z196
diff a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z900
b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z900
--- a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z900
+++ b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z900
diff a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z990
b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z990
--- a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z990
+++ b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z990
diff a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z9_109
b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z9_109
--- a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z9_109
+++ b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z9_109
diff a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z10
b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z10
--- a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z10
+++ b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z10
diff a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z13
b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z13
--- a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z13
+++ b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z13
diff a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z196
b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z196
--- a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z196
+++ b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z196
diff a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z900
b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z900
--- a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z900
+++ b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z900
diff a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z990
b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z990
--- a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z990
+++ b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z990
diff a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z9_109
b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z9_109
--- a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z9_109
+++ b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z9_109
diff a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_ZEC12
b/redhat/configs/common/generic/s390x/CONFIG_TUNE_ZEC12
--- a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_ZEC12
+++ b/redhat/configs/common/generic/s390x/CONFIG_TUNE_ZEC12
diff a/redhat/configs/fedora/generic/CONFIG_MARCH_Z10
b/redhat/configs/fedora/generic/CONFIG_MARCH_Z10
--- a/redhat/configs/fedora/generic/CONFIG_MARCH_Z10
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MARCH_Z10 is not set
diff a/redhat/configs/fedora/generic/CONFIG_MARCH_Z14
b/redhat/configs/fedora/generic/CONFIG_MARCH_Z14
--- a/redhat/configs/fedora/generic/CONFIG_MARCH_Z14
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MARCH_Z14 is not set
diff a/redhat/configs/fedora/generic/CONFIG_MARCH_Z196
b/redhat/configs/fedora/generic/CONFIG_MARCH_Z196
--- a/redhat/configs/fedora/generic/CONFIG_MARCH_Z196
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MARCH_Z196 is not set
diff a/redhat/configs/fedora/generic/CONFIG_MARCH_Z900
b/redhat/configs/fedora/generic/CONFIG_MARCH_Z900
--- a/redhat/configs/fedora/generic/CONFIG_MARCH_Z900
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MARCH_Z900 is not set
diff a/redhat/configs/fedora/generic/CONFIG_MARCH_Z990
b/redhat/configs/fedora/generic/CONFIG_MARCH_Z990
--- a/redhat/configs/fedora/generic/CONFIG_MARCH_Z990
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MARCH_Z990 is not set
diff a/redhat/configs/fedora/generic/CONFIG_MARCH_Z9_109
b/redhat/configs/fedora/generic/CONFIG_MARCH_Z9_109
--- a/redhat/configs/fedora/generic/CONFIG_MARCH_Z9_109
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MARCH_Z9_109 is not set
diff a/redhat/configs/fedora/generic/CONFIG_TUNE_Z10
b/redhat/configs/fedora/generic/CONFIG_TUNE_Z10
--- a/redhat/configs/fedora/generic/CONFIG_TUNE_Z10
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TUNE_Z10 is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1144
3:30 a.m.
New subject: [OS-BUILD PATCH 3/3] configs/ark/s390: set CONFIG_MARCH_Z14 and
CONFIG_TUNE_Z15
From: Philipp Rudo <prudo(a)redhat.com>
configs/ark/s390: set CONFIG_MARCH_Z14 and CONFIG_TUNE_Z15
Optimize ark for newer machines.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1876435
Signed-off-by: Philipp Rudo <prudo(a)redhat.com>
diff a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z13
b/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z13
--- a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z13
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MARCH_Z13=y
diff a/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z14
b/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z14
--- /dev/null
+++ b/redhat/configs/ark/generic/s390x/CONFIG_MARCH_Z14
@@ -0,0 +1 @@
+CONFIG_MARCH_Z14=y
diff a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z14
b/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z14
--- a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z14
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TUNE_Z14=y
diff a/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z15
b/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z15
--- /dev/null
+++ b/redhat/configs/ark/generic/s390x/CONFIG_TUNE_Z15
@@ -0,0 +1 @@
+CONFIG_TUNE_Z15=y
diff a/redhat/configs/fedora/generic/s390x/CONFIG_MARCH_Z13
b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z13
--- a/redhat/configs/fedora/generic/s390x/CONFIG_MARCH_Z13
+++ b/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z13
diff a/redhat/configs/fedora/generic/s390x/CONFIG_TUNE_Z14
b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z14
--- a/redhat/configs/fedora/generic/s390x/CONFIG_TUNE_Z14
+++ b/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z14
diff a/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z14
b/redhat/configs/fedora/generic/s390x/CONFIG_MARCH_Z14
--- a/redhat/configs/common/generic/s390x/CONFIG_MARCH_Z14
+++ b/redhat/configs/fedora/generic/s390x/CONFIG_MARCH_Z14
diff a/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z15
b/redhat/configs/fedora/generic/s390x/CONFIG_TUNE_Z15
--- a/redhat/configs/common/generic/s390x/CONFIG_TUNE_Z15
+++ b/redhat/configs/fedora/generic/s390x/CONFIG_TUNE_Z15
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1144
6:45 a.m.
New subject: [OS-BUILD PATCH 0/3] ark: Set Architecture Level Set to Z14 for
s390
From: Justin Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1144#note_5794...
I would suggest not changing pending-common. That is the location for
pre-reviewed, automated defaults. Nothing should be created there
without a corresponding MR to get that config reviewed and move it to
common.
10:53 a.m.
New subject: [OS-BUILD PATCH 0/3] ark: Set Architecture Level Set to Z14 for
s390
From: Philipp Rudo on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1144#note_5797...
ok, I naively thought that pending-common was the staging area and
everything contained in it will be included in the next round of config
review.
What's the correct way to proceed? Not having them set isn't an option
for me as that would break 'make dis-configs'.
12:15 p.m.
New subject: [OS-BUILD PATCH 0/3] ark: Set Architecture Level Set to Z14 for
s390
From: Justin Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1144#note_5799...
As this is the merge request creating the dependency on those, the best
path forward is to put them in common instead of pending-common. The
make dist-configs breakage doesn't happen until this MR goes in, and if
they are in common it won't happen after it goes in either. If they
need reviewers from other areas, you can CC them and they will get
reviewed that way, or we can try to add the right people
1078
days inactive
1078
days old
kernel@lists.fedoraproject.org
6 comments
2 participants
participants (2)
-
Justin Forbes (via Email Bridge) -
Philipp Rudo (via Email Bridge)