backports: move packaging kconfig hacks to its own file

Move packaging kconfig hacks to its own file, we'll be ignoring
this file later for postprocessing. Keeping this in a separate
file will make parsing much simpler.

Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>

diff --git a/backport/Kconfig b/backport/Kconfig
index b14a2688837d0fc4b2cdf127488e6c3e14bb0ce6..a8f28671004dc16d30dd9f4ef59ecbb4aee175df 100644 (file)
--- a/backport/Kconfig
+++ b/backport/Kconfig
@@ -14,13 +14,8 @@ config BACKPORTED_KERNEL_NAME
 source Kconfig.kernel
 source Kconfig.versions
 
-# some hacks ...
-config WIRELESS
-       def_bool y
-config NET_CORE
-       def_bool y
-config EXPERT
-       def_bool y
+# Packaging hacks
+source Kconfig.package.hacks
 
 # this has the configuration for the backport code
 source compat/Kconfig

diff --git a/backport/Kconfig.package.hacks b/backport/Kconfig.package.hacks
new file mode 100644 (file)
index 0000000..6a429dd
--- /dev/null
+++ b/backport/Kconfig.package.hacks
@@ -0,0 +1,8 @@
+# some hacks for when we use backports to generate a package
+# to build modules out of tree.
+config WIRELESS
+       def_bool y
+config NET_CORE
+       def_bool y
+config EXPERT
+       def_bool y

diff --git a/gentree.py b/gentree.py
index 59ae19d6f996f46342f107e7b89b2ca60f0b4a58..7a6deef80c2a9254842dce9a8911931e72b155b5 100755 (executable)
--- a/gentree.py
+++ b/gentree.py
@@ -731,7 +731,8 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
 
     # do the copy
     backport_files = [(x, x) for x in [
-        'Kconfig', 'Makefile', 'Makefile.build', 'Makefile.kernel', '.gitignore',
+        'Kconfig', 'Kconfig.package.hacks',
+        'Makefile', 'Makefile.build', 'Makefile.kernel', '.gitignore',
         'Makefile.real', 'compat/', 'backport-include/', 'kconf/',
         'scripts/', '.blacklist.map',
     ]]