From: Don Zickus <dzickus(a)redhat.com>
Remove duplicate configs acroos fedora, ark and common
Started with a bunch of scripts to filter out duplicates. Then
ran into all the override quirks and quickly and to revert large
chunks of it.
What is left is duplicates and cleanups of a small set of configs.
The SPEAKUP stuff seemed easy to consolidate.
The DW_DMAC_* configs were tricky because I could not delete the Fedora
overrides.
The EXPOLINE_* configs are s390x specific and with a little manual
cleanup made it work.
The HOTPLUG_PCI_SHPC had some override quirks but a few tweaks I can
easily sync everything up.
One new exposure is TEST_MIN_HEAP is now enabled on fedora-debug. I
think that was the original intent but the feodra override accidentally
disabled it from common.
Verified by comparing the original 'make dist-configs; make
dist-fedora-configs' with the new version. Other than TEST_MIN_HEAP
everything else matches.
This whole exercise made me frown with how the common configs and the
overrides work. Maybe evaluate_configs -j isn't so bad after all...
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff a/redhat/configs/ark/generic/CONFIG_EVM_ADD_XATTRS
b/redhat/configs/ark/generic/CONFIG_EVM_ADD_XATTRS
--- a/redhat/configs/ark/generic/CONFIG_EVM_ADD_XATTRS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EVM_ADD_XATTRS is not set
diff a/redhat/configs/ark/generic/CONFIG_EVM_ATTR_FSUUID
b/redhat/configs/ark/generic/CONFIG_EVM_ATTR_FSUUID
--- a/redhat/configs/ark/generic/CONFIG_EVM_ATTR_FSUUID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EVM_ATTR_FSUUID=y
diff a/redhat/configs/ark/generic/CONFIG_WATCHDOG_OPEN_TIMEOUT
b/redhat/configs/ark/generic/CONFIG_WATCHDOG_OPEN_TIMEOUT
--- a/redhat/configs/ark/generic/CONFIG_WATCHDOG_OPEN_TIMEOUT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
diff a/redhat/configs/ark/generic/CONFIG_DW_DMAC_PCI
b/redhat/configs/common/generic/CONFIG_DW_DMAC_PCI
--- a/redhat/configs/ark/generic/CONFIG_DW_DMAC_PCI
+++ b/redhat/configs/common/generic/CONFIG_DW_DMAC_PCI
diff a/redhat/configs/common/generic/arm/CONFIG_HOTPLUG_PCI_SHPC
b/redhat/configs/common/generic/CONFIG_HOTPLUG_PCI_SHPC
--- a/redhat/configs/common/generic/arm/CONFIG_HOTPLUG_PCI_SHPC
+++ b/redhat/configs/common/generic/CONFIG_HOTPLUG_PCI_SHPC
diff a/redhat/configs/ark/generic/arm/aarch64/CONFIG_DW_DMAC_PCI
b/redhat/configs/common/generic/arm/aarch64/CONFIG_DW_DMAC_PCI
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_DW_DMAC_PCI
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_DW_DMAC_PCI
diff a/redhat/configs/ark/generic/s390x/CONFIG_EXPOLINE_AUTO
b/redhat/configs/common/generic/s390x/CONFIG_EXPOLINE_AUTO
--- a/redhat/configs/ark/generic/s390x/CONFIG_EXPOLINE_AUTO
+++ b/redhat/configs/common/generic/s390x/CONFIG_EXPOLINE_AUTO
diff a/redhat/configs/common/generic/s390x/CONFIG_HOTPLUG_PCI_SHPC
b/redhat/configs/common/generic/s390x/CONFIG_HOTPLUG_PCI_SHPC
--- a/redhat/configs/common/generic/s390x/CONFIG_HOTPLUG_PCI_SHPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HOTPLUG_PCI_SHPC is not set
diff a/redhat/configs/ark/generic/x86/CONFIG_DW_DMAC_PCI
b/redhat/configs/common/generic/x86/CONFIG_DW_DMAC_PCI
--- a/redhat/configs/ark/generic/x86/CONFIG_DW_DMAC_PCI
+++ b/redhat/configs/common/generic/x86/CONFIG_DW_DMAC_PCI
diff a/redhat/configs/fedora/generic/CONFIG_EXPOLINE_AUTO
b/redhat/configs/fedora/generic/CONFIG_EXPOLINE_AUTO
--- a/redhat/configs/fedora/generic/CONFIG_EXPOLINE_AUTO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXPOLINE_AUTO is not set
diff a/redhat/configs/fedora/generic/CONFIG_EXPOLINE_FULL
b/redhat/configs/fedora/generic/CONFIG_EXPOLINE_FULL
--- a/redhat/configs/fedora/generic/CONFIG_EXPOLINE_FULL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXPOLINE_FULL=y
diff a/redhat/configs/fedora/generic/CONFIG_HOTPLUG_PCI_SHPC
b/redhat/configs/fedora/generic/CONFIG_HOTPLUG_PCI_SHPC
--- a/redhat/configs/fedora/generic/CONFIG_HOTPLUG_PCI_SHPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HOTPLUG_PCI_SHPC is not set
diff a/redhat/configs/fedora/generic/CONFIG_HW_RANDOM_BA431
b/redhat/configs/fedora/generic/CONFIG_HW_RANDOM_BA431
--- a/redhat/configs/fedora/generic/CONFIG_HW_RANDOM_BA431
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HW_RANDOM_BA431 is not set
diff a/redhat/configs/fedora/generic/CONFIG_QCOM_CPR
b/redhat/configs/fedora/generic/CONFIG_QCOM_CPR
--- a/redhat/configs/fedora/generic/CONFIG_QCOM_CPR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_CPR is not set
diff a/redhat/configs/fedora/generic/CONFIG_QCOM_EMAC
b/redhat/configs/fedora/generic/CONFIG_QCOM_EMAC
--- a/redhat/configs/fedora/generic/CONFIG_QCOM_EMAC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_EMAC is not set
diff a/redhat/configs/fedora/generic/CONFIG_QCOM_GPI_DMA
b/redhat/configs/fedora/generic/CONFIG_QCOM_GPI_DMA
--- a/redhat/configs/fedora/generic/CONFIG_QCOM_GPI_DMA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_GPI_DMA is not set
diff a/redhat/configs/fedora/generic/CONFIG_SERIAL_LANTIQ
b/redhat/configs/fedora/generic/CONFIG_SERIAL_LANTIQ
--- a/redhat/configs/fedora/generic/CONFIG_SERIAL_LANTIQ
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SERIAL_LANTIQ is not set
diff a/redhat/configs/fedora/generic/CONFIG_SPEAKUP
b/redhat/configs/fedora/generic/CONFIG_SPEAKUP
--- a/redhat/configs/fedora/generic/CONFIG_SPEAKUP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPEAKUP=m
diff a/redhat/configs/fedora/generic/CONFIG_SPEAKUP_SYNTH_ACNTPC
b/redhat/configs/fedora/generic/CONFIG_SPEAKUP_SYNTH_ACNTPC
--- a/redhat/configs/fedora/generic/CONFIG_SPEAKUP_SYNTH_ACNTPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SPEAKUP_SYNTH_ACNTPC is not set
diff a/redhat/configs/fedora/generic/CONFIG_SPEAKUP_SYNTH_ACNTSA
b/redhat/configs/fedora/generic/CONFIG_SPEAKUP_SYNTH_ACNTSA
--- a/redhat/configs/fedora/generic/CONFIG_SPEAKUP_SYNTH_ACNTSA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/996