From: Don Zickus <dzic...@redhat.com>

Remove duplicate configs acroos fedora, ark and common

No functional change, just a bunch of bash commands to filter
out duplicate configs.

* fedora configs in common/ are deleted
* fedora configs found in ark/ moved to common and deleted
* ark configs found in common are deleted

For those that want to play at home:

cd redhat/configs
diff -qrup fedora/ ark/ > /tmp/donark.diff
diff -qrup fedora/ common/ > /tmp/doncommon.diff
diff -qrup ark/ common/ > /tmp/donac.diff
sed 's/Only in //;s/Files //;s/: /\//;s/ and /\n/;s/ differ//'
    /tmp/donark.diff > /tmp/donark.filt
sed 's/Only in //;s/Files //;s/: /\//;s/ and /\n/;s/ differ//'
    /tmp/doncommon.diff > /tmp/doncommon.filt
sed 's/Only in //;s/Files //;s/: /\//;s/ and /\n/;s/ differ//'
    /tmp/donac.diff > /tmp/donac.filt
find fedora/ -type f|sort > /tmp/fedora
find ark/ -type f|sort > /tmp/ark
find common/ -type f|sort > /tmp/common

creates the data files.

Then find the duplicates by looking for the files *not* found in the
diff output (as Only or differ).

grep -v -f /tmp/donark.filt /tmp/fedora |less
  # git mv ark->common; git rm fedora
grep -v -f /tmp/doncommon.filt /tmp/fedora |xargs git rm
grep -v -f /tmp/donac.filt /tmp/ark|xargs git rm

FYI - much much faster than evaluate_configs -j :-)))

Signed-off-by: Don Zickus <dzic...@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/arm/aarch64/CONFIG_THUNDER_NIC_BGX 
b/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_BGX
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_BGX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDER_NIC_BGX=m
diff a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_PF 
b/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_PF
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_PF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDER_NIC_PF=m
diff a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_RGX 
b/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_RGX
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_RGX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDER_NIC_RGX=m
diff a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_VF 
b/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_VF
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_VF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDER_NIC_VF=m
diff a/redhat/configs/ark/generic/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE 
b/redhat/configs/ark/generic/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
--- a/redhat/configs/ark/generic/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
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/ark/generic/s390x/CONFIG_HMC_DRV 
b/redhat/configs/common/generic/s390x/CONFIG_HMC_DRV
--- a/redhat/configs/ark/generic/s390x/CONFIG_HMC_DRV
+++ b/redhat/configs/common/generic/s390x/CONFIG_HMC_DRV
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_CHELSIO_TLS_DEVICE 
b/redhat/configs/fedora/generic/CONFIG_CHELSIO_TLS_DEVICE
--- a/redhat/configs/fedora/generic/CONFIG_CHELSIO_TLS_DEVICE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHELSIO_TLS_DEVICE=m
diff a/redhat/configs/fedora/generic/CONFIG_FB_MODE_HELPERS 
b/redhat/configs/fedora/generic/CONFIG_FB_MODE_HELPERS
--- a/redhat/configs/fedora/generic/CONFIG_FB_MODE_HELPERS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_MODE_HELPERS 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_MAGIC_SYSRQ_SERIAL_SEQUENCE 
b/redhat/configs/fedora/generic/CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE
--- a/redhat/configs/fedora/generic/CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
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_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

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/996
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

Reply via email to