From 239d467bc4451760afb6932e154da245768bd509 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 6 Nov 2014 11:17:36 -0800 Subject: [PATCH] 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 --- backport/Kconfig | 9 ++------- backport/Kconfig.package.hacks | 8 ++++++++ gentree.py | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 backport/Kconfig.package.hacks diff --git a/backport/Kconfig b/backport/Kconfig index b14a2688837d..a8f28671004d 100644 --- 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 index 000000000000..6a429dd107fd --- /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 59ae19d6f996..7a6deef80c2a 100755 --- 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', ]] -- 2.30.2