From: Patrick Talbert <ptalbert(a)redhat.com>
[redhat] configs: Add a generic facility for providing custom config options
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/configs/README b/redhat/configs/README
index blahblah..blahblah 100644
--- a/redhat/configs/README
+++ b/redhat/configs/README
@@ -41,6 +41,13 @@ to default in pending-common. These settings are moved to the fedora/
configuration directory after community review. Options are populated with
"make FLAVOR=fedora dist-commit-configs".
+custom-overrides - This directory contains an empty set of the generic and debug
+arch-specific directory tree. Any config option set here is applied last and
+therefore will override anything set in the ark, fedora, or pending directories.
+This allows users to easily override a config option without altering the
+standard directories. Users can even maintain their own branch with a full set
+of custom configuration options that can be easily be rebased on top of
+os-build without worrying about conflicts.
All the configuration options for each arch and variant can be found
in the "priority" file.
diff --git a/redhat/configs/custom-overrides/debug/arm/aarch64/README
b/redhat/configs/custom-overrides/debug/arm/aarch64/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/debug/arm/aarch64/README
diff --git a/redhat/configs/custom-overrides/debug/arm/armv7/README
b/redhat/configs/custom-overrides/debug/arm/armv7/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/debug/arm/armv7/README
diff --git a/redhat/configs/custom-overrides/debug/powerpc/README
b/redhat/configs/custom-overrides/debug/powerpc/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/debug/powerpc/README
diff --git a/redhat/configs/custom-overrides/debug/s390x/README
b/redhat/configs/custom-overrides/debug/s390x/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/debug/s390x/README
diff --git a/redhat/configs/custom-overrides/debug/x86/x86_64/README
b/redhat/configs/custom-overrides/debug/x86/x86_64/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/debug/x86/x86_64/README
diff --git a/redhat/configs/custom-overrides/generic/arm/aarch64/README
b/redhat/configs/custom-overrides/generic/arm/aarch64/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/generic/arm/aarch64/README
diff --git a/redhat/configs/custom-overrides/generic/arm/armv7/README
b/redhat/configs/custom-overrides/generic/arm/armv7/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/generic/arm/armv7/README
diff --git a/redhat/configs/custom-overrides/generic/arm/armv7/armv7/README
b/redhat/configs/custom-overrides/generic/arm/armv7/armv7/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/generic/arm/armv7/armv7/README
diff --git a/redhat/configs/custom-overrides/generic/arm/armv7/lpae/README
b/redhat/configs/custom-overrides/generic/arm/armv7/lpae/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/generic/arm/armv7/lpae/README
diff --git a/redhat/configs/custom-overrides/generic/powerpc/README
b/redhat/configs/custom-overrides/generic/powerpc/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/generic/powerpc/README
diff --git a/redhat/configs/custom-overrides/generic/s390x/README
b/redhat/configs/custom-overrides/generic/s390x/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/generic/s390x/README
diff --git a/redhat/configs/custom-overrides/generic/s390x/zfcpdump/README
b/redhat/configs/custom-overrides/generic/s390x/zfcpdump/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/generic/s390x/zfcpdump/README
diff --git a/redhat/configs/custom-overrides/generic/x86/i686/README
b/redhat/configs/custom-overrides/generic/x86/i686/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/generic/x86/i686/README
diff --git a/redhat/configs/custom-overrides/generic/x86/x86_64/README
b/redhat/configs/custom-overrides/generic/x86/x86_64/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/custom-overrides/generic/x86/x86_64/README
diff --git a/redhat/configs/priority.fedora b/redhat/configs/priority.fedora
index blahblah..blahblah 100644
--- a/redhat/configs/priority.fedora
+++ b/redhat/configs/priority.fedora
@@ -16,7 +16,7 @@
# kernel.config files are build on the fly based on this config,
# the first arg is arch and variant, the second is a hierarchy of
# config options, lowest priority to highest
-ORDER=common pending-common fedora pending-fedora
+ORDER=common pending-common fedora pending-fedora custom-overrides
EMPTY=s390x-zfcpdump
# x86_64
diff --git a/redhat/configs/priority.rhel b/redhat/configs/priority.rhel
index blahblah..blahblah 100644
--- a/redhat/configs/priority.rhel
+++ b/redhat/configs/priority.rhel
@@ -16,7 +16,7 @@
# kernel.config files are build on the fly based on this config,
# the first arg is arch and variant, the second is a hierarchy of
# config options, lowest priority to highest
-ORDER=common ark pending-common
+ORDER=common ark pending-common custom-overrides
EMPTY=armv7hl armv7hl-debug armv7hl-lpae armv7hl-lpae-debug i686 i686-debug
# x86_64
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1174