* [PATCH v1 01/11] backports: move legacy and SmPL patch application into helper
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
@ 2014-11-04 8:42 ` Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 02/11] backports: extend module_init() module_exit() for built-in Luis R. Rodriguez
` (9 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:42 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This allows us to extend how backports uses patches for
different types of applications. This will later be used
for kernel integration support, for example.
This should have no functional change.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
gentree.py | 279 +++++++++++++++++++++++++++++++------------------------------
1 file changed, 144 insertions(+), 135 deletions(-)
diff --git a/gentree.py b/gentree.py
index 9b4db98..59ae19d 100755
--- a/gentree.py
+++ b/gentree.py
@@ -438,6 +438,149 @@ def upload_release(args, rel_prep, logwrite=lambda x:None):
kup_cmd = "kup put /\n\t\t%s /\n\t\t%s /\n\t\t%s" % (gzip_name, tar_name + '.asc', korg_path)
logwrite("kup-test: skipping cmd: %s" % kup_cmd)
+def apply_patches(args, desc, source_dir, patch_src, target_dir, logwrite=lambda x:None):
+ """
+ Given a path of a directories of patches and SmPL patches apply
+ them on the target directory. If requested refresh patches, or test
+ a specific SmPL patch.
+ """
+ logwrite('Applying patches from %s to %s ...' % (patch_src, target_dir))
+ test_cocci = args.test_cocci or args.profile_cocci
+ test_cocci_found = False
+ patches = []
+ sempatches = []
+ for root, dirs, files in os.walk(os.path.join(source_dir, patch_src)):
+ for f in files:
+ if not test_cocci and f.endswith('.patch'):
+ patches.append(os.path.join(root, f))
+ if f.endswith('.cocci'):
+ if test_cocci:
+ if f not in test_cocci:
+ continue
+ test_cocci_found = True
+ if args.test_cocci:
+ logwrite("Testing Coccinelle SmPL patch: %s" % test_cocci)
+ elif args.profile_cocci:
+ logwrite("Profiling Coccinelle SmPL patch: %s" % test_cocci)
+ sempatches.append(os.path.join(root, f))
+ patches.sort()
+ prefix_len = len(os.path.join(source_dir, patch_src)) + 1
+ for pfile in patches:
+ print_name = pfile[prefix_len:]
+ # read the patch file
+ p = patch.fromfile(pfile)
+ # complain if it's not a patch
+ if not p:
+ raise Exception('No patch content found in %s' % print_name)
+ # leading / seems to be stripped?
+ if 'dev/null' in p.items[0].source:
+ raise Exception('Patches creating files are not supported (in %s)' % print_name)
+ # check if the first file the patch touches exists, if so
+ # assume the patch needs to be applied -- otherwise continue
+ patched_file = '/'.join(p.items[0].source.split('/')[1:])
+ fullfn = os.path.join(target_dir, patched_file)
+ if not os.path.exists(fullfn):
+ if args.verbose:
+ logwrite("Not applying %s, not needed" % print_name)
+ continue
+ if args.verbose:
+ logwrite("Applying patch %s" % print_name)
+
+ if args.refresh:
+ # but for refresh, of course look at all files the patch touches
+ for patchitem in p.items:
+ patched_file = '/'.join(patchitem.source.split('/')[1:])
+ fullfn = os.path.join(target_dir, patched_file)
+ shutil.copyfile(fullfn, fullfn + '.orig_file')
+
+ process = subprocess.Popen(['patch', '-p1'], stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT, stdin=subprocess.PIPE,
+ close_fds=True, universal_newlines=True,
+ cwd=target_dir)
+ output = process.communicate(input=open(pfile, 'r').read())[0]
+ output = output.split('\n')
+ if output[-1] == '':
+ output = output[:-1]
+ if args.verbose:
+ for line in output:
+ logwrite('> %s' % line)
+ if process.returncode != 0:
+ if not args.verbose:
+ logwrite("Failed to apply changes from %s" % print_name)
+ for line in output:
+ logwrite('> %s' % line)
+ raise Exception('Patch failed')
+
+ if args.refresh:
+ pfilef = open(pfile + '.tmp', 'a')
+ pfilef.write(p.top_header)
+ pfilef.flush()
+ for patchitem in p.items:
+ patched_file = '/'.join(patchitem.source.split('/')[1:])
+ fullfn = os.path.join(target_dir, patched_file)
+ process = subprocess.Popen(['diff', '-p', '-u', patched_file + '.orig_file', patched_file,
+ '--label', 'a/' + patched_file,
+ '--label', 'b/' + patched_file],
+ stdout=pfilef, close_fds=True,
+ universal_newlines=True, cwd=target_dir)
+ process.wait()
+ os.unlink(fullfn + '.orig_file')
+ if not process.returncode in (0, 1):
+ logwrite("Failed to diff to refresh %s" % print_name)
+ pfilef.close()
+ os.unlink(pfile + '.tmp')
+ raise Exception('Refresh failed')
+ pfilef.close()
+ os.rename(pfile + '.tmp', pfile)
+
+ # remove orig/rej files that patch sometimes creates
+ for root, dirs, files in os.walk(target_dir):
+ for f in files:
+ if f[-5:] == '.orig' or f[-4:] == '.rej':
+ os.unlink(os.path.join(root, f))
+ git_debug_snapshot(args, "apply %s patch %s" % (desc, print_name))
+
+ sempatches.sort()
+ prefix_len = len(os.path.join(source_dir, patch_src)) + 1
+
+ for cocci_file in sempatches:
+ # Until Coccinelle picks this up
+ pycocci = os.path.join(source_dir, 'devel/pycocci')
+ cmd = [pycocci, cocci_file]
+ extra_spatch_args = []
+ if args.profile_cocci:
+ cmd.append('--profile-cocci')
+ cmd.append(os.path.abspath(target_dir))
+ print_name = cocci_file[prefix_len:]
+ if args.verbose:
+ logwrite("Applying SmPL patch %s" % print_name)
+ sprocess = subprocess.Popen(cmd,
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+ close_fds=True, universal_newlines=True,
+ cwd=target_dir)
+ output = sprocess.communicate()[0]
+ sprocess.wait()
+ if sprocess.returncode != 0:
+ logwrite("Failed to process SmPL patch %s" % print_name)
+ raise Exception('SmPL patch failed')
+ output = output.split('\n')
+ if output[-1] == '':
+ output = output[:-1]
+ if args.verbose:
+ for line in output:
+ logwrite('> %s' % line)
+
+ # remove cocci_backup files
+ for root, dirs, files in os.walk(target_dir):
+ for f in files:
+ if f.endswith('.cocci_backup'):
+ os.unlink(os.path.join(root, f))
+ git_debug_snapshot(args, "apply %s SmPL patch %s" % (desc, print_name))
+
+ if test_cocci and test_cocci_found:
+ logwrite('Done!')
+ sys.exit(0)
+
def _main():
# Our binary requirements go here
req = reqs.Req()
@@ -620,141 +763,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
bpcfg.disable_symbols(disable_list)
git_debug_snapshot(args, 'Add automatic backports')
- test_cocci = args.test_cocci or args.profile_cocci
-
- logwrite('Apply patches ...')
- patches = []
- sempatches = []
- for root, dirs, files in os.walk(os.path.join(source_dir, 'patches')):
- for f in files:
- if not test_cocci and f.endswith('.patch'):
- patches.append(os.path.join(root, f))
- if f.endswith('.cocci'):
- if test_cocci:
- if f not in test_cocci:
- continue
- if args.test_cocci:
- logwrite("Testing Coccinelle SmPL patch: %s" % test_cocci)
- elif args.profile_cocci:
- logwrite("Profiling Coccinelle SmPL patch: %s" % test_cocci)
- sempatches.append(os.path.join(root, f))
- patches.sort()
- prefix_len = len(os.path.join(source_dir, 'patches')) + 1
- for pfile in patches:
- print_name = pfile[prefix_len:]
- # read the patch file
- p = patch.fromfile(pfile)
- # complain if it's not a patch
- if not p:
- raise Exception('No patch content found in %s' % print_name)
- # leading / seems to be stripped?
- if 'dev/null' in p.items[0].source:
- raise Exception('Patches creating files are not supported (in %s)' % print_name)
- # check if the first file the patch touches exists, if so
- # assume the patch needs to be applied -- otherwise continue
- patched_file = '/'.join(p.items[0].source.split('/')[1:])
- fullfn = os.path.join(args.outdir, patched_file)
- if not os.path.exists(fullfn):
- if args.verbose:
- logwrite("Not applying %s, not needed" % print_name)
- continue
- if args.verbose:
- logwrite("Applying patch %s" % print_name)
-
- if args.refresh:
- # but for refresh, of course look at all files the patch touches
- for patchitem in p.items:
- patched_file = '/'.join(patchitem.source.split('/')[1:])
- fullfn = os.path.join(args.outdir, patched_file)
- shutil.copyfile(fullfn, fullfn + '.orig_file')
-
- process = subprocess.Popen(['patch', '-p1'], stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT, stdin=subprocess.PIPE,
- close_fds=True, universal_newlines=True,
- cwd=args.outdir)
- output = process.communicate(input=open(pfile, 'r').read())[0]
- output = output.split('\n')
- if output[-1] == '':
- output = output[:-1]
- if args.verbose:
- for line in output:
- logwrite('> %s' % line)
- if process.returncode != 0:
- if not args.verbose:
- logwrite("Failed to apply changes from %s" % print_name)
- for line in output:
- logwrite('> %s' % line)
- return 2
-
- if args.refresh:
- pfilef = open(pfile + '.tmp', 'a')
- pfilef.write(p.top_header)
- pfilef.flush()
- for patchitem in p.items:
- patched_file = '/'.join(patchitem.source.split('/')[1:])
- fullfn = os.path.join(args.outdir, patched_file)
- process = subprocess.Popen(['diff', '-p', '-u', patched_file + '.orig_file', patched_file,
- '--label', 'a/' + patched_file,
- '--label', 'b/' + patched_file],
- stdout=pfilef, close_fds=True,
- universal_newlines=True, cwd=args.outdir)
- process.wait()
- os.unlink(fullfn + '.orig_file')
- if not process.returncode in (0, 1):
- logwrite("Failed to diff to refresh %s" % print_name)
- pfilef.close()
- os.unlink(pfile + '.tmp')
- return 3
- pfilef.close()
- os.rename(pfile + '.tmp', pfile)
-
- # remove orig/rej files that patch sometimes creates
- for root, dirs, files in os.walk(args.outdir):
- for f in files:
- if f[-5:] == '.orig' or f[-4:] == '.rej':
- os.unlink(os.path.join(root, f))
- git_debug_snapshot(args, "apply backport patch %s" % print_name)
-
- sempatches.sort()
- prefix_len = len(os.path.join(source_dir, 'patches')) + 1
-
- for cocci_file in sempatches:
- # Until Coccinelle picks this up
- pycocci = os.path.join(source_dir, 'devel/pycocci')
- cmd = [pycocci, cocci_file]
- extra_spatch_args = []
- if args.profile_cocci:
- cmd.append('--profile-cocci')
- cmd.append(os.path.abspath(args.outdir))
- print_name = cocci_file[prefix_len:]
- if args.verbose:
- logwrite("Applying SmPL patch %s" % print_name)
- sprocess = subprocess.Popen(cmd,
- stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
- close_fds=True, universal_newlines=True,
- cwd=args.outdir)
- output = sprocess.communicate()[0]
- sprocess.wait()
- if sprocess.returncode != 0:
- logwrite("Failed to process SmPL patch %s" % print_name)
- return 3
- output = output.split('\n')
- if output[-1] == '':
- output = output[:-1]
- if args.verbose:
- for line in output:
- logwrite('> %s' % line)
-
- # remove cocci_backup files
- for root, dirs, files in os.walk(args.outdir):
- for f in files:
- if f.endswith('.cocci_backup'):
- os.unlink(os.path.join(root, f))
- git_debug_snapshot(args, "apply backport SmPL patch %s" % print_name)
-
- if test_cocci:
- logwrite('Done!')
- return 0
+ apply_patches(args, "backport", source_dir, 'patches', args.outdir, logwrite)
# some post-processing is required
configtree = kconfig.ConfigTree(os.path.join(args.outdir, 'Kconfig'))
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v1 02/11] backports: extend module_init() module_exit() for built-in
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 01/11] backports: move legacy and SmPL patch application into helper Luis R. Rodriguez
@ 2014-11-04 8:42 ` Luis R. Rodriguez
2014-11-04 10:02 ` Johannes Berg
2014-11-04 8:42 ` [PATCH v1 03/11] backports: allow for different backport prefix Luis R. Rodriguez
` (8 subsequent siblings)
10 siblings, 1 reply; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:42 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
When backports is used we want to identify the provenance
of the code used to generate the backport. We do this by
simply requiring all used drivers to at leats check in
with the backports module which identifies the backport.
We had this in place for modules but not for built-in, add
the respective set of helpers for it.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
backport/backport-include/linux/module.h | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/backport/backport-include/linux/module.h b/backport/backport-include/linux/module.h
index 82c96bd..8942c5b 100644
--- a/backport/backport-include/linux/module.h
+++ b/backport/backport-include/linux/module.h
@@ -25,6 +25,30 @@ extern void backport_dependency_symbol(void);
" using backports " BACKPORTS_VERSION);
#endif
+#ifndef MODULE
+/*
+ * Forcing the backports module to load allows us to easily
+ * identify the backport.
+ */
+#undef module_init
+#define module_init(fn) \
+ static int __init __init_backport_##fn(void) \
+ { \
+ backport_dependency_symbol(); \
+ return fn(); \
+ } \
+ __initcall(__init_backport_##fn);
+
+#undef module_exit
+#define module_exit(fn) \
+ static void __exit __exit_backport_##fn(void) \
+ { \
+ fn(); \
+ rcu_barrier(); \
+ } \
+ __exitcall(__exit_backport_##fn);
+
+#else
#undef module_init
#define module_init(initfn) \
static int __init __init_backport(void) \
@@ -58,6 +82,7 @@ extern void backport_dependency_symbol(void);
rcu_barrier(); \
} \
void cleanup_module(void) __attribute__((alias("__exit_compat")));
+#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
#undef param_check_bool
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v1 02/11] backports: extend module_init() module_exit() for built-in
2014-11-04 8:42 ` [PATCH v1 02/11] backports: extend module_init() module_exit() for built-in Luis R. Rodriguez
@ 2014-11-04 10:02 ` Johannes Berg
0 siblings, 0 replies; 26+ messages in thread
From: Johannes Berg @ 2014-11-04 10:02 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: backports, linux-kernel, yann.morin.1998, mmarek, sassmann,
Luis R. Rodriguez
On Tue, 2014-11-04 at 00:42 -0800, Luis R. Rodriguez wrote:
> +#ifndef MODULE
> +/*
> + * Forcing the backports module to load allows us to easily
> + * identify the backport.
> + */
That comment is wrong really, making the dependency on the symbol forced
the backport module to load but if it's built-in that makes no sense.
> +#undef module_init
> +#define module_init(fn) \
> + static int __init __init_backport_##fn(void) \
> + { \
> + backport_dependency_symbol(); \
That won't do anything at all after all.
> + return fn(); \
> + } \
> + __initcall(__init_backport_##fn);
> +
> +#undef module_exit
> +#define module_exit(fn) \
> + static void __exit __exit_backport_##fn(void) \
> + { \
> + fn(); \
> + rcu_barrier(); \
> + } \
> + __exitcall(__exit_backport_##fn);
This is also pointless if it's built-in.
I don't think this patch makes sense, you just want to add the "#ifdef
MODULE" I guess.
johannes
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v1 03/11] backports: allow for different backport prefix
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 01/11] backports: move legacy and SmPL patch application into helper Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 02/11] backports: extend module_init() module_exit() for built-in Luis R. Rodriguez
@ 2014-11-04 8:42 ` Luis R. Rodriguez
2014-11-04 10:05 ` Johannes Berg
2014-11-04 8:42 ` [PATCH v1 04/11] backports: replace BACKPORT_PWD with BACKPORT_DIR Luis R. Rodriguez
` (7 subsequent siblings)
10 siblings, 1 reply; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:42 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
The way we backport when packaging is to minimize the amount of
changes required by taking advantage of the fact that Kconfig
will treat can read CONFIG_ an environment variable with getenv()
when parsing menu entries. When doing integration we don't want
to do this so instead we'll rely on the CONFIG_BACKPORT prefix.
This requires a bit of work on our current parsers.
This adds some initial code for integration, this doesn't run yet.
Although adjust_backported_configs() runs when packaging right now
this just removes some comments out the top level Kconfig, but
leaves the code in place should it later want to consider using
CONFIG_BACKPORT prefix and the gains of now allowing to build
when a respective symbols is already built in.
As a small enhancement add to each backported local symbol a
dependency to require the user's kernel to not have built-in the
backported symbols when packaging, this allows to get rid of the
checks in checks.h, we make this more generic for all drivers and
subsystems we backport now.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
backport/Kconfig | 6 ++-
devel/ckmake | 2 +
devel/doc/kconfig-operation | 4 +-
gentree.py | 53 ++++++++++++++++++-------
lib/kconfig.py | 94 ++++++++++++++++++++++++++++++++++++++++++++-
5 files changed, 140 insertions(+), 19 deletions(-)
diff --git a/backport/Kconfig b/backport/Kconfig
index b14a268..f63f4fd 100644
--- a/backport/Kconfig
+++ b/backport/Kconfig
@@ -14,11 +14,15 @@ config BACKPORTED_KERNEL_NAME
source Kconfig.kernel
source Kconfig.versions
-# some hacks ...
+# some hacks for when we use backports to generate a package
+# to build modules out of tree.
+#ignore-parser-package
config WIRELESS
def_bool y
+#ignore-parser-package
config NET_CORE
def_bool y
+#ignore-parser-package
config EXPERT
def_bool y
diff --git a/devel/ckmake b/devel/ckmake
index 0c238a6..6070d8f 100755
--- a/devel/ckmake
+++ b/devel/ckmake
@@ -165,6 +165,7 @@ def process_kernel(num, kset, cmdline_args):
all_config_name = os.path.join(work_dir, 'all.config')
all_config = open(all_config_name, 'w')
all_config.write("CPTCFG_CFG80211_INTERNAL_REGDB=n\n")
+ all_config.write("CONFIG_BACKPORT_CFG80211_INTERNAL_REGDB=n\n")
config_name = 'allnoconfig'
if cmdline_args.allyesconfig:
config_name = 'allyesconfig'
@@ -173,6 +174,7 @@ def process_kernel(num, kset, cmdline_args):
open(os.path.join(work_dir, 'defconfigs', cmdline_args.defconfig)).read())
else:
all_config.write("CPTCFG_BACKPORT_USERSEL_BUILD_ALL=y\n")
+ all_config.write("CONFIG_BACKPORT_CFG80211_INTERNAL_REGDB=y\n")
all_config.close()
all_config_env = os.environ.copy()
diff --git a/devel/doc/kconfig-operation b/devel/doc/kconfig-operation
index 0245889..f1ecf60 100644
--- a/devel/doc/kconfig-operation
+++ b/devel/doc/kconfig-operation
@@ -63,7 +63,7 @@ being compiled against is older than X.
All together, this allows the correct options to be selected by the user.
-There's one more caveat: At backport configuration time, the CONFIG_
+When using Linux backports as a packaged solution the the CONFIG_
environment variable is set to CPTCFG_ ("compat config", but also chosen
because it has the same length as CONFIG_). This shows up in the .config
file and other places, and in fact in all makefiles and in the code. The
@@ -73,8 +73,6 @@ This allows code to, for example, have "#ifdef CONFIG_PM" which can only
be set or cleared in the kernel, not in the backport configuration. Since
this is needed, a transformation step is done at backport creation time.
-
-
Backport creation for Kconfig
-------------------------------
diff --git a/gentree.py b/gentree.py
index 59ae19d..3d4a8b4 100755
--- a/gentree.py
+++ b/gentree.py
@@ -42,7 +42,7 @@ def read_copy_list(copyfile):
return ret
-def read_dependencies(depfilename):
+def read_dependencies(depfilename, bp_prefix):
"""
Read a (the) dependency file and return the list of
dependencies as a dictionary, mapping a Kconfig symbol
@@ -71,6 +71,9 @@ def read_dependencies(depfilename):
ret[sym].append(kconfig_exp)
else:
sym, dep = item.split()
+ if bp_prefix != 'CPTCFG_':
+ dep_prefix = re.sub(r'^CONFIG_(.*)', r'\1', bp_prefix)
+ sym = dep_prefix + sym
if not sym in ret:
ret[sym] = [dep, ]
else:
@@ -195,7 +198,7 @@ def automatic_backport_mangle_c_file(name):
return name.replace('/', '-')
-def add_automatic_backports(args):
+def add_automatic_backports(args, bp_prefix):
disable_list = []
export = re.compile(r'^EXPORT_SYMBOL(_GPL)?\((?P<sym>[^\)]*)\)')
bpi = kconfig.get_backport_info(os.path.join(args.outdir, 'compat', 'Kconfig'))
@@ -228,9 +231,9 @@ def add_automatic_backports(args):
raise Exception('backporting a module requires a #module-name')
for of in o_files:
mf.write('%s-objs += %s\n' % (module_name, of))
- mf.write('obj-$(CPTCFG_%s) += %s.o\n' % (sym, module_name))
+ mf.write('obj-$(%s%s) += %s.o\n' % (bp_prefix, sym, module_name))
elif symtype == 'bool':
- mf.write('compat-$(CPTCFG_%s) += %s\n' % (sym, ' '.join(o_files)))
+ mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
# finally create the include file
syms = []
@@ -243,14 +246,14 @@ def add_automatic_backports(args):
for f in h_files:
outf = open(os.path.join(args.outdir, 'include', f), 'w')
outf.write('/* Automatically created during backport process */\n')
- outf.write('#ifndef CPTCFG_%s\n' % sym)
+ outf.write('#ifndef %s%s\n' % (bp_prefix, sym))
outf.write('#include_next <%s>\n' % f)
outf.write('#else\n');
for s in syms:
outf.write('#undef %s\n' % s)
outf.write('#define %s LINUX_BACKPORT(%s)\n' % (s, s))
outf.write('#include <%s>\n' % (os.path.dirname(f) + '/backport-' + os.path.basename(f), ))
- outf.write('#endif /* CPTCFG_%s */\n' % sym)
+ outf.write('#endif /* %s%s */\n' % (bp_prefix, sym))
return disable_list
def git_debug_init(args):
@@ -695,6 +698,19 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
gitdebug, verbose, extra_driver, kup, kup_test,
test_cocci, profile_cocci)
rel_prep = None
+ integrate = False
+
+ # When building a package we use CPTCFG as we can rely on the
+ # fact that kconfig treats CONFIG_ as an environment variable
+ # requring less changes on code. For kernel integration we use
+ # the longer CONFIG_BACKPORT given that we'll be sticking to
+ # the kernel symbol namespace, to address that we do a final
+ # search / replace. Technically its possible to rely on the
+ # same prefix for packaging as with kernel integration but
+ # there are already som users of the CPTCFG prefix.
+ bp_prefix = 'CPTCFG_'
+ if integrate:
+ bp_prefix = 'CONFIG_BACKPORT_'
# start processing ...
if (args.kup or args.kup_test):
@@ -724,7 +740,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
sys.exit(1)
copy_list = read_copy_list(args.copy_list)
- deplist = read_dependencies(os.path.join(source_dir, 'dependencies'))
+ deplist = read_dependencies(os.path.join(source_dir, 'dependencies'), bp_prefix)
# validate output directory
check_output_dir(args.outdir, args.clean)
@@ -757,7 +773,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
git_debug_snapshot(args, 'Add driver sources')
- disable_list = add_automatic_backports(args)
+ disable_list = add_automatic_backports(args, bp_prefix)
if disable_list:
bpcfg = kconfig.ConfigTree(os.path.join(args.outdir, 'compat', 'Kconfig'))
bpcfg.disable_symbols(disable_list)
@@ -767,11 +783,19 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
# some post-processing is required
configtree = kconfig.ConfigTree(os.path.join(args.outdir, 'Kconfig'))
+ orig_symbols = configtree.symbols()
+
logwrite('Modify Kconfig tree ...')
configtree.prune_sources(ignore=['Kconfig.kernel', 'Kconfig.versions'])
git_debug_snapshot(args, "prune Kconfig tree")
- configtree.force_tristate_modular()
- git_debug_snapshot(args, "force tristate options modular")
+
+ if not integrate:
+ configtree.force_tristate_modular()
+ git_debug_snapshot(args, "force tristate options modular")
+
+ configtree.adjust_backported_configs(integrate, orig_symbols, bp_prefix)
+ git_debug_snapshot(args, "adjust backports config symbols we port")
+
configtree.modify_selects()
git_debug_snapshot(args, "convert select to depends on")
@@ -828,8 +852,9 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
# rewrite Makefile and source symbols
regexes = []
- for some_symbols in [symbols[i:i + 50] for i in range(0, len(symbols), 50)]:
- r = 'CONFIG_((' + '|'.join([s + '(_MODULE)?' for s in some_symbols]) + ')([^A-Za-z0-9_]|$))'
+ all_symbols = orig_symbols + symbols
+ for some_symbols in [all_symbols[i:i + 50] for i in range(0, len(all_symbols), 50)]:
+ r = 'CONFIG_((?!BACKPORT)(' + '|'.join([s + '(_MODULE)?' for s in some_symbols]) + ')([^A-Za-z0-9_]|$))'
regexes.append(re.compile(r, re.MULTILINE))
for root, dirs, files in os.walk(args.outdir):
# don't go into .git dir (possible debug thing)
@@ -838,7 +863,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
for f in files:
data = open(os.path.join(root, f), 'r').read()
for r in regexes:
- data = r.sub(r'CPTCFG_\1', data)
+ data = r.sub(r'' + bp_prefix + '\\1', data)
data = re.sub(r'\$\(srctree\)', '$(backport_srctree)', data)
data = re.sub(r'-Idrivers', '-I$(backport_srctree)/drivers', data)
fo = open(os.path.join(root, f), 'w')
@@ -884,7 +909,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
# groups -- 50 seemed safer and is still fast)
regexes = []
for some_symbols in [disable_makefile[i:i + 50] for i in range(0, len(disable_makefile), 50)]:
- r = '^([^#].*((CPTCFG|CONFIG)_(' + '|'.join([s for s in some_symbols]) + ')))'
+ r = '^([^#].*((CPTCFG|CONFIG_BACKPORT|CONFIG)_(' + '|'.join([s for s in some_symbols]) + ')))'
regexes.append(re.compile(r, re.MULTILINE))
for f in maketree.get_makefiles():
data = open(f, 'r').read()
diff --git a/lib/kconfig.py b/lib/kconfig.py
index 179121a..1efffed 100644
--- a/lib/kconfig.py
+++ b/lib/kconfig.py
@@ -7,9 +7,10 @@ import os, re
src_line = re.compile(r'^\s*source\s+"?(?P<src>[^\s"]*)"?\s*$')
tri_line = re.compile(r'^(?P<spc>\s+)tristate')
bool_line = re.compile(r'^(?P<spc>\s+)bool')
-cfg_line = re.compile(r'^(config|menuconfig)\s+(?P<sym>[^\s]*)')
+cfg_line = re.compile(r'^(?P<opt>config|menuconfig)\s+(?P<sym>[^\s]*)')
sel_line = re.compile(r'^(?P<spc>\s+)select\s+(?P<sym>[^\s]*)\s*$')
backport_line = re.compile(r'^\s+#(?P<key>[ch]-file|module-name)\s*(?P<name>.*)')
+ignore_parse_p = re.compile(r'^\s*#(?P<key>ignore-parser-package)')
class ConfigTree(object):
def __init__(self, rootfile):
@@ -56,6 +57,97 @@ class ConfigTree(object):
outf.write(out)
outf.close()
+ def _mod_kconfig_line(self, l, orig_symbols, bp_prefix):
+ if bp_prefix != 'CPTCFG_':
+ prefix = re.sub(r'^CONFIG_(.*)', r'\1', bp_prefix)
+ for sym in orig_symbols:
+ if sym in l:
+ return re.sub(r' (' + sym + ')', r' ' + prefix + '\1', l)
+ return l
+
+ def adjust_backported_configs(self, integrate, orig_symbols, bp_prefix):
+ m = None
+ old_l = None
+ ignore_parse_modular = False
+ for nf in self._walk(self.rootfile):
+ out = ''
+ for l in open(os.path.join(self.basedir, nf), 'r'):
+ pm = ignore_parse_p.match(l)
+ if pm:
+ ignore_parse_modular = True
+ continue
+ n = cfg_line.match(l)
+ if n:
+ m = n
+ old_l = l
+ continue
+ # We're now on the second line for the config symbol
+ if m:
+ # Right now this only supports one line hacks
+ if ignore_parse_modular:
+ if not integrate:
+ out += old_l
+ out += l
+ ignore_parse_modular = False
+ m = None
+ continue
+ built_in_sym = m.group('sym')
+ if bp_prefix != 'CPTCFG_':
+ prefix = re.sub(r'^CONFIG_(.*)_', r'\1', bp_prefix)
+ built_in_sym = re.sub(r'' + prefix + '(.*)', r'\1', m.group('sym'))
+ else:
+ prefix = 'CPTCFG'
+ # These are things that we carry as part of our backports
+ # module or things we automatically copy over into our
+ # backports module.
+ if prefix in m.group('sym'):
+ out += old_l
+ out += l
+ # For modular solutions This might still be possible if
+ # we use backport_ prefixes for our own symbols but it
+ # seems that folks now don't want these prefixes so
+ # restrict to ensure what we replace will not be
+ # available built-in as we are reviewing phasing that
+ # usage out.
+ if not integrate:
+ x = 0
+ # XXX: for we won't address this, as this needs
+ # review and getting rid of the prefixes, otherwise
+ # its OK. Some folks may *want* to replace built-in
+ # old symbols with some modular hack when they
+ # know its safe, for instance.
+ # out += "\tdepends on %s!=y\n" % (built_in_sym)
+ else:
+ # For backports kernel integration solutions we
+ # allow the backported solution from future kernels
+ # to replace the kernel solution you on your
+ # original tree
+ # XXX: only do this for symbols that have C files
+ # depending on it
+ out += "\tdepends on !%s\n" % (built_in_sym)
+ else:
+ # First rewrite the upstream symbol with our prefix if
+ # needed
+ if bp_prefix != 'CPTCFG_':
+ out += m.group('opt') + ' ' + prefix + '_' + m.group('sym') + '\n'
+ out += l
+ # This can be done when not using the CPTCFG CONFIG_
+ # variable override, so it uses the checks.h but
+ # that's a reactive measure.
+ if not integrate:
+ out += "\tdepends on %s!=y\n" % (built_in_sym)
+ else:
+ out += "\tdepends on !%s\n" % (built_in_sym)
+ else:
+ out += m.group('opt') + ' ' + m.group('sym') + '\n'
+ out += l
+ m = None
+ else:
+ out += self._mod_kconfig_line(l, orig_symbols, bp_prefix)
+ outf = open(os.path.join(self.basedir, nf), 'w')
+ outf.write(out)
+ outf.close()
+
def symbols(self):
syms = []
for nf in self._walk(self.rootfile):
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v1 03/11] backports: allow for different backport prefix
2014-11-04 8:42 ` [PATCH v1 03/11] backports: allow for different backport prefix Luis R. Rodriguez
@ 2014-11-04 10:05 ` Johannes Berg
2014-11-04 21:45 ` Luis R. Rodriguez
0 siblings, 1 reply; 26+ messages in thread
From: Johannes Berg @ 2014-11-04 10:05 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: backports, linux-kernel, yann.morin.1998, mmarek, sassmann,
Luis R. Rodriguez
On Tue, 2014-11-04 at 00:42 -0800, Luis R. Rodriguez wrote:
> --- a/devel/ckmake
> +++ b/devel/ckmake
> @@ -165,6 +165,7 @@ def process_kernel(num, kset, cmdline_args):
> all_config_name = os.path.join(work_dir, 'all.config')
> all_config = open(all_config_name, 'w')
> all_config.write("CPTCFG_CFG80211_INTERNAL_REGDB=n\n")
> + all_config.write("CONFIG_BACKPORT_CFG80211_INTERNAL_REGDB=n\n")
don't you know the prefix here?
> config_name = 'allnoconfig'
> if cmdline_args.allyesconfig:
> config_name = 'allyesconfig'
> @@ -173,6 +174,7 @@ def process_kernel(num, kset, cmdline_args):
> open(os.path.join(work_dir, 'defconfigs', cmdline_args.defconfig)).read())
> else:
> all_config.write("CPTCFG_BACKPORT_USERSEL_BUILD_ALL=y\n")
> + all_config.write("CONFIG_BACKPORT_CFG80211_INTERNAL_REGDB=y\n")
> all_config.close()
Not sure this part is right?
johannes
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v1 03/11] backports: allow for different backport prefix
2014-11-04 10:05 ` Johannes Berg
@ 2014-11-04 21:45 ` Luis R. Rodriguez
0 siblings, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 21:45 UTC (permalink / raw)
To: Johannes Berg
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Tue, Nov 04, 2014 at 11:05:17AM +0100, Johannes Berg wrote:
> On Tue, 2014-11-04 at 00:42 -0800, Luis R. Rodriguez wrote:
>
> > --- a/devel/ckmake
> > +++ b/devel/ckmake
> > @@ -165,6 +165,7 @@ def process_kernel(num, kset, cmdline_args):
> > all_config_name = os.path.join(work_dir, 'all.config')
> > all_config = open(all_config_name, 'w')
> > all_config.write("CPTCFG_CFG80211_INTERNAL_REGDB=n\n")
> > + all_config.write("CONFIG_BACKPORT_CFG80211_INTERNAL_REGDB=n\n")
>
> don't you know the prefix here?
Yeah, good point, for built-in I suppose we'll need something different or if
ckmake is extended it would know that too. Dropping this.
Luis
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v1 04/11] backports: replace BACKPORT_PWD with BACKPORT_DIR
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
` (2 preceding siblings ...)
2014-11-04 8:42 ` [PATCH v1 03/11] backports: allow for different backport prefix Luis R. Rodriguez
@ 2014-11-04 8:42 ` Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 05/11] backports: use BACKPORT_DIR prefix on kconfig sources Luis R. Rodriguez
` (6 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:42 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This will also be used for built-in kernel integration, by
using this we can share more code with the built-in kernel
approach.
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
backport/Makefile | 6 +++---
backport/Makefile.build | 4 ++--
backport/Makefile.real | 2 +-
backport/scripts/uninstall.sh | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/backport/Makefile b/backport/Makefile
index ea3982b..fcf2f01 100644
--- a/backport/Makefile
+++ b/backport/Makefile
@@ -6,7 +6,7 @@ ifeq ($(KERNELRELEASE),)
MAKEFLAGS += --no-print-directory
SHELL := /bin/bash
-BACKPORT_PWD := $(shell pwd)
+BACKPORT_DIR := $(shell pwd)
KMODDIR ?= updates
ifneq ($(origin KLIB), undefined)
@@ -20,7 +20,7 @@ KERNEL_CONFIG := $(KLIB_BUILD)/.config
KERNEL_MAKEFILE := $(KLIB_BUILD)/Makefile
CONFIG_MD5 := $(shell md5sum $(KERNEL_CONFIG) 2>/dev/null | sed 's/\s.*//')
-export KLIB KLIB_BUILD BACKPORT_PWD KMODDIR KMODPATH_ARG
+export KLIB KLIB_BUILD BACKPORT_DIR KMODDIR KMODPATH_ARG
# disable built-in rules for this file
.SUFFIXES:
@@ -159,5 +159,5 @@ help: defconfig-help
@echo ""
@echo "Execute "make" or "make all" to build all targets marked with [*]"
else
-include $(BACKPORT_PWD)/Makefile.kernel
+include $(BACKPORT_DIR)/Makefile.kernel
endif
diff --git a/backport/Makefile.build b/backport/Makefile.build
index d209041..a848b37 100644
--- a/backport/Makefile.build
+++ b/backport/Makefile.build
@@ -3,8 +3,8 @@ export
.PHONY: modules
modules:
- @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) modules
+ @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) modules
.PHONY: clean
clean:
- @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) clean
+ @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) clean
diff --git a/backport/Makefile.real b/backport/Makefile.real
index f60d5ca..a0f4916 100644
--- a/backport/Makefile.real
+++ b/backport/Makefile.real
@@ -89,7 +89,7 @@ modules: backport-include/backport/autoconf.h
.PHONY: install
install: modules
- @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) \
+ @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \
INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \
modules_install
@./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR)
diff --git a/backport/scripts/uninstall.sh b/backport/scripts/uninstall.sh
index 1eb42b0..b46d3fe 100755
--- a/backport/scripts/uninstall.sh
+++ b/backport/scripts/uninstall.sh
@@ -10,8 +10,8 @@ else
compr=""
fi
-for driver in $(find ${BACKPORT_PWD} -type f -name *.ko); do
- mod_name=${driver/${BACKPORT_PWD}/${KLIB}${KMODDIR}}${compr}
+for driver in $(find ${BACKPORT_DIR} -type f -name *.ko); do
+ mod_name=${driver/${BACKPORT_DIR}/${KLIB}${KMODDIR}}${compr}
echo " uninstall" $mod_name
rm -f $mod_name
done
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v1 05/11] backports: use BACKPORT_DIR prefix on kconfig sources
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
` (3 preceding siblings ...)
2014-11-04 8:42 ` [PATCH v1 04/11] backports: replace BACKPORT_PWD with BACKPORT_DIR Luis R. Rodriguez
@ 2014-11-04 8:42 ` Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 06/11] backports: update dependencies map file Luis R. Rodriguez
` (5 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:42 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This will allow us to do less work for built-in integration support.
This requires a bit of self evaluation of the variable within our
kconfig library, ideally we'd have support for groking all variables
defined within the Kconfig setup but that requires quite a lot more
work as it means also parsing Makefiles and inheriting these definitions
within config symbols when used. Since we only define one right now and
its used for built-in support we deal with it ourselves for now.
Please consider the complexity of adding others, it doesn't seem like
there would be much need for others though. If others wanted to use a
different BACKPORT_DIR path other than 'backports' that would require
tweaking here, but we'll start by assuming no one will want to do that.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
backport/Kconfig | 37 ++++++++++++++++++++-----------------
lib/kconfig.py | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 62 insertions(+), 28 deletions(-)
diff --git a/backport/Kconfig b/backport/Kconfig
index f63f4fd..c523323 100644
--- a/backport/Kconfig
+++ b/backport/Kconfig
@@ -1,5 +1,8 @@
mainmenu "Linux Backports from $BACKPORTED_KERNEL_NAME $BACKPORTED_KERNEL_VERSION (with backports $BACKPORTS_VERSION)"
+config BACKPORT_DIR
+ string
+ option env="BACKPORT_DIR"
config BACKPORTS_VERSION
string
option env="BACKPORTS_VERSION"
@@ -11,8 +14,8 @@ config BACKPORTED_KERNEL_NAME
option env="BACKPORTED_KERNEL_NAME"
# these will be generated
-source Kconfig.kernel
-source Kconfig.versions
+source "$BACKPORT_DIR/Kconfig.kernel"
+source "$BACKPORT_DIR/Kconfig.versions"
# some hacks for when we use backports to generate a package
# to build modules out of tree.
@@ -27,25 +30,25 @@ config EXPERT
def_bool y
# this has the configuration for the backport code
-source compat/Kconfig
+source "$BACKPORT_DIR/compat/Kconfig"
# these are copied from the kernel
-source net/wireless/Kconfig
-source net/mac80211/Kconfig
-source net/bluetooth/Kconfig
-source drivers/net/wireless/Kconfig
-source drivers/net/ethernet/Kconfig
-source drivers/net/usb/Kconfig
+source "$BACKPORT_DIR/net/wireless/Kconfig"
+source "$BACKPORT_DIR/net/mac80211/Kconfig"
+source "$BACKPORT_DIR/net/bluetooth/Kconfig"
+source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
+source "$BACKPORT_DIR/drivers/net/ethernet/Kconfig"
+source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
-source drivers/ssb/Kconfig
-source drivers/bcma/Kconfig
+source "$BACKPORT_DIR/drivers/ssb/Kconfig"
+source "$BACKPORT_DIR/drivers/bcma/Kconfig"
-source net/nfc/Kconfig
+source "$BACKPORT_DIR/net/nfc/Kconfig"
-source drivers/media/Kconfig
+source "$BACKPORT_DIR/drivers/media/Kconfig"
-source net/ieee802154/Kconfig
-source net/mac802154/Kconfig
-source drivers/net/ieee802154/Kconfig
+source "$BACKPORT_DIR/net/ieee802154/Kconfig"
+source "$BACKPORT_DIR/net/mac802154/Kconfig"
+source "$BACKPORT_DIR/drivers/net/ieee802154/Kconfig"
-source drivers/usb/class/Kconfig
+source "$BACKPORT_DIR/drivers/usb/class/Kconfig"
diff --git a/lib/kconfig.py b/lib/kconfig.py
index 1efffed..5c47161 100644
--- a/lib/kconfig.py
+++ b/lib/kconfig.py
@@ -5,6 +5,7 @@
import os, re
src_line = re.compile(r'^\s*source\s+"?(?P<src>[^\s"]*)"?\s*$')
+bk_src_line = re.compile(r'^\s*source\s+"?\$BACKPORT_DIR/(?P<src>[^\s"]*)"?\s*$')
tri_line = re.compile(r'^(?P<spc>\s+)tristate')
bool_line = re.compile(r'^(?P<spc>\s+)bool')
cfg_line = re.compile(r'^(?P<opt>config|menuconfig)\s+(?P<sym>[^\s]*)')
@@ -21,23 +22,53 @@ class ConfigTree(object):
yield f
for l in open(os.path.join(self.basedir, f), 'r'):
m = src_line.match(l)
- if m and os.path.exists(os.path.join(self.basedir, m.group('src'))):
- for i in self._walk(m.group('src')):
- yield i
+ if m:
+ bm = bk_src_line.match(l)
+ if bm:
+ if os.path.exists(os.path.join(self.basedir, bm.group('src'))):
+ for i in self._walk(os.path.join(self.basedir, bm.group('src'))):
+ yield i
+ elif os.path.exists(os.path.join(self.basedir, 'backports/' + bm.group('src'))):
+ for i in self._walk(os.path.join(self.basedir, 'backports/' + bm.group('src'))):
+ yield i
+ else:
+ if os.path.exists(os.path.join(self.basedir, m.group('src'))):
+ for i in self._walk(m.group('src')):
+ yield i
def _prune_sources(self, f, ignore):
for nf in self._walk(f):
out = ''
for l in open(os.path.join(self.basedir, nf), 'r'):
- m = src_line.match(l)
- if not m:
- out += l
- continue
- src = m.group('src')
- if src in ignore or os.path.exists(os.path.join(self.basedir, src)):
- out += l
+ bm = bk_src_line.match(l)
+ if bm:
+ bp_src = bm.group('src')
+ if bp_src in ignore or \
+ os.path.exists(os.path.join(self.basedir, bp_src)) or \
+ os.path.exists(os.path.join(self.basedir, 'backports/' + bp_src)):
+ out += l
+ else:
+ out += '#' + l
else:
- out += '#' + l
+ m = src_line.match(l)
+ # we should consider disallowing these as it could mean
+ # someone forgot to add the BACKPORT_DIR prefix to
+ # the kconfig source entries which we will need to
+ # support built-in integration.
+ if not m:
+ out += l
+ continue
+ src = m.group('src')
+ if src in ignore or os.path.exists(os.path.join(self.basedir, src)):
+ if 'backports' in self.basedir and 'BACKPORT_DIR' not in bp_src:
+ out += 'source "$BACKPORT_DIR/' + src + '"\n'
+ else:
+ out += l
+ else:
+ if 'backports' in self.basedir and 'BACKPORT_DIR' not in bp_src:
+ out += '# source "$BACKPORT_DIR/' + src + '"\n'
+ else:
+ out += '#' + l
outf = open(os.path.join(self.basedir, nf), 'w')
outf.write(out)
outf.close()
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v1 06/11] backports: update dependencies map file
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
` (4 preceding siblings ...)
2014-11-04 8:42 ` [PATCH v1 05/11] backports: use BACKPORT_DIR prefix on kconfig sources Luis R. Rodriguez
@ 2014-11-04 8:42 ` Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 07/11] backports: split Kconfig into Kconfig.package and Kconfig.sources Luis R. Rodriguez
` (4 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:42 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
During development of kernel integration support using CONFIG_BACKPORT
was evaluated as a prefix over CPTCFG even for packaging backports,
for some reason this change lifted some restrictions one some device
drivers which was present before and as such requires some changes to
the dependencies map file to ensure correct compilation for respective
kernel versions.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
dependencies | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/dependencies b/dependencies
index 4964aa6..64903dc 100644
--- a/dependencies
+++ b/dependencies
@@ -16,6 +16,8 @@ USB_GSPCA_OV534 3.5
# we only support on >= 3.4 give that reguatory itself depends
# on -EPROBE_DEFER.
SOC_CAMERA 3.4
+VIDEO_S5K5BAF 3.4
+VIDEO_S5K4ECGX 3.4
# 49920bc6 and 1003cab8 and while it seems there is a
# one to one map DMA_FROM_DEVICE to DMA_DEV_TO_MEM
# I can't verify this fully yet.
@@ -29,16 +31,29 @@ DVB_USB_RTL28XXU 3.4
# missing linux/gpio/consumer.h
VIDEO_ADV7604 3.13
# missing function clk_prepare_enable(), clk_disable_unprepare() and devm_regulator_bulk_get()
-VIDEO_MT9P031 3.3
-VIDEO_MT9T001 3.3
VIDEO_MT9V032 3.3
-VIDEO_NOON010PC30 3.3
-VIDEO_S5K6A3 3.3
VIDEO_S5K6AA 3.3
-VIDEO_S5K5BAF 3.3
-VIDEO_S5K4ECGX 3.3
-VIDEO_M5MOLS 3.3
-VIDEO_S5C73M3 3.3
+
+# missing devm_regulator_bulk_get
+VIDEO_MT9T001 3.5
+VIDEO_NOON010PC30 3.5
+VIDEO_MT9P031 3.5
+
+# missing of_property_read_bool() added via fa4d34cc on v3.4-rc1~71, backport
+# that attomically and you can enable this for older kernels.
+VIDEO_ADV7343 3.4
+
+# for whoever wants to backport this: GPIOF_EXPORT was redefined via commit
+# 79a9becd on v3.13-rc1~120^2~15, before this it was redefined via commit
+# f567fde2 on v3.5-rc7~32^2~4 and finally added via commit fc3a1f04 on
+# v3.5-rc1~93^2~25. We don't address any of these changes yet so we require
+# the latest interpretation.
+VIDEO_S5K6AA 3.13
+VIDEO_S5K6A3 3.13
+
+# missing linux/sizes.h
+VIDEO_M5MOLS 3.6
+VIDEO_S5C73M3 3.6
# missing function devm_regmap_init_i2c()
VIDEO_LM3646 3.3
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v1 07/11] backports: split Kconfig into Kconfig.package and Kconfig.sources
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
` (5 preceding siblings ...)
2014-11-04 8:42 ` [PATCH v1 06/11] backports: update dependencies map file Luis R. Rodriguez
@ 2014-11-04 8:42 ` Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 08/11] backports: move version file generation to run earlier Luis R. Rodriguez
` (3 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:42 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This splits up the Kconfig from things which are needed due to
our copy of code from the kernel and things which we need
specifically only for packaging backports. We will later then
share the Kconfig.souce for instance for kernel integration.
While at it, split up the list of files that we need to copy
into what we know could be shared for integration. The the
case of backport packaging Kconfig.package will be copied to
the package's Kconfig when building the package with gentree.py.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
backport/Kconfig | 54 ------------------------------------------------
backport/Kconfig.package | 32 ++++++++++++++++++++++++++++
backport/Kconfig.sources | 23 +++++++++++++++++++++
gentree.py | 22 +++++++++++++++++---
4 files changed, 74 insertions(+), 57 deletions(-)
delete mode 100644 backport/Kconfig
create mode 100644 backport/Kconfig.package
create mode 100644 backport/Kconfig.sources
diff --git a/backport/Kconfig b/backport/Kconfig
deleted file mode 100644
index c523323..0000000
--- a/backport/Kconfig
+++ /dev/null
@@ -1,54 +0,0 @@
-mainmenu "Linux Backports from $BACKPORTED_KERNEL_NAME $BACKPORTED_KERNEL_VERSION (with backports $BACKPORTS_VERSION)"
-
-config BACKPORT_DIR
- string
- option env="BACKPORT_DIR"
-config BACKPORTS_VERSION
- string
- option env="BACKPORTS_VERSION"
-config BACKPORTED_KERNEL_VERSION
- string
- option env="BACKPORTED_KERNEL_VERSION"
-config BACKPORTED_KERNEL_NAME
- string
- option env="BACKPORTED_KERNEL_NAME"
-
-# these will be generated
-source "$BACKPORT_DIR/Kconfig.kernel"
-source "$BACKPORT_DIR/Kconfig.versions"
-
-# some hacks for when we use backports to generate a package
-# to build modules out of tree.
-#ignore-parser-package
-config WIRELESS
- def_bool y
-#ignore-parser-package
-config NET_CORE
- def_bool y
-#ignore-parser-package
-config EXPERT
- def_bool y
-
-# this has the configuration for the backport code
-source "$BACKPORT_DIR/compat/Kconfig"
-
-# these are copied from the kernel
-source "$BACKPORT_DIR/net/wireless/Kconfig"
-source "$BACKPORT_DIR/net/mac80211/Kconfig"
-source "$BACKPORT_DIR/net/bluetooth/Kconfig"
-source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
-source "$BACKPORT_DIR/drivers/net/ethernet/Kconfig"
-source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
-
-source "$BACKPORT_DIR/drivers/ssb/Kconfig"
-source "$BACKPORT_DIR/drivers/bcma/Kconfig"
-
-source "$BACKPORT_DIR/net/nfc/Kconfig"
-
-source "$BACKPORT_DIR/drivers/media/Kconfig"
-
-source "$BACKPORT_DIR/net/ieee802154/Kconfig"
-source "$BACKPORT_DIR/net/mac802154/Kconfig"
-source "$BACKPORT_DIR/drivers/net/ieee802154/Kconfig"
-
-source "$BACKPORT_DIR/drivers/usb/class/Kconfig"
diff --git a/backport/Kconfig.package b/backport/Kconfig.package
new file mode 100644
index 0000000..c507de4
--- /dev/null
+++ b/backport/Kconfig.package
@@ -0,0 +1,32 @@
+mainmenu "Backports from $BACKPORTED_KERNEL_NAME $BACKPORTED_KERNEL_VERSION (backports $BACKPORTS_VERSION)"
+
+config BACKPORT_DIR
+ string
+ option env="BACKPORT_DIR"
+config BACKPORTS_VERSION
+ string
+ option env="BACKPORTS_VERSION"
+config BACKPORTED_KERNEL_VERSION
+ string
+ option env="BACKPORTED_KERNEL_VERSION"
+config BACKPORTED_KERNEL_NAME
+ string
+ option env="BACKPORTED_KERNEL_NAME"
+
+# some hacks for when we use backports to generate a package
+# to build modules out of tree.
+#ignore-parser-package
+config WIRELESS
+ def_bool y
+#ignore-parser-package
+config NET_CORE
+ def_bool y
+#ignore-parser-package
+config EXPERT
+ def_bool y
+
+source "$BACKPORT_DIR/Kconfig.sources"
+
+# these will be generated
+source "$BACKPORT_DIR/Kconfig.kernel"
+source "$BACKPORT_DIR/Kconfig.versions"
diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources
new file mode 100644
index 0000000..cdf993c
--- /dev/null
+++ b/backport/Kconfig.sources
@@ -0,0 +1,23 @@
+# this has the configuration for the backport code
+source "$BACKPORT_DIR/compat/Kconfig"
+
+# these are copied from the kernel
+source "$BACKPORT_DIR/net/wireless/Kconfig"
+source "$BACKPORT_DIR/net/mac80211/Kconfig"
+source "$BACKPORT_DIR/net/bluetooth/Kconfig"
+source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
+source "$BACKPORT_DIR/drivers/net/ethernet/Kconfig"
+source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
+
+source "$BACKPORT_DIR/drivers/ssb/Kconfig"
+source "$BACKPORT_DIR/drivers/bcma/Kconfig"
+
+source "$BACKPORT_DIR/net/nfc/Kconfig"
+
+source "$BACKPORT_DIR/drivers/media/Kconfig"
+
+source "$BACKPORT_DIR/net/ieee802154/Kconfig"
+source "$BACKPORT_DIR/net/mac802154/Kconfig"
+source "$BACKPORT_DIR/drivers/net/ieee802154/Kconfig"
+
+source "$BACKPORT_DIR/drivers/usb/class/Kconfig"
diff --git a/gentree.py b/gentree.py
index 3d4a8b4..860bb71 100755
--- a/gentree.py
+++ b/gentree.py
@@ -746,11 +746,27 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
check_output_dir(args.outdir, args.clean)
# do the copy
+ backport_package_files = [(x, x) for x in [
+ 'Makefile',
+ 'kconf/',
+ 'Makefile.real',
+ 'Makefile.kernel',
+ 'scripts/',
+ '.blacklist.map',
+ '.gitignore',
+ 'Makefile.build'] ]
+ backport_package_files += [
+ ('Kconfig.package', 'Kconfig'),
+ ]
backport_files = [(x, x) for x in [
- 'Kconfig', 'Makefile', 'Makefile.build', 'Makefile.kernel', '.gitignore',
- 'Makefile.real', 'compat/', 'backport-include/', 'kconf/',
- 'scripts/', '.blacklist.map',
+ 'Kconfig.sources',
+ 'compat/',
+ 'backport-include/',
]]
+
+ if not integrate:
+ backport_files += backport_package_files
+
if not args.git_revision:
logwrite('Copy original source files ...')
else:
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v1 08/11] backports: move version file generation to run earlier
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
` (6 preceding siblings ...)
2014-11-04 8:42 ` [PATCH v1 07/11] backports: split Kconfig into Kconfig.package and Kconfig.sources Luis R. Rodriguez
@ 2014-11-04 8:42 ` Luis R. Rodriguez
2014-11-04 8:43 ` [PATCH v1 09/11] backports: use Kconfig for backport version information Luis R. Rodriguez
` (2 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:42 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
The version file contains:
* BACKPORTS_VERSION
* BACKPORTED_KERNEL_VERSION
* BACKPORTED_KERNEL_NAME
This file is used by the Makefile to export variable
definitions used to identify the backport. For kernel
integration we'll be using a generated Kconfig file
instead and since these are needed when processing
kconfig logic this will need to be defined earlier.
Just move the generation of the version file for packaging
up early to match where we will generate the Kconfig with
the backports versioning identification.
This change has no real functional change other than the
move of some code running earlier.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
gentree.py | 50 ++++++++++++++++++++++++++------------------------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/gentree.py b/gentree.py
index 860bb71..1b6dc89 100755
--- a/gentree.py
+++ b/gentree.py
@@ -789,6 +789,25 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
git_debug_snapshot(args, 'Add driver sources')
+ if git_tracked_version:
+ backports_version = "(see git)"
+ kernel_version = "(see git)"
+ else:
+ backports_version = git.describe(tree=source_dir, extra_args=['--long'])
+ kernel_version = git.describe(rev=args.git_revision or 'HEAD',
+ tree=args.kerneldir,
+ extra_args=['--long'])
+
+ if not integrate:
+ f = open(os.path.join(args.outdir, 'versions'), 'w')
+ f.write('BACKPORTS_VERSION="%s"\n' % backports_version)
+ f.write('BACKPORTED_KERNEL_VERSION="%s"\n' % kernel_version)
+ f.write('BACKPORTED_KERNEL_NAME="%s"\n' % args.base_name)
+ if git_tracked_version:
+ f.write('BACKPORTS_GIT_TRACKED="backport tracker ID: $(shell git rev-parse HEAD 2>/dev/null || echo \'not built in git tree\')"\n')
+ f.close()
+ git_debug_snapshot(args, "generate kernel version info file: version")
+
disable_list = add_automatic_backports(args, bp_prefix)
if disable_list:
bpcfg = kconfig.ConfigTree(os.path.join(args.outdir, 'compat', 'Kconfig'))
@@ -815,32 +834,15 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
configtree.modify_selects()
git_debug_snapshot(args, "convert select to depends on")
- # write the versioning file
- if git_tracked_version:
- backports_version = "(see git)"
- kernel_version = "(see git)"
- else:
- backports_version = git.describe(tree=source_dir, extra_args=['--long'])
- kernel_version = git.describe(rev=args.git_revision or 'HEAD',
- tree=args.kerneldir,
- extra_args=['--long'])
- f = open(os.path.join(args.outdir, 'versions'), 'w')
- f.write('BACKPORTS_VERSION="%s"\n' % backports_version)
- f.write('BACKPORTED_KERNEL_VERSION="%s"\n' % kernel_version)
- f.write('BACKPORTED_KERNEL_NAME="%s"\n' % args.base_name)
- if git_tracked_version:
- f.write('BACKPORTS_GIT_TRACKED="backport tracker ID: $(shell git rev-parse HEAD 2>/dev/null || echo \'not built in git tree\')"\n')
- f.close()
-
symbols = configtree.symbols()
- # write local symbol list -- needed during build
- f = open(os.path.join(args.outdir, '.local-symbols'), 'w')
- for sym in symbols:
- f.write('%s=\n' % sym)
- f.close()
-
- git_debug_snapshot(args, "add versions/symbols files")
+ if not integrate:
+ # write local symbol list -- needed during build
+ f = open(os.path.join(args.outdir, '.local-symbols'), 'w')
+ for sym in symbols:
+ f.write('%s=\n' % sym)
+ f.close()
+ git_debug_snapshot(args, "add symbols files")
# add defconfigs that we want
defconfigs_dir = os.path.join(source_dir, 'backport', 'defconfigs')
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v1 09/11] backports: use Kconfig for backport version information
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
` (7 preceding siblings ...)
2014-11-04 8:42 ` [PATCH v1 08/11] backports: move version file generation to run earlier Luis R. Rodriguez
@ 2014-11-04 8:43 ` Luis R. Rodriguez
2014-11-04 10:13 ` Johannes Berg
2014-11-04 8:43 ` [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO Luis R. Rodriguez
2014-11-04 8:43 ` [PATCH v1 11/11] backports: add full kernel integration support Luis R. Rodriguez
10 siblings, 1 reply; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:43 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
Instead of relying on Makefile hacks just use Kconfig for
defining the variables needed. We can do this since these
variables are all known at packaging time. The exception
is BACKPORTS_GIT_TRACKED, but for that we can define a
kconfig variable which only if set will we rely on the
environment for picking it up and later exporting it through
Kconfig. Since Kconfig doesn't keep config variables defined
with option env we use a secondary config entry for that.
With this we can remove all those extra defines and we can
rely on CPTCFG_ variables as typically expected in our
backport kernel code.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
backport/Kconfig.package | 25 ++++++++++++++++---
backport/Makefile.kernel | 4 ---
backport/Makefile.real | 10 ++++----
backport/backport-include/linux/module.h | 6 ++---
backport/compat/main.c | 42 ++++++++++++++++----------------
gentree.py | 30 ++++++++++++++++-------
6 files changed, 71 insertions(+), 46 deletions(-)
diff --git a/backport/Kconfig.package b/backport/Kconfig.package
index c507de4..aade94d 100644
--- a/backport/Kconfig.package
+++ b/backport/Kconfig.package
@@ -1,17 +1,34 @@
-mainmenu "Backports from $BACKPORTED_KERNEL_NAME $BACKPORTED_KERNEL_VERSION (backports $BACKPORTS_VERSION)"
+mainmenu "Backports from %%BACKPORTED_KERNEL_NAME%% %%BACKPORTED_KERNEL_VERSION%% (backports %%BACKPORTS_VERSION%%)"
config BACKPORT_DIR
string
option env="BACKPORT_DIR"
+
config BACKPORTS_VERSION
string
- option env="BACKPORTS_VERSION"
+ default "%%BACKPORTS_VERSION%%"
+
config BACKPORTED_KERNEL_VERSION
string
- option env="BACKPORTED_KERNEL_VERSION"
+ default "%%BACKPORTED_KERNEL_VERSION%%"
+
config BACKPORTED_KERNEL_NAME
string
- option env="BACKPORTED_KERNEL_NAME"
+ default "%%BACKPORTED_KERNEL_NAME%%"
+
+config BACKPORT_IS_GIT_TRACKED
+ def_bool %%BACKPORT_IS_GIT_TRACKED%%
+
+if BACKPORT_IS_GIT_TRACKED
+config __BACKPORT_GIT_TRACKED
+ string
+ option env="__BACKPORT_GIT_TRACKED"
+
+# The option env isn't sticky on .config / autoconf, so we need this
+config BACKPORTS_GIT_TRACKED
+ string
+ default $__BACKPORT_GIT_TRACKED
+endif # BACKPORT_IS_GIT_TRACKED
# some hacks for when we use backports to generate a package
# to build modules out of tree.
diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index dcb2ba7..7a41273 100644
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -10,10 +10,6 @@ NOSTDINC_FLAGS := \
-I$(M)/include/uapi \
-include $(M)/backport-include/backport/backport.h \
$(call backport-cc-disable-warning, unused-but-set-variable) \
- -DBACKPORTS_VERSION=\"$(BACKPORTS_VERSION)\" \
- -DBACKPORTED_KERNEL_VERSION=\"$(BACKPORTED_KERNEL_VERSION)\" \
- -DBACKPORTED_KERNEL_NAME=\"$(BACKPORTED_KERNEL_NAME)\" \
- $(BACKPORTS_GIT_TRACKER_DEF) \
$(CFLAGS)
export backport_srctree = $(M)
diff --git a/backport/Makefile.real b/backport/Makefile.real
index a0f4916..6b342ce 100644
--- a/backport/Makefile.real
+++ b/backport/Makefile.real
@@ -1,9 +1,9 @@
-include versions
-export BACKPORTS_VERSION BACKPORTED_KERNEL_VERSION BACKPORTED_KERNEL_NAME
-ifdef BACKPORTS_GIT_TRACKED
-export BACKPORTS_GIT_TRACKER_DEF=-DBACKPORTS_GIT_TRACKED=\"$(BACKPORTS_GIT_TRACKED)\"
+ifeq ($(CPTCFG_BACKPORT_IS_GIT_TRACKED),y)
+export __BACKPORT_GIT_TRACKED="backport tracker ID: $(shell git rev-parse HEAD 2>/dev/null || echo \'not built in git tree\')"
else
-export BACKPORTS_GIT_TRACKER_DEF=
+# Technically not required but Kconfig will complain otherwise for
+# undefined option env even if your kconfig environment does not need it
+export __BACKPORT_GIT_TRACKED="not built in git tree"
endif
# disable built-in rules for this file
diff --git a/backport/backport-include/linux/module.h b/backport/backport-include/linux/module.h
index 8942c5b..3f8cbec 100644
--- a/backport/backport-include/linux/module.h
+++ b/backport/backport-include/linux/module.h
@@ -20,9 +20,9 @@ extern void backport_dependency_symbol(void);
#define BACKPORT_MOD_VERSIONS MODULE_VERSION(BACKPORTS_GIT_TRACKED);
#else
#define BACKPORT_MOD_VERSIONS \
- MODULE_VERSION("backported from " BACKPORTED_KERNEL_NAME \
- " (" BACKPORTED_KERNEL_VERSION ")" \
- " using backports " BACKPORTS_VERSION);
+ MODULE_VERSION("backported from " CPTCFG_BACKPORTED_KERNEL_NAME \
+ " (" CPTCFG_BACKPORTED_KERNEL_VERSION ")" \
+ " using backports " CPTCFG_BACKPORTS_VERSION);
#endif
#ifndef MODULE
diff --git a/backport/compat/main.c b/backport/compat/main.c
index d3f8944..44935bd 100644
--- a/backport/compat/main.c
+++ b/backport/compat/main.c
@@ -8,40 +8,40 @@ MODULE_AUTHOR("Luis R. Rodriguez");
MODULE_DESCRIPTION("Kernel backport module");
MODULE_LICENSE("GPL");
-#ifndef BACKPORTED_KERNEL_NAME
-#error "You need a BACKPORTED_KERNEL_NAME"
+#ifndef CPTCFG_BACKPORTED_KERNEL_NAME
+#error "You need a CPTCFG_BACKPORTED_KERNEL_NAME"
#endif
-#ifndef BACKPORTED_KERNEL_VERSION
-#error "You need a BACKPORTED_KERNEL_VERSION"
+#ifndef CPTCFG_BACKPORTED_KERNEL_VERSION
+#error "You need a CPTCFG_BACKPORTED_KERNEL_VERSION"
#endif
-#ifndef BACKPORTS_VERSION
-#error "You need a BACKPORTS_VERSION"
+#ifndef CPTCFG_BACKPORTS_VERSION
+#error "You need a CPTCFG_BACKPORTS_VERSION"
#endif
-static char *backported_kernel_name = BACKPORTED_KERNEL_NAME;
+static char *backported_kernel_name = CPTCFG_BACKPORTED_KERNEL_NAME;
module_param(backported_kernel_name, charp, 0400);
MODULE_PARM_DESC(backported_kernel_name,
- "The kernel tree name that was used for this backport (" BACKPORTED_KERNEL_NAME ")");
+ "The kernel tree name that was used for this backport (" CPTCFG_BACKPORTED_KERNEL_NAME ")");
-#ifdef BACKPORTS_GIT_TRACKED
-static char *backports_tracker_id = BACKPORTS_GIT_TRACKED;
+#ifdef CPTCFG_BACKPORTS_GIT_TRACKED
+static char *backports_tracker_id = CPTCFG_BACKPORTS_GIT_TRACKED;
module_param(backports_tracker_id, charp, 0400);
MODULE_PARM_DESC(backports_tracker_id,
- "The version of the tree containing this backport (" BACKPORTS_GIT_TRACKED ")");
+ "The version of the tree containing this backport (" CPTCFG_BACKPORTS_GIT_TRACKED ")");
#else
-static char *backported_kernel_version = BACKPORTED_KERNEL_VERSION;
-static char *backports_version = BACKPORTS_VERSION;
+static char *backported_kernel_version = CPTCFG_BACKPORTED_KERNEL_VERSION;
+static char *backports_version = CPTCFG_BACKPORTS_VERSION;
module_param(backported_kernel_version, charp, 0400);
MODULE_PARM_DESC(backported_kernel_version,
- "The kernel version that was used for this backport (" BACKPORTED_KERNEL_VERSION ")");
+ "The kernel version that was used for this backport (" CPTCFG_BACKPORTED_KERNEL_VERSION ")");
module_param(backports_version, charp, 0400);
MODULE_PARM_DESC(backports_version,
- "The git version of the backports tree used to generate this backport (" BACKPORTS_VERSION ")");
+ "The git version of the backports tree used to generate this backport (" CPTCFG_BACKPORTS_VERSION ")");
#endif
@@ -63,15 +63,15 @@ static int __init backport_init(void)
return ret;
}
- printk(KERN_INFO "Loading modules backported from " BACKPORTED_KERNEL_NAME
-#ifndef BACKPORTS_GIT_TRACKED
- " version " BACKPORTED_KERNEL_VERSION
+ printk(KERN_INFO "Loading modules backported from " CPTCFG_BACKPORTED_KERNEL_NAME
+#ifndef CPTCFG_BACKPORTS_GIT_TRACKED
+ " version " CPTCFG_BACKPORTED_KERNEL_VERSION
#endif
"\n");
-#ifdef BACKPORTS_GIT_TRACKED
- printk(KERN_INFO BACKPORTS_GIT_TRACKED "\n");
+#ifdef CPTCFG_BACKPORTS_GIT_TRACKED
+ printk(KERN_INFO CPTCFG_BACKPORTS_GIT_TRACKED "\n");
#else
- printk(KERN_INFO "Backport generated by backports.git " BACKPORTS_VERSION "\n");
+ printk(KERN_INFO "Backport generated by backports.git " CPTCFG_BACKPORTS_VERSION "\n");
#endif
return 0;
diff --git a/gentree.py b/gentree.py
index 1b6dc89..685fde5 100755
--- a/gentree.py
+++ b/gentree.py
@@ -798,15 +798,27 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
tree=args.kerneldir,
extra_args=['--long'])
- if not integrate:
- f = open(os.path.join(args.outdir, 'versions'), 'w')
- f.write('BACKPORTS_VERSION="%s"\n' % backports_version)
- f.write('BACKPORTED_KERNEL_VERSION="%s"\n' % kernel_version)
- f.write('BACKPORTED_KERNEL_NAME="%s"\n' % args.base_name)
- if git_tracked_version:
- f.write('BACKPORTS_GIT_TRACKED="backport tracker ID: $(shell git rev-parse HEAD 2>/dev/null || echo \'not built in git tree\')"\n')
- f.close()
- git_debug_snapshot(args, "generate kernel version info file: version")
+ is_git_tracked_version = 'n'
+ if git_tracked_version:
+ git_tracked_version = 'y'
+ kconf_regexes = [
+ (re.compile(r'.*(?P<key>%%BACKPORT_DIR%%)'), '%%BACKPORT_DIR%%', 'backports/'),
+ (re.compile(r'.*(?P<key>%%BACKPORTS_VERSION%%).*'), '%%BACKPORTS_VERSION%%', backports_version),
+ (re.compile(r'.*(?P<key>%%BACKPORTED_KERNEL_VERSION%%).*'), '%%BACKPORTED_KERNEL_VERSION%%', kernel_version),
+ (re.compile(r'.*(?P<key>%%BACKPORTED_KERNEL_NAME%%).*'), '%%BACKPORTED_KERNEL_NAME%%', args.base_name),
+ (re.compile(r'.*(?P<key>%%BACKPORT_IS_GIT_TRACKED%%).*'), '%%BACKPORT_IS_GIT_TRACKED%%', is_git_tracked_version),
+ ]
+ out = ''
+ for l in open(os.path.join(args.outdir, 'Kconfig'), 'r'):
+ for r in kconf_regexes:
+ m = r[0].match(l)
+ if m:
+ l = re.sub(r'(' + r[1] + ')', r'' + r[2] + '', l)
+ out += l
+ outf = open(os.path.join(args.outdir, 'Kconfig'), 'w')
+ outf.write(out)
+ outf.close()
+ git_debug_snapshot(args, "modify top level backports/Kconfig with backports identity")
disable_list = add_automatic_backports(args, bp_prefix)
if disable_list:
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v1 09/11] backports: use Kconfig for backport version information
2014-11-04 8:43 ` [PATCH v1 09/11] backports: use Kconfig for backport version information Luis R. Rodriguez
@ 2014-11-04 10:13 ` Johannes Berg
2014-11-04 21:51 ` Luis R. Rodriguez
2014-11-04 23:33 ` Luis R. Rodriguez
0 siblings, 2 replies; 26+ messages in thread
From: Johannes Berg @ 2014-11-04 10:13 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: backports, linux-kernel, yann.morin.1998, mmarek, sassmann,
Luis R. Rodriguez
On Tue, 2014-11-04 at 00:43 -0800, Luis R. Rodriguez wrote:
> From: "Luis R. Rodriguez" <mcgrof@suse.com>
>
> Instead of relying on Makefile hacks just use Kconfig for
> defining the variables needed. We can do this since these
> variables are all known at packaging time. The exception
> is BACKPORTS_GIT_TRACKED, but for that we can define a
> kconfig variable which only if set will we rely on the
> environment for picking it up and later exporting it through
> Kconfig. Since Kconfig doesn't keep config variables defined
> with option env we use a secondary config entry for that.
I'd prefer you didn't do this. When we track the backports in a git tree
this will mean constant changes to these files, where currently the
changes are constrained to just the "versions" file.
johannes
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v1 09/11] backports: use Kconfig for backport version information
2014-11-04 10:13 ` Johannes Berg
@ 2014-11-04 21:51 ` Luis R. Rodriguez
2014-11-04 23:33 ` Luis R. Rodriguez
1 sibling, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 21:51 UTC (permalink / raw)
To: Johannes Berg
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Tue, Nov 04, 2014 at 11:13:05AM +0100, Johannes Berg wrote:
> On Tue, 2014-11-04 at 00:43 -0800, Luis R. Rodriguez wrote:
> > From: "Luis R. Rodriguez" <mcgrof@suse.com>
> >
> > Instead of relying on Makefile hacks just use Kconfig for
> > defining the variables needed. We can do this since these
> > variables are all known at packaging time. The exception
> > is BACKPORTS_GIT_TRACKED, but for that we can define a
> > kconfig variable which only if set will we rely on the
> > environment for picking it up and later exporting it through
> > Kconfig. Since Kconfig doesn't keep config variables defined
> > with option env we use a secondary config entry for that.
>
> I'd prefer you didn't do this. When we track the backports in a git tree
> this will mean constant changes to these files, where currently the
> changes are constrained to just the "versions" file.
OK.
Luis
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v1 09/11] backports: use Kconfig for backport version information
2014-11-04 10:13 ` Johannes Berg
2014-11-04 21:51 ` Luis R. Rodriguez
@ 2014-11-04 23:33 ` Luis R. Rodriguez
1 sibling, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 23:33 UTC (permalink / raw)
To: Johannes Berg
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Tue, Nov 04, 2014 at 11:13:05AM +0100, Johannes Berg wrote:
> On Tue, 2014-11-04 at 00:43 -0800, Luis R. Rodriguez wrote:
> > From: "Luis R. Rodriguez" <mcgrof@suse.com>
> >
> > Instead of relying on Makefile hacks just use Kconfig for
> > defining the variables needed. We can do this since these
> > variables are all known at packaging time. The exception
> > is BACKPORTS_GIT_TRACKED, but for that we can define a
> > kconfig variable which only if set will we rely on the
> > environment for picking it up and later exporting it through
> > Kconfig. Since Kconfig doesn't keep config variables defined
> > with option env we use a secondary config entry for that.
>
> I'd prefer you didn't do this. When we track the backports in a git tree
> this will mean constant changes to these files, where currently the
> changes are constrained to just the "versions" file.
I wanted to at least unify the C code defines for the shared
versioning information, I've come up with a way that
minimizes the changes to the existing packaging stuff,
will send in my respin. Hopefully that's OK.
Luis
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
` (8 preceding siblings ...)
2014-11-04 8:43 ` [PATCH v1 09/11] backports: use Kconfig for backport version information Luis R. Rodriguez
@ 2014-11-04 8:43 ` Luis R. Rodriguez
2014-11-04 10:14 ` Johannes Berg
2014-11-04 8:43 ` [PATCH v1 11/11] backports: add full kernel integration support Luis R. Rodriguez
10 siblings, 1 reply; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:43 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
Things we backport are now prefixed with BACKPORT_, when we copy
over libraries with the c-files / h-files trick on the compat/Kconfig
trick we prefix these with BACKPORT_ already so in order to help
distinguish them use BACKPORT_BPAUTO_ for them and prevent a double
BACKPORT_ prefix.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
backport/backport-include/asm/dma-mapping.h | 4 +-
backport/backport-include/backport/leds-disabled.h | 2 +-
backport/compat/Kconfig | 80 +++++++++++-----------
backport/compat/Makefile | 4 +-
backport/compat/backports.h | 4 +-
gentree.py | 12 +++-
lib/kconfig.py | 4 +-
patches/backport-adjustments/devcoredump.patch | 4 +-
8 files changed, 61 insertions(+), 53 deletions(-)
diff --git a/backport/backport-include/asm/dma-mapping.h b/backport/backport-include/asm/dma-mapping.h
index 844fe3b..b73b7da 100644
--- a/backport/backport-include/asm/dma-mapping.h
+++ b/backport/backport-include/asm/dma-mapping.h
@@ -3,12 +3,12 @@
#include_next <asm/dma-mapping.h>
#include <linux/version.h>
-#if defined(CPTCFG_BACKPORT_BUILD_DMA_SHARED_HELPERS)
+#if defined(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS)
#define dma_common_get_sgtable LINUX_BACKPORT(dma_common_get_sgtable)
int
dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
void *cpu_addr, dma_addr_t dma_addr, size_t size);
-#endif /* defined(CPTCFG_BACKPORT_BUILD_DMA_SHARED_HELPERS) */
+#endif /* defined(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS) */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
diff --git a/backport/backport-include/backport/leds-disabled.h b/backport/backport-include/backport/leds-disabled.h
index 501f2a0..156d7fa 100644
--- a/backport/backport-include/backport/leds-disabled.h
+++ b/backport/backport-include/backport/leds-disabled.h
@@ -8,7 +8,7 @@
* allows compilation.
*/
-#ifdef CPTCFG_BACKPORT_BUILD_LEDS
+#ifdef CPTCFG_BPAUTO_BUILD_LEDS
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/rwsem.h>
diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig
index 49699bd..0bfea0f 100644
--- a/backport/compat/Kconfig
+++ b/backport/compat/Kconfig
@@ -1,37 +1,37 @@
#
# backport Kconfig
#
-# Some options are user-selectable ("BACKPORT_USERSEL_*")
+# Some options are user-selectable ("BPAUTO_USERSEL_*")
#
# Most options, however, follow a few different schemes:
#
# A) An option that is selected by drivers ("select FOO") will be
-# changed to "select BACKPORT_FOO" (if the option BACKPORT_FOO
-# exists). The option BACKPORT_FOO then controls setting of the
-# BACKPORT_BUILD_FOO option, which is a module, like this:
+# changed to "select BPAUTO_FOO" (if the option BPAUTO_FOO
+# exists). The option BPAUTO_FOO then controls setting of the
+# BPAUTO_BUILD_FOO option, which is a module, like this:
#
-# config BACKPORT_BUILD_FOO
+# config BPAUTO_BUILD_FOO
# tristate
# # or bool
#
# # not possible on kernel < X.Y, build will fail if any
# # drivers are allowed to build on kernels < X.Y
-# depends on BACKPORT_KERNEL_X_Y
+# depends on BPAUTO_KERNEL_X_Y
#
# # don't build the backport code if FOO is in the kernel
# # already, but only if the kernel version is also >= X.Z;
# # this is an example of backporting where the version of
# # the FOO subsystem that we need is only available from
# # kernel version X.Z
-# depends on !FOO || BACKPORT_KERNEL_X_Z
+# depends on !FOO || BPAUTO_KERNEL_X_Z
#
-# # build if driver needs it (it selects BACKPORT_FOO)
-# default m if BACKPORT_FOO
+# # build if driver needs it (it selects BPAUTO_FOO)
+# default m if BPAUTO_FOO
#
-# # or for build-testing (BACKPORT_USERSEL_BUILD_ALL is enabled)
-# default m if BACKPORT_USERSEL_BUILD_ALL
+# # or for build-testing (BPAUTO_USERSEL_BUILD_ALL is enabled)
+# default m if BPAUTO_USERSEL_BUILD_ALL
#
-# config BACKPORT_FOO
+# config BPAUTO_FOO
# bool
#
# This only works as-is if the kernel code is usable on any version,
@@ -41,44 +41,44 @@
# B) An option for code always present on some kernels (e.g. KFIFO).
# This simply depends on/sets the default based on the version:
#
-# config BACKPORT_BUILD_KFIFO
+# config BPAUTO_BUILD_KFIFO
# def_bool y
-# depends on BACKPORT_KERNEL_2_6_36
+# depends on BPAUTO_KERNEL_2_6_36
#
#
# C) similarly, a kconfig symbol for an option, e.g.
-# BACKPORT_OPTION_SOME_FIX (no examples provided) check git log
+# BPAUTO_OPTION_SOME_FIX (no examples provided) check git log
#
#
# Variations are obviously possible.
#
-config BACKPORT_BUILD_CORDIC
+config BPAUTO_BUILD_CORDIC
tristate
depends on !CORDIC
- default m if BACKPORT_CORDIC
- default m if BACKPORT_USERSEL_BUILD_ALL
+ default m if BPAUTO_CORDIC
+ default m if BPAUTO_USERSEL_BUILD_ALL
#module-name cordic
#c-file lib/cordic.c
-config BACKPORT_CORDIC
+config BPAUTO_CORDIC
bool
-config BACKPORT_BUILD_AVERAGE
+config BPAUTO_BUILD_AVERAGE
bool
depends on !AVERAGE
- default y if BACKPORT_USERSEL_BUILD_ALL
- default y if BACKPORT_AVERAGE
+ default y if BPAUTO_USERSEL_BUILD_ALL
+ default y if BPAUTO_AVERAGE
#h-file linux/average.h
#c-file lib/average.c
-config BACKPORT_AVERAGE
+config BPAUTO_AVERAGE
bool
-config BACKPORT_MII
+config BPAUTO_MII
bool
-config BACKPORT_BUILD_DMA_SHARED_HELPERS
+config BPAUTO_BUILD_DMA_SHARED_HELPERS
bool
depends on HAS_DMA
# Build on other kernels kernels < 3.9 if HAVE_GENERIC_DMA_COHERENT is
@@ -87,25 +87,25 @@ config BACKPORT_BUILD_DMA_SHARED_HELPERS
# Always build if on 3.3 - 3.5
default y if (BACKPORT_KERNEL_3_4 || BACKPORT_KERNEL_3_5 || BACKPORT_KERNEL_3_6)
# build for testing
- default y if BACKPORT_USERSEL_BUILD_ALL
+ default y if BPAUTO_USERSEL_BUILD_ALL
-config BACKPORT_BUILD_LEDS
+config BPAUTO_BUILD_LEDS
bool
depends on !NEW_LEDS || LEDS_CLASS=n || !LEDS_TRIGGERS
- default y if BACKPORT_NEW_LEDS
- default y if BACKPORT_LEDS_CLASS
- default y if BACKPORT_LEDS_TRIGGERS
+ default y if BPAUTO_NEW_LEDS
+ default y if BPAUTO_LEDS_CLASS
+ default y if BPAUTO_LEDS_TRIGGERS
-config BACKPORT_NEW_LEDS
+config BPAUTO_NEW_LEDS
bool
-config BACKPORT_LEDS_CLASS
+config BPAUTO_LEDS_CLASS
bool
-config BACKPORT_LEDS_TRIGGERS
+config BPAUTO_LEDS_TRIGGERS
bool
-config BACKPORT_USERSEL_BUILD_ALL
+config BPAUTO_USERSEL_BUILD_ALL
bool "Build all compat code"
help
This option selects all the compat code options
@@ -114,24 +114,24 @@ config BACKPORT_USERSEL_BUILD_ALL
It's only really useful for compat testing, so
you probably shouldn't enable it.
-config BACKPORT_CRYPTO_CCM
+config BPAUTO_CRYPTO_CCM
depends on CRYPTO_AEAD
depends on CRYPTO_CTR
bool
-config BACKPORT_BUILD_CRYPTO_CCM
+config BPAUTO_BUILD_CRYPTO_CCM
bool
default n if CRYPTO_CCM
- default y if BACKPORT_CRYPTO_CCM
+ default y if BPAUTO_CRYPTO_CCM
#c-file crypto/ccm.c
-config BACKPORT_WANT_DEV_COREDUMP
+config BPAUTO_WANT_DEV_COREDUMP
bool
-config BACKPORT_BUILD_WANT_DEV_COREDUMP
+config BPAUTO_BUILD_WANT_DEV_COREDUMP
bool
default n if DEV_COREDUMP
default n if DISABLE_DEV_COREDUMP
- default y if BACKPORT_WANT_DEV_COREDUMP
+ default y if BPAUTO_WANT_DEV_COREDUMP
#h-file linux/devcoredump.h
#c-file drivers/base/devcoredump.c
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index 6d210b0..0dd69fe 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -21,5 +21,5 @@ compat-$(CPTCFG_BACKPORT_KERNEL_3_15) += backport-3.15.o
compat-$(CPTCFG_BACKPORT_KERNEL_3_17) += backport-3.17.o
compat-$(CPTCFG_BACKPORT_KERNEL_3_18) += backport-3.18.o
-compat-$(CPTCFG_BACKPORT_BUILD_CRYPTO_CCM) += crypto-ccm.o
-compat-$(CPTCFG_BACKPORT_BUILD_DMA_SHARED_HELPERS) += dma-shared-helpers.o
+compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
+compat-$(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS) += dma-shared-helpers.o
diff --git a/backport/compat/backports.h b/backport/compat/backports.h
index c9094ac..323c908 100644
--- a/backport/compat/backports.h
+++ b/backport/compat/backports.h
@@ -3,7 +3,7 @@
#include <linux/version.h>
-#ifdef CPTCFG_BACKPORT_BUILD_CRYPTO_CCM
+#ifdef CPTCFG_BPAUTO_BUILD_CRYPTO_CCM
int crypto_ccm_module_init(void);
void crypto_ccm_module_exit(void);
#else
@@ -13,7 +13,7 @@ static inline void crypto_ccm_module_exit(void)
{}
#endif
-#ifdef CPTCFG_BACKPORT_BUILD_WANT_DEV_COREDUMP
+#ifdef CPTCFG_BPAUTO_WANT_DEV_COREDUMP
int devcoredump_init(void);
void devcoredump_exit(void);
#else
diff --git a/gentree.py b/gentree.py
index 685fde5..9593d31 100755
--- a/gentree.py
+++ b/gentree.py
@@ -205,7 +205,7 @@ def add_automatic_backports(args, bp_prefix):
configtree = kconfig.ConfigTree(os.path.join(args.outdir, 'Kconfig'))
all_selects = configtree.all_selects()
for sym, vals in bpi.items():
- if sym.startswith('BACKPORT_BUILD_'):
+ if sym.startswith('BPAUTO_BUILD_'):
if not sym[15:] in all_selects:
disable_list.append(sym)
continue
@@ -231,9 +231,15 @@ def add_automatic_backports(args, bp_prefix):
raise Exception('backporting a module requires a #module-name')
for of in o_files:
mf.write('%s-objs += %s\n' % (module_name, of))
- mf.write('obj-$(%s%s) += %s.o\n' % (bp_prefix, sym, module_name))
+ if bp_prefix not in sym:
+ mf.write('obj-$(%s%s) += %s.o\n' % (bp_prefix, sym, module_name))
+ else:
+ mf.write('obj-$(%s) += %s.o\n' % (sym, module_name))
elif symtype == 'bool':
- mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
+ if bp_prefix not in sym:
+ mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
+ else:
+ mf.write('compat-$(%s) += %s\n' % (sym, ' '.join(o_files)))
# finally create the include file
syms = []
diff --git a/lib/kconfig.py b/lib/kconfig.py
index 5c47161..f89e468 100644
--- a/lib/kconfig.py
+++ b/lib/kconfig.py
@@ -93,7 +93,9 @@ class ConfigTree(object):
prefix = re.sub(r'^CONFIG_(.*)', r'\1', bp_prefix)
for sym in orig_symbols:
if sym in l:
- return re.sub(r' (' + sym + ')', r' ' + prefix + '\1', l)
+ if prefix not in sym:
+ return re.sub(r' (' + sym + ')', r' ' + prefix + '\\1', l)
+ return l
return l
def adjust_backported_configs(self, integrate, orig_symbols, bp_prefix):
diff --git a/patches/backport-adjustments/devcoredump.patch b/patches/backport-adjustments/devcoredump.patch
index 3378884..3bf35f9 100644
--- a/patches/backport-adjustments/devcoredump.patch
+++ b/patches/backport-adjustments/devcoredump.patch
@@ -107,7 +107,7 @@ index c0a360e99f64..da20e61f6c06 100644
#include <linux/vmalloc.h>
-#ifdef CONFIG_DEV_COREDUMP
-+#ifdef CPTCFG_BACKPORT_BUILD_WANT_DEV_COREDUMP
++#ifdef CPTCFG_BPAUTO_WANT_DEV_COREDUMP
void dev_coredumpv(struct device *dev, const void *data, size_t datalen,
gfp_t gfp);
@@ -116,6 +116,6 @@ index c0a360e99f64..da20e61f6c06 100644
free(data);
}
-#endif /* CONFIG_DEV_COREDUMP */
-+#endif /* CPTCFG_BACKPORT_BUILD_WANT_DEV_COREDUMP */
++#endif /* CPTCFG_BPAUTO_WANT_DEV_COREDUMP */
#endif /* __DEVCOREDUMP_H */
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO
2014-11-04 8:43 ` [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO Luis R. Rodriguez
@ 2014-11-04 10:14 ` Johannes Berg
2014-11-04 21:50 ` Luis R. Rodriguez
0 siblings, 1 reply; 26+ messages in thread
From: Johannes Berg @ 2014-11-04 10:14 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: backports, linux-kernel, yann.morin.1998, mmarek, sassmann,
Luis R. Rodriguez
On Tue, 2014-11-04 at 00:43 -0800, Luis R. Rodriguez wrote:
> - mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
> + if bp_prefix not in sym:
> + mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
> + else:
> + mf.write('compat-$(%s) += %s\n' % (sym, ' '.join(o_files)))
I don't think these changes are correct, the bp_prefix is needed anyway,
and there's no way it could already be. Looks like this comes from a
previous attempt where you misunderstood and thought
CONFIG_BACKPORT_BACKPORT_... was actually wrong, when in fact it is
correct (and would now be CONFIG_BACKPORT_BPAUTO_...)
johannes
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO
2014-11-04 10:14 ` Johannes Berg
@ 2014-11-04 21:50 ` Luis R. Rodriguez
2014-11-04 21:50 ` Johannes Berg
0 siblings, 1 reply; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 21:50 UTC (permalink / raw)
To: Johannes Berg
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Tue, Nov 04, 2014 at 11:14:52AM +0100, Johannes Berg wrote:
> On Tue, 2014-11-04 at 00:43 -0800, Luis R. Rodriguez wrote:
>
> > - mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
> > + if bp_prefix not in sym:
> > + mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
> > + else:
> > + mf.write('compat-$(%s) += %s\n' % (sym, ' '.join(o_files)))
>
> I don't think these changes are correct, the bp_prefix is needed anyway,
> and there's no way it could already be. Looks like this comes from a
> previous attempt where you misunderstood and thought
> CONFIG_BACKPORT_BACKPORT_... was actually wrong, when in fact it is
> correct (and would now be CONFIG_BACKPORT_BPAUTO_...)
I did at one point have BACKPORT_BPAUTO_* stuff on the compat/Kconfig for
the auto stuff but figured that was superfluous. I'll respin with it.
Luis
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO
2014-11-04 21:50 ` Luis R. Rodriguez
@ 2014-11-04 21:50 ` Johannes Berg
2014-11-05 0:21 ` Luis R. Rodriguez
0 siblings, 1 reply; 26+ messages in thread
From: Johannes Berg @ 2014-11-04 21:50 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Tue, 2014-11-04 at 22:50 +0100, Luis R. Rodriguez wrote:
> On Tue, Nov 04, 2014 at 11:14:52AM +0100, Johannes Berg wrote:
> > On Tue, 2014-11-04 at 00:43 -0800, Luis R. Rodriguez wrote:
> >
> > > - mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
> > > + if bp_prefix not in sym:
> > > + mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
> > > + else:
> > > + mf.write('compat-$(%s) += %s\n' % (sym, ' '.join(o_files)))
> >
> > I don't think these changes are correct, the bp_prefix is needed anyway,
> > and there's no way it could already be. Looks like this comes from a
> > previous attempt where you misunderstood and thought
> > CONFIG_BACKPORT_BACKPORT_... was actually wrong, when in fact it is
> > correct (and would now be CONFIG_BACKPORT_BPAUTO_...)
>
> I did at one point have BACKPORT_BPAUTO_* stuff on the compat/Kconfig for
> the auto stuff but figured that was superfluous. I'll respin with it.
Not sure what you mean? It seems to me you should just drop the changes
like the one I quoted above.
johannes
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO
2014-11-04 21:50 ` Johannes Berg
@ 2014-11-05 0:21 ` Luis R. Rodriguez
2014-11-05 7:29 ` Johannes Berg
0 siblings, 1 reply; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-05 0:21 UTC (permalink / raw)
To: Johannes Berg
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Tue, Nov 04, 2014 at 10:50:50PM +0100, Johannes Berg wrote:
> On Tue, 2014-11-04 at 22:50 +0100, Luis R. Rodriguez wrote:
> > On Tue, Nov 04, 2014 at 11:14:52AM +0100, Johannes Berg wrote:
> > > On Tue, 2014-11-04 at 00:43 -0800, Luis R. Rodriguez wrote:
> > >
> > > > - mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
> > > > + if bp_prefix not in sym:
> > > > + mf.write('compat-$(%s%s) += %s\n' % (bp_prefix, sym, ' '.join(o_files)))
> > > > + else:
> > > > + mf.write('compat-$(%s) += %s\n' % (sym, ' '.join(o_files)))
> > >
> > > I don't think these changes are correct, the bp_prefix is needed anyway,
> > > and there's no way it could already be. Looks like this comes from a
> > > previous attempt where you misunderstood and thought
> > > CONFIG_BACKPORT_BACKPORT_... was actually wrong, when in fact it is
> > > correct (and would now be CONFIG_BACKPORT_BPAUTO_...)
> >
> > I did at one point have BACKPORT_BPAUTO_* stuff on the compat/Kconfig for
> > the auto stuff but figured that was superfluous. I'll respin with it.
>
> Not sure what you mean? It seems to me you should just drop the changes
> like the one I quoted above.
If we keep BACKPORT_BPAUTO as prefix on compat/Kconfig for auto backport
stuff we'll end up with BACKPORT_BACKPORT_BPAUTO, while technically correct
as you have pointed out, I find it personally superfluous. If we however
only use BPAUTO_ prefix on the compat/Kconfig we'll end up with BACKPORT_BPAUTO.
Its subjective then, but I was opting in to prefer to just keep BPAUTO_ prefix
with the resulting CPTCFG_BPAUTO for packaging and CONFIG_BACKPORT_BPAUTO for
integration for these, if you however feel its best to double the BACKPORT
prefix that's fine too, it just seemed odd (although I realize correct).
To do what I just described I think you're right will try removing that,
testing that now. The other case that I ran into issues was the backport
versioning variables but I have solved that through other non intrusive means
to packaging (just use the C define with CPTCFG_ prefix, keeping the original
Makefile variables) which will be part of my next respin.
We still do need to decide if we want double BACKPORT_ prefix for BPAUTO
though, that remains subjective and I don't feel strongly about any way
we go.
Luis
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO
2014-11-05 0:21 ` Luis R. Rodriguez
@ 2014-11-05 7:29 ` Johannes Berg
2014-11-05 8:02 ` Luis R. Rodriguez
0 siblings, 1 reply; 26+ messages in thread
From: Johannes Berg @ 2014-11-05 7:29 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Wed, 2014-11-05 at 01:21 +0100, Luis R. Rodriguez wrote:
> > > I did at one point have BACKPORT_BPAUTO_* stuff on the compat/Kconfig for
> > > the auto stuff but figured that was superfluous. I'll respin with it.
> >
> > Not sure what you mean? It seems to me you should just drop the changes
> > like the one I quoted above.
>
> If we keep BACKPORT_BPAUTO as prefix on compat/Kconfig for auto backport
> stuff we'll end up with BACKPORT_BACKPORT_BPAUTO, while technically correct
> as you have pointed out, I find it personally superfluous. If we however
> only use BPAUTO_ prefix on the compat/Kconfig we'll end up with BACKPORT_BPAUTO.
Correct.
> Its subjective then, but I was opting in to prefer to just keep BPAUTO_ prefix
> with the resulting CPTCFG_BPAUTO for packaging and CONFIG_BACKPORT_BPAUTO for
> integration for these, if you however feel its best to double the BACKPORT
> prefix that's fine too, it just seemed odd (although I realize correct).
No, I'm perfectly happy with CPTCFG_BPAUTO. But the *code* changes
you're making here that check whether bp_prefix is being duplicated
aren't necessary for that, and are in fact confusing and dangerous.
johannes
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO
2014-11-05 7:29 ` Johannes Berg
@ 2014-11-05 8:02 ` Luis R. Rodriguez
2014-11-05 8:12 ` Johannes Berg
0 siblings, 1 reply; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-05 8:02 UTC (permalink / raw)
To: Johannes Berg
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Wed, Nov 05, 2014 at 08:29:50AM +0100, Johannes Berg wrote:
> On Wed, 2014-11-05 at 01:21 +0100, Luis R. Rodriguez wrote:
>
> > > > I did at one point have BACKPORT_BPAUTO_* stuff on the compat/Kconfig for
> > > > the auto stuff but figured that was superfluous. I'll respin with it.
> > >
> > > Not sure what you mean? It seems to me you should just drop the changes
> > > like the one I quoted above.
> >
> > If we keep BACKPORT_BPAUTO as prefix on compat/Kconfig for auto backport
> > stuff we'll end up with BACKPORT_BACKPORT_BPAUTO, while technically correct
> > as you have pointed out, I find it personally superfluous. If we however
> > only use BPAUTO_ prefix on the compat/Kconfig we'll end up with BACKPORT_BPAUTO.
>
> Correct.
>
> > Its subjective then, but I was opting in to prefer to just keep BPAUTO_ prefix
> > with the resulting CPTCFG_BPAUTO for packaging and CONFIG_BACKPORT_BPAUTO for
> > integration for these, if you however feel its best to double the BACKPORT
> > prefix that's fine too, it just seemed odd (although I realize correct).
>
> No, I'm perfectly happy with CPTCFG_BPAUTO.
OK cool.
> But the *code* changes
> you're making here that check whether bp_prefix is being duplicated
> aren't necessary for that, and are in fact confusing and dangerous.
Understood, thanks for the review, hopefully this is addressed with the
latest series.
Luis
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO
2014-11-05 8:02 ` Luis R. Rodriguez
@ 2014-11-05 8:12 ` Johannes Berg
2014-11-05 8:20 ` Luis R. Rodriguez
0 siblings, 1 reply; 26+ messages in thread
From: Johannes Berg @ 2014-11-05 8:12 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Wed, 2014-11-05 at 09:02 +0100, Luis R. Rodriguez wrote:
> > But the *code* changes
> > you're making here that check whether bp_prefix is being duplicated
> > aren't necessary for that, and are in fact confusing and dangerous.
>
> Understood, thanks for the review, hopefully this is addressed with the
> latest series.
Actually, maybe you wanted these changes because you didn't want to end
up with CONFIG_BACKPORT_BPAUTO_ for integration? I think that's a small
price to pay though for code complexity trade-off, IMHO you should
accept CONFIG_BACKPORT_BPAUTO_ and remove the code changes.
johannes
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO
2014-11-05 8:12 ` Johannes Berg
@ 2014-11-05 8:20 ` Luis R. Rodriguez
0 siblings, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-05 8:20 UTC (permalink / raw)
To: Johannes Berg
Cc: Luis R. Rodriguez, backports, linux-kernel, yann.morin.1998,
mmarek, sassmann
On Wed, Nov 05, 2014 at 09:12:03AM +0100, Johannes Berg wrote:
> On Wed, 2014-11-05 at 09:02 +0100, Luis R. Rodriguez wrote:
>
> > > But the *code* changes
> > > you're making here that check whether bp_prefix is being duplicated
> > > aren't necessary for that, and are in fact confusing and dangerous.
> >
> > Understood, thanks for the review, hopefully this is addressed with the
> > latest series.
>
> Actually, maybe you wanted these changes because you didn't want to end
> up with CONFIG_BACKPORT_BPAUTO_ for integration? I think that's a small
> price to pay though for code complexity trade-off, IMHO you should
> accept CONFIG_BACKPORT_BPAUTO_ and remove the code changes.
Quite the contrary, I did this to get CONFIG_BACKPORT_BPAUTO_ and not
CONFIG_BACKPORT_BACKPORT_. So right now I do get CONFIG_BACKPORT_BPAUTO_
for integration (with the v2 patch series).
Luis
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v1 11/11] backports: add full kernel integration support
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
` (9 preceding siblings ...)
2014-11-04 8:43 ` [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO Luis R. Rodriguez
@ 2014-11-04 8:43 ` Luis R. Rodriguez
10 siblings, 0 replies; 26+ messages in thread
From: Luis R. Rodriguez @ 2014-11-04 8:43 UTC (permalink / raw)
To: backports
Cc: linux-kernel, yann.morin.1998, mmarek, sassmann, Luis R. Rodriguez
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This enables support for using the backports project
to integrate device drivers from a future version of Linux
into an older version of Linux. What you end up seeing is
a backports submenu when configuring your kernel and the
ability to select specific device drivers from subsystems
supported through the Linux backports project.
At this time enabling one device driver from a future version
of Linux will require using only the latest version of the
subsystem modules and other subsystem drivers. For example
enabling cfg80211 and mac80211 from a future version of Linux
will require you to only use future version of the respective
device drivers. In order to enable the backported version of
802.11 drivers for example, you will have to enable first:
Networking support -->
Wireless -->
But under that menu disable all options, then jump to the backports
submenu to now enable:
Backports -->
cfg80211
mac80211
Wireless LAN --->
etc
You build these device drivers modular or built-in to the kernel.
Integration support requires only slight modifications to the original
kernel sources, one to the top level Kconfig to add our entry, and also
the top level Makefile to enable backports code to be part of the
built-in vmlinux.
Support for integration takes advantage over the existing infrastructure
added by Johannes to keep track of each indvidual change done by the
backports infrastructure if --gitdebug is used.
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.104 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.58 [ OK ]
12 3.11.10 [ OK ]
13 3.12.31 [ OK ]
14 3.13.11 [ OK ]
15 3.14.22 [ OK ]
16 3.15.10 [ OK ]
17 3.16.6 [ OK ]
18 3.17.1 [ OK ]
19 3.18-rc1 [ OK ]
real 3m17.573s
user 67m33.172s
sys 18m27.596s
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
backport/Kconfig.integrate | 36 +++++++++++
backport/Makefile.kernel | 13 ++++
backport/backport-include/backport/backport.h | 5 ++
backport/compat/Makefile | 4 ++
backport/compat/main.c | 8 ++-
devel/doc/kconfig-operation | 5 ++
gentree.py | 73 +++++++++++++++++++---
.../0001-enable-backports-built-in.patch | 40 ++++++++++++
lib/bpversion.py | 48 ++++++++++++++
lib/kconfig.py | 10 +++
10 files changed, 233 insertions(+), 9 deletions(-)
create mode 100644 backport/Kconfig.integrate
create mode 100644 integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch
create mode 100644 lib/bpversion.py
diff --git a/backport/Kconfig.integrate b/backport/Kconfig.integrate
new file mode 100644
index 0000000..520f6da
--- /dev/null
+++ b/backport/Kconfig.integrate
@@ -0,0 +1,36 @@
+config BACKPORT_INTEGRATE
+ bool
+ def_bool y
+
+config BACKPORT_DIR
+ string
+ default "%%BACKPORT_DIR%%"
+
+config BACKPORTS_VERSION
+ string
+ default "%%BACKPORTS_VERSION%%"
+
+config BACKPORTED_KERNEL_VERSION
+ string
+ default "%%BACKPORTED_KERNEL_VERSION%%"
+
+config BACKPORTED_KERNEL_NAME
+ string
+ default "%%BACKPORTED_KERNEL_NAME%%"
+
+menuconfig BACKPORT_LINUX
+ bool "Backport %%BACKPORTED_KERNEL_NAME%% %%BACKPORTED_KERNEL_VERSION%% (backports %%BACKPORTS_VERSION%%)"
+ default n
+ ---help---
+ Enabling this will let give you the opportunity to use features and
+ drivers backported from %%BACKPORTED_KERNEL_NAME%% %%BACKPORTED_KERNEL_VERSION%%
+ on the kernel your are using. This is experimental and you should
+ say no unless you'd like to help test things or want to help debug
+ this should we run into any issues.
+
+if BACKPORT_LINUX
+
+source "$BACKPORT_DIR/Kconfig.versions"
+source "$BACKPORT_DIR/Kconfig.sources"
+
+endif # BACKPORT_LINUX
diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index 7a41273..4726712 100644
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -1,3 +1,4 @@
+ifeq ($(CONFIG_BACKPORT_INTEGRATE),)
# Since 2.6.21, try-run is available, but cc-disable-warning
# was only added later, so we add it here ourselves:
backport-cc-disable-warning = $(call try-run,\
@@ -13,6 +14,18 @@ NOSTDINC_FLAGS := \
$(CFLAGS)
export backport_srctree = $(M)
+else
+export BACKPORT_DIR = backports/
+export backport_srctree = $(BACKPORT_DIR)
+NOSTDINC_FLAGS := \
+ -I$(BACKPORT_DIR)/backport-include/ \
+ -I$(BACKPORT_DIR)/backport-include/uapi \
+ -I$(BACKPORT_DIR)/include/ \
+ -I$(BACKPORT_DIR)/include/uapi \
+ -include $(BACKPORT_DIR)/backport-include/backport/backport.h \
+ $(CFLAGS)
+endif
+
obj-y += compat/
diff --git a/backport/backport-include/backport/backport.h b/backport/backport-include/backport/backport.h
index 7cf21aa..d1d3b10 100644
--- a/backport/backport-include/backport/backport.h
+++ b/backport/backport-include/backport/backport.h
@@ -1,11 +1,16 @@
#ifndef __BACKPORT_H
#define __BACKPORT_H
+#include <generated/autoconf.h>
+#ifndef CONFIG_BACKPORT_INTEGRATE
#include <backport/autoconf.h>
+#endif
#include <linux/kconfig.h>
#ifndef __ASSEMBLY__
#define LINUX_BACKPORT(__sym) backport_ ##__sym
+#ifndef CONFIG_BACKPORT_INTEGRATE
#include <backport/checks.h>
#endif
+#endif
#endif /* __BACKPORT_H */
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index 0dd69fe..5a2f2f5 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -1,5 +1,9 @@
ccflags-y += -I$(src)
+ifeq ($(CONFIG_BACKPORT_INTEGRATE),)
obj-m += compat.o
+else
+obj-y += compat.o
+endif
compat-y += main.o
# Kernel backport compatibility code
diff --git a/backport/compat/main.c b/backport/compat/main.c
index 44935bd..a679f8d 100644
--- a/backport/compat/main.c
+++ b/backport/compat/main.c
@@ -71,8 +71,14 @@ static int __init backport_init(void)
#ifdef CPTCFG_BACKPORTS_GIT_TRACKED
printk(KERN_INFO CPTCFG_BACKPORTS_GIT_TRACKED "\n");
#else
+
+#ifdef CONFIG_BACKPORT_INTEGRATE
+ printk(KERN_INFO "Backport integrated by backports.git " CPTCFG_BACKPORTS_VERSION "\n");
+#else
printk(KERN_INFO "Backport generated by backports.git " CPTCFG_BACKPORTS_VERSION "\n");
-#endif
+#endif /* CPTCFG_BACKPORTS_GIT_TRACKED */
+
+#endif /* CPTCFG_BACKPORTS_GIT_TRACKED */
return 0;
}
diff --git a/devel/doc/kconfig-operation b/devel/doc/kconfig-operation
index f1ecf60..047e327 100644
--- a/devel/doc/kconfig-operation
+++ b/devel/doc/kconfig-operation
@@ -73,6 +73,11 @@ This allows code to, for example, have "#ifdef CONFIG_PM" which can only
be set or cleared in the kernel, not in the backport configuration. Since
this is needed, a transformation step is done at backport creation time.
+When using Linux backports to integrate into an existing Linux tree
+the CONFIG_BACKPORT_ prefix is used, this allows a CONFIG_BACKPORT_
+symbol to depend on the non-backported respective symbol to be selected
+allowing these to be mutually exclusive.
+
Backport creation for Kconfig
-------------------------------
diff --git a/gentree.py b/gentree.py
index 9593d31..e53aa66 100755
--- a/gentree.py
+++ b/gentree.py
@@ -16,6 +16,7 @@ from lib import bpgpg as gpg
from lib import bpkup as kup
from lib.tempdir import tempdir
from lib import bpreqs as reqs
+from lib import bpversion as gen_version
def read_copy_list(copyfile):
"""
@@ -613,6 +614,9 @@ def _main():
'and we use git ls-tree to get the files.')
parser.add_argument('--clean', const=True, default=False, action="store_const",
help='Clean output directory instead of erroring if it isn\'t empty')
+ parser.add_argument('--integrate', const=True, default=False, action="store_const",
+ help='Integrate a future backported kernel solution into ' +
+ 'an older kernel tree source directory.')
parser.add_argument('--refresh', const=True, default=False, action="store_const",
help='Refresh patches as they are applied, the source dir will be modified!')
parser.add_argument('--base-name', metavar='<name>', type=str, default='Linux',
@@ -643,13 +647,18 @@ def _main():
'of changes done by Coccinelle.')
args = parser.parse_args()
+ if args.integrate:
+ args.outdir = os.path.join(args.outdir, 'backports/')
+
def logwrite(msg):
sys.stdout.write(msg)
sys.stdout.write('\n')
sys.stdout.flush()
return process(args.kerneldir, args.outdir, args.copy_list,
- git_revision=args.git_revision, clean=args.clean,
+ git_revision=args.git_revision,
+ integrate=args.integrate,
+ clean=args.clean,
refresh=args.refresh, base_name=args.base_name,
gitdebug=args.gitdebug, verbose=args.verbose,
extra_driver=args.extra_driver,
@@ -660,6 +669,7 @@ def _main():
logwrite=logwrite)
def process(kerneldir, outdir, copy_list_file, git_revision=None,
+ integrate=False,
clean=False, refresh=False, base_name="Linux", gitdebug=False,
verbose=False, extra_driver=[], kup=False,
kup_test=False,
@@ -669,7 +679,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
git_tracked_version=False):
class Args(object):
def __init__(self, kerneldir, outdir, copy_list_file,
- git_revision, clean, refresh, base_name,
+ git_revision, integrate, clean, refresh, base_name,
gitdebug, verbose, extra_driver, kup,
kup_test,
test_cocci,
@@ -678,6 +688,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
self.outdir = outdir
self.copy_list = copy_list_file
self.git_revision = git_revision
+ self.integrate = integrate
self.clean = clean
self.refresh = refresh
self.base_name = base_name
@@ -700,11 +711,15 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
logwrite('Validated tree: %s' % tree)
args = Args(kerneldir, outdir, copy_list_file,
- git_revision, clean, refresh, base_name,
+ git_revision, integrate, clean, refresh, base_name,
gitdebug, verbose, extra_driver, kup, kup_test,
test_cocci, profile_cocci)
rel_prep = None
- integrate = False
+
+ if args.integrate:
+ if args.kup_test or args.test_cocci or args.profile_cocci or args.refresh:
+ logwrite('Cannot use integration with:\n\tkup_test\n\ttest_cocci\n\tprofile_cocci\n\trefresh\n');
+ sys.exit(1)
# When building a package we use CPTCFG as we can rely on the
# fact that kconfig treats CONFIG_ as an environment variable
@@ -752,6 +767,10 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
check_output_dir(args.outdir, args.clean)
# do the copy
+ backport_integrate_files = [
+ ('Makefile.kernel', 'Makefile'),
+ ('Kconfig.integrate', 'Kconfig'),
+ ]
backport_package_files = [(x, x) for x in [
'Makefile',
'kconf/',
@@ -770,8 +789,10 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
'backport-include/',
]]
- if not integrate:
+ if not args.integrate:
backport_files += backport_package_files
+ else:
+ backport_files += backport_integrate_files
if not args.git_revision:
logwrite('Copy original source files ...')
@@ -780,7 +801,8 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
copy_files(os.path.join(source_dir, 'backport'), backport_files, args.outdir)
- git_debug_init(args)
+ if not args.integrate:
+ git_debug_init(args)
if not args.git_revision:
copy_files(args.kerneldir, copy_list, args.outdir)
@@ -834,6 +856,21 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
apply_patches(args, "backport", source_dir, 'patches', args.outdir, logwrite)
+ # Kernel integration requires Kconfig.versions already generated for you,
+ # we cannot do this for a package as we have no idea what kernel folks
+ # will be using.
+ if args.integrate:
+ kver = gen_version.kernelversion(os.path.join(args.outdir, "../"))
+ rel_specs = gen_version.get_rel_spec_stable(kver)
+ if not rel_specs:
+ logwrite('Cannot parse source kernel version, update parser')
+ sys.exit(1)
+ data = gen_version.genkconfig_versions(rel_specs)
+ fo = open(os.path.join(args.outdir, 'Kconfig.versions'), 'w')
+ fo.write(data)
+ fo.close()
+ git_debug_snapshot(args, "generate kernel version requirement Kconfig file")
+
# some post-processing is required
configtree = kconfig.ConfigTree(os.path.join(args.outdir, 'Kconfig'))
orig_symbols = configtree.symbols()
@@ -854,7 +891,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
symbols = configtree.symbols()
- if not integrate:
+ if not args.integrate:
# write local symbol list -- needed during build
f = open(os.path.join(args.outdir, '.local-symbols'), 'w')
for sym in symbols:
@@ -892,6 +929,11 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
for some_symbols in [all_symbols[i:i + 50] for i in range(0, len(all_symbols), 50)]:
r = 'CONFIG_((?!BACKPORT)(' + '|'.join([s + '(_MODULE)?' for s in some_symbols]) + ')([^A-Za-z0-9_]|$))'
regexes.append(re.compile(r, re.MULTILINE))
+ # Replace default prefix
+ reg = re.compile(r'(CPTCFG_)', re.MULTILINE)
+ # Get rid of doulble prefix
+ prefix = re.sub(r'^CONFIG_(.*)_', r'\1', bp_prefix)
+ reg_last = re.compile(r'(' + prefix + '_' + prefix + ')', re.MULTILINE)
for root, dirs, files in os.walk(args.outdir):
# don't go into .git dir (possible debug thing)
if '.git' in dirs:
@@ -900,6 +942,9 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
data = open(os.path.join(root, f), 'r').read()
for r in regexes:
data = r.sub(r'' + bp_prefix + '\\1', data)
+ if bp_prefix != 'CPTCFG_':
+ data = reg.sub(r'' + bp_prefix + '', data)
+ data = reg_last.sub(r'' + prefix + '', data)
data = re.sub(r'\$\(srctree\)', '$(backport_srctree)', data)
data = re.sub(r'-Idrivers', '-I$(backport_srctree)/drivers', data)
fo = open(os.path.join(root, f), 'w')
@@ -909,7 +954,10 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
git_debug_snapshot(args, "rename config symbol / srctree usage")
# disable unbuildable Kconfig symbols and stuff Makefiles that doesn't exist
- maketree = make.MakeTree(os.path.join(args.outdir, 'Makefile.kernel'))
+ if args.integrate:
+ maketree = make.MakeTree(os.path.join(args.outdir, 'Makefile'))
+ else:
+ maketree = make.MakeTree(os.path.join(args.outdir, 'Makefile.kernel'))
disable_kconfig = []
disable_makefile = []
for sym in maketree.get_impossible_symbols():
@@ -956,6 +1004,15 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
fo.close()
git_debug_snapshot(args, "disable unsatisfied Makefile parts")
+ if args.integrate:
+ f = open(os.path.join(args.outdir, '../Kconfig'), 'a')
+ f.write('source "backports/Kconfig"\n')
+ f.close()
+ git_debug_snapshot(args, "hooked backport to top level Kconfig")
+
+ apply_patches(args, "integration", source_dir, 'integration-patches/',
+ os.path.join(args.outdir, '../'), logwrite)
+
if (args.kup or args.kup_test):
req = reqs.Req()
req.kup()
diff --git a/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch b/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch
new file mode 100644
index 0000000..d66b203
--- /dev/null
+++ b/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch
@@ -0,0 +1,40 @@
+Allow backports to be integrated into vmlinux.
+
+diff --git a/Makefile b/Makefile
+index 6d1e304..de26b18 100644
+--- a/Makefile
++++ b/Makefile
+@@ -542,6 +542,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
+ $(Q)$(MAKE) $(build)=$(@)
+
+ # Objects we will link into vmlinux / subdirs we need to visit
++backports-y := backports/
+ init-y := init/
+ drivers-y := drivers/ sound/ firmware/
+ net-y := net/
+@@ -820,13 +821,16 @@ core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
+
+ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
++ $(backports-y) $(backports-m) \
+ $(net-y) $(net-m) $(libs-y) $(libs-m)))
+
+ vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
+ $(init-n) $(init-) \
+ $(core-n) $(core-) $(drivers-n) $(drivers-) \
++ $(backports-n) $(backports-) \
+ $(net-n) $(net-) $(libs-n) $(libs-))))
+
++backports-y := $(patsubst %/, %/built-in.o, $(backports-y))
+ init-y := $(patsubst %/, %/built-in.o, $(init-y))
+ core-y := $(patsubst %/, %/built-in.o, $(core-y))
+ drivers-y := $(patsubst %/, %/built-in.o, $(drivers-y))
+@@ -837,7 +841,7 @@ libs-y := $(libs-y1) $(libs-y2)
+
+ # Externally visible symbols (used by link-vmlinux.sh)
+ export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)
+-export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y)
++export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(backports-y)
+ export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
+ export LDFLAGS_vmlinux
+ # used by scripts/pacmage/Makefile
diff --git a/lib/bpversion.py b/lib/bpversion.py
new file mode 100644
index 0000000..aefdcf0
--- /dev/null
+++ b/lib/bpversion.py
@@ -0,0 +1,48 @@
+import subprocess, os, re
+
+class VersionError(Exception):
+ pass
+class ExecutionError(VersionError):
+ def __init__(self, errcode):
+ self.error_code = errcode
+
+def _check(process):
+ if process.returncode != 0:
+ raise ExecutionError(process.returncode)
+
+def get_rel_spec_stable(rel):
+ """
+ Returns release specs for a linux-stable backports based release.
+ """
+ m = None
+ if ("rc" in rel):
+ m = re.match(r"v*(?P<VERSION>\d+)\.+" \
+ "(?P<PATCHLEVEL>\d+)[.]*" \
+ "(?P<SUBLEVEL>\d*)" \
+ "[-rc]+(?P<RC_VERSION>\d+)",
+ rel)
+ else:
+ m = re.match(r"(?P<VERSION>\d+)\.+" \
+ "(?P<PATCHLEVEL>\d+)[.]*" \
+ "(?P<SUBLEVEL>\d*)",
+ rel)
+ if (not m):
+ return m
+ return m.groupdict()
+
+def kernelversion(tree):
+ cmd = ['make', '--no-print-directory', '-C', tree, 'kernelversion' ]
+ process = subprocess.Popen(cmd,
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+ close_fds=True, universal_newlines=True)
+ stdout = process.communicate()[0]
+ process.wait()
+ _check(process)
+ return stdout.strip()
+
+def genkconfig_versions(rel_specs):
+ data = ''
+ for i in range(int(rel_specs['PATCHLEVEL']) + 1, 99):
+ data += "config BACKPORT_KERNEL_%s_%s\n" % (rel_specs['VERSION'], i)
+ data += " def_bool y\n"
+ return data
diff --git a/lib/kconfig.py b/lib/kconfig.py
index f89e468..40a5303 100644
--- a/lib/kconfig.py
+++ b/lib/kconfig.py
@@ -12,6 +12,8 @@ cfg_line = re.compile(r'^(?P<opt>config|menuconfig)\s+(?P<sym>[^\s]*)')
sel_line = re.compile(r'^(?P<spc>\s+)select\s+(?P<sym>[^\s]*)\s*$')
backport_line = re.compile(r'^\s+#(?P<key>[ch]-file|module-name)\s*(?P<name>.*)')
ignore_parse_p = re.compile(r'^\s*#(?P<key>ignore-parser-package)')
+kernel_version_config = re.compile(r'^(?P<opt>config)\s+(?P<sym>BACKPORT_KERNEL_[\d])')
+ignore_syms = re.compile(r'^(?P<opt>config|menuconfig)\s+(?P<sym>BACKPORT_DIR|BACKPORTS_VERSION|BACKPORTED_KERNEL_VERSION|BACKPORTED_KERNEL_NAME|BACKPORT_LINUX)')
class ConfigTree(object):
def __init__(self, rootfile):
@@ -109,6 +111,14 @@ class ConfigTree(object):
if pm:
ignore_parse_modular = True
continue
+ vm = kernel_version_config.match(l)
+ if vm:
+ out += l
+ continue
+ ig = ignore_syms.match(l)
+ if ig:
+ out += l
+ continue
n = cfg_line.match(l)
if n:
m = n
--
2.1.1
^ permalink raw reply related [flat|nested] 26+ messages in thread