From: Justin Forbes <[email protected]>

This reverts merge request !786
---
 redhat/configs/{common => ark}/debug/arm/aarch64/CONFIG_KASAN   | 0
 .../{common => ark}/debug/arm/aarch64/CONFIG_KASAN_GENERIC      | 0
 .../{common => ark}/debug/arm/aarch64/CONFIG_KASAN_INLINE       | 0
 redhat/configs/{common => ark}/debug/x86/x86_64/CONFIG_KASAN    | 0
 .../{common => ark}/debug/x86/x86_64/CONFIG_KASAN_GENERIC       | 0
 .../{common => ark}/debug/x86/x86_64/CONFIG_KASAN_INLINE        | 0
 redhat/configs/ark/generic/CONFIG_GCC_PLUGINS                   | 1 +
 redhat/configs/ark/generic/CONFIG_KASAN_EXTRA                   | 1 +
 redhat/configs/ark/generic/CONFIG_KASAN_GENERIC                 | 1 +
 .../configs/{common/debug => ark/generic}/CONFIG_KASAN_OUTLINE  | 0
 .../configs/common/debug/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL | 1 -
 redhat/configs/common/debug/CONFIG_INIT_STACK_NONE              | 1 -
 redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK      | 1 -
 .../common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL       | 2 +-
 redhat/configs/common/generic/CONFIG_INIT_STACK_NONE            | 2 +-
 redhat/configs/{common => fedora}/generic/CONFIG_GCC_PLUGINS    | 0
 redhat/configs/fedora/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK      | 1 +
 .../generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE                | 0
 redhat/kernel.spec.template                                     | 1 -
 19 files changed, 6 insertions(+), 6 deletions(-)
 rename redhat/configs/{common => ark}/debug/arm/aarch64/CONFIG_KASAN (100%)
 rename redhat/configs/{common => ark}/debug/arm/aarch64/CONFIG_KASAN_GENERIC 
(100%)
 rename redhat/configs/{common => ark}/debug/arm/aarch64/CONFIG_KASAN_INLINE 
(100%)
 rename redhat/configs/{common => ark}/debug/x86/x86_64/CONFIG_KASAN (100%)
 rename redhat/configs/{common => ark}/debug/x86/x86_64/CONFIG_KASAN_GENERIC 
(100%)
 rename redhat/configs/{common => ark}/debug/x86/x86_64/CONFIG_KASAN_INLINE 
(100%)
 create mode 100644 redhat/configs/ark/generic/CONFIG_GCC_PLUGINS
 create mode 100644 redhat/configs/ark/generic/CONFIG_KASAN_EXTRA
 create mode 100644 redhat/configs/ark/generic/CONFIG_KASAN_GENERIC
 rename redhat/configs/{common/debug => ark/generic}/CONFIG_KASAN_OUTLINE (100%)
 delete mode 100644 
redhat/configs/common/debug/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
 delete mode 100644 redhat/configs/common/debug/CONFIG_INIT_STACK_NONE
 delete mode 100644 redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK
 rename redhat/configs/{common => fedora}/generic/CONFIG_GCC_PLUGINS (100%)
 create mode 100644 redhat/configs/fedora/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK
 rename redhat/configs/{common => 
fedora}/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE (100%)

diff --git a/redhat/configs/common/debug/arm/aarch64/CONFIG_KASAN 
b/redhat/configs/ark/debug/arm/aarch64/CONFIG_KASAN
similarity index 100%
rename from redhat/configs/common/debug/arm/aarch64/CONFIG_KASAN
rename to redhat/configs/ark/debug/arm/aarch64/CONFIG_KASAN
diff --git a/redhat/configs/common/debug/arm/aarch64/CONFIG_KASAN_GENERIC 
b/redhat/configs/ark/debug/arm/aarch64/CONFIG_KASAN_GENERIC
similarity index 100%
rename from redhat/configs/common/debug/arm/aarch64/CONFIG_KASAN_GENERIC
rename to redhat/configs/ark/debug/arm/aarch64/CONFIG_KASAN_GENERIC
diff --git a/redhat/configs/common/debug/arm/aarch64/CONFIG_KASAN_INLINE 
b/redhat/configs/ark/debug/arm/aarch64/CONFIG_KASAN_INLINE
similarity index 100%
rename from redhat/configs/common/debug/arm/aarch64/CONFIG_KASAN_INLINE
rename to redhat/configs/ark/debug/arm/aarch64/CONFIG_KASAN_INLINE
diff --git a/redhat/configs/common/debug/x86/x86_64/CONFIG_KASAN 
b/redhat/configs/ark/debug/x86/x86_64/CONFIG_KASAN
similarity index 100%
rename from redhat/configs/common/debug/x86/x86_64/CONFIG_KASAN
rename to redhat/configs/ark/debug/x86/x86_64/CONFIG_KASAN
diff --git a/redhat/configs/common/debug/x86/x86_64/CONFIG_KASAN_GENERIC 
b/redhat/configs/ark/debug/x86/x86_64/CONFIG_KASAN_GENERIC
similarity index 100%
rename from redhat/configs/common/debug/x86/x86_64/CONFIG_KASAN_GENERIC
rename to redhat/configs/ark/debug/x86/x86_64/CONFIG_KASAN_GENERIC
diff --git a/redhat/configs/common/debug/x86/x86_64/CONFIG_KASAN_INLINE 
b/redhat/configs/ark/debug/x86/x86_64/CONFIG_KASAN_INLINE
similarity index 100%
rename from redhat/configs/common/debug/x86/x86_64/CONFIG_KASAN_INLINE
rename to redhat/configs/ark/debug/x86/x86_64/CONFIG_KASAN_INLINE
diff --git a/redhat/configs/ark/generic/CONFIG_GCC_PLUGINS 
b/redhat/configs/ark/generic/CONFIG_GCC_PLUGINS
new file mode 100644
index 000000000000..072e253edbeb
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_GCC_PLUGINS
@@ -0,0 +1 @@
+# CONFIG_GCC_PLUGINS is not set
diff --git a/redhat/configs/ark/generic/CONFIG_KASAN_EXTRA 
b/redhat/configs/ark/generic/CONFIG_KASAN_EXTRA
new file mode 100644
index 000000000000..bd13b3f187b8
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_KASAN_EXTRA
@@ -0,0 +1 @@
+# CONFIG_KASAN_EXTRA is not set
diff --git a/redhat/configs/ark/generic/CONFIG_KASAN_GENERIC 
b/redhat/configs/ark/generic/CONFIG_KASAN_GENERIC
new file mode 100644
index 000000000000..9e5c6e8e6922
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_KASAN_GENERIC
@@ -0,0 +1 @@
+# CONFIG_KASAN_GENERIC is not set
diff --git a/redhat/configs/common/debug/CONFIG_KASAN_OUTLINE 
b/redhat/configs/ark/generic/CONFIG_KASAN_OUTLINE
similarity index 100%
rename from redhat/configs/common/debug/CONFIG_KASAN_OUTLINE
rename to redhat/configs/ark/generic/CONFIG_KASAN_OUTLINE
diff --git a/redhat/configs/common/debug/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL 
b/redhat/configs/common/debug/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
deleted file mode 100644
index 83bd543915b6..000000000000
--- a/redhat/configs/common/debug/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
diff --git a/redhat/configs/common/debug/CONFIG_INIT_STACK_NONE 
b/redhat/configs/common/debug/CONFIG_INIT_STACK_NONE
deleted file mode 100644
index 16e74023a918..000000000000
--- a/redhat/configs/common/debug/CONFIG_INIT_STACK_NONE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INIT_STACK_NONE=y
diff --git a/redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK 
b/redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK
deleted file mode 100644
index ea3aac683cd6..000000000000
--- a/redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GCC_PLUGIN_STRUCTLEAK=y
diff --git 
a/redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL 
b/redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
index 1713b5628e90..83bd543915b6 100644
--- a/redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
+++ b/redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
@@ -1 +1 @@
-CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
diff --git a/redhat/configs/common/generic/CONFIG_INIT_STACK_NONE 
b/redhat/configs/common/generic/CONFIG_INIT_STACK_NONE
index 37f7832f62d2..16e74023a918 100644
--- a/redhat/configs/common/generic/CONFIG_INIT_STACK_NONE
+++ b/redhat/configs/common/generic/CONFIG_INIT_STACK_NONE
@@ -1 +1 @@
-# CONFIG_INIT_STACK_NONE is not set
+CONFIG_INIT_STACK_NONE=y
diff --git a/redhat/configs/common/generic/CONFIG_GCC_PLUGINS 
b/redhat/configs/fedora/generic/CONFIG_GCC_PLUGINS
similarity index 100%
rename from redhat/configs/common/generic/CONFIG_GCC_PLUGINS
rename to redhat/configs/fedora/generic/CONFIG_GCC_PLUGINS
diff --git a/redhat/configs/fedora/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK 
b/redhat/configs/fedora/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK
new file mode 100644
index 000000000000..23671269f90c
--- /dev/null
+++ b/redhat/configs/fedora/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK
@@ -0,0 +1 @@
+# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
diff --git a/redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE 
b/redhat/configs/fedora/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE
similarity index 100%
rename from redhat/configs/common/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE
rename to redhat/configs/fedora/generic/CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index 51e521c708d7..5941924711d4 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -505,7 +505,6 @@ BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, 
bison, flex
 BuildRequires: net-tools, hostname, bc, elfutils-devel
 BuildRequires: dwarves
 BuildRequires: python3-devel
-BuildRequires: gcc-plugin-devel
 %if %{with_headers}
 BuildRequires: rsync
 %endif
-- 
GitLab
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
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/[email protected]

Reply via email to