Skip to contentSkip to conversation

backports: add kernel integration support

PATCH In review Luis R. Rodriguez 4 participants 33 messages Nov 11, 2014 – Jul 7, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover backports: add kernel integration support

From: "Luis R. Rodriguez" <[email protected]>

This third series should hopefully address all pending feedback. I've split out patches even more, but more importantly have made the parser simpler by both integrating the logic required to understand a backport by identifying the backport by type and strategy, sharing that, and then providing ignore lists on the parsers.

The more complex change was dealing with the recursive _walk() in such a way that we can have a modified src_line regexp depending on the type of backport we are using. The parser will use a regexp that requires a full path for the sources, it will also allow for using a variable for the backport project directory if such is defined, and also provide a verification helper which ensures backported will be used rather than the older kernel code.

Luis R. Rodriguez (21):
backports: move legacy and SmPL patch application into helper
backports: ifdef around module_init() module_exit() for modules
backports: move packaging kconfig hacks to its own file
backports: grant parsers access to kconfig config and menuconfig
backports: keep track of original backported source symbols early on
backports: allow for different backport prefix and simple integration
support
backports: add prefix for integration on dependencies
backports: replace BACKPORT_PWD with BACKPORT_DIR
backports: fold outdir as a backport identity target
backports: avoid git tree reinitialization
backports: modify kconfig parser to use bpid and target_dir
backports: make kconfig src_line backport / ConfigTree specific
backports: use BACKPORT_DIR prefix on kconfig sources
backports: update dependencies map file
backports: split Kconfig into Kconfig.package and Kconfig.sources
backports: move version file generation to run earlier
backports: define C code backport version info using CPTCFG_
backports: add backport version parsing for kernel integration
backports: prefix c-file / h-file auto backport with BPAUTO
backports: remove extra BACKPORT_ prefix from kernel versioning
backports: add full kernel integration support

 backport/Kconfig                                   |  47 --
 backport/Kconfig.integrate                         |  36 ++
 backport/Kconfig.package                           |  24 +
 backport/Kconfig.package.hacks                     |   8 +
 backport/Kconfig.sources                           |  23 +
 backport/Makefile                                  |   8 +-
 backport/Makefile.build                            |   4 +-
 backport/Makefile.kernel                           |  19 +-
 backport/Makefile.real                             |   2 +-
 backport/backport-include/asm/dma-mapping.h        |   4 +-
 backport/backport-include/backport/backport.h      |   5 +
 backport/backport-include/backport/leds-disabled.h |   2 +-
 backport/backport-include/linux/module.h           |   8 +-
 backport/compat/Kconfig                            |  84 +--
 backport/compat/Makefile                           |  42 +-
 backport/compat/backports.h                        |   4 +-
 backport/compat/main.c                             |  40 +-
 backport/scripts/uninstall.sh                      |   4 +-
 dependencies                                       |  31 +-
 devel/doc/kconfig-operation                        |  13 +-
 gentree.py                                         | 599 ++++++++++++++-------
 .../0001-enable-backports-built-in.patch           |  40 ++
 lib/bpversion.py                                   |  48 ++
 lib/kconfig.py                                     | 196 ++++++-
 patches/backport-adjustments/devcoredump.patch     |   4 +-
 .../media/0002-no_dmabuf/v4l2.patch                |   6 +-
 26 files changed, 910 insertions(+), 391 deletions(-)
 delete mode 100644 backport/Kconfig
 create mode 100644 backport/Kconfig.integrate
 create mode 100644 backport/Kconfig.package
 create mode 100644 backport/Kconfig.package.hacks
 create mode 100644 backport/Kconfig.sources
 create mode 100644 integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch
 create mode 100644 lib/bpversion.py
Signature · 1 line
2.1.1
#1 lore raw

PATCH v3 1/21 backports: move legacy and SmPL patch application into helper

From: "Luis R. Rodriguez" <[email protected]>

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.

---
 gentree.py | 279 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 144 insertions(+), 135 deletions(-)
gentree.py +144 -135
index 9b4db98..59ae19d 100755
@@ -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'))
Signature · 1 line
2.1.1
#2 lore raw

Re: [PATCH v3 01/21] backports: move legacy and SmPL patch application into helper

Quoted 7 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

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.

Obviously this patch was applied a long time ago, but you lied - it has a functional change:

Quoted 7 lines

+        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')

vs.

Quoted 7 lines

-        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

This had a major impact on the devel/git-tracker.py tool.

johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in

#3 lore raw

PATCH 1/1 gentree: don't throw exceptions when applying patches fail

From: Luca Coelho <[email protected]>

In commit 4e84c2d807d5 ("backports: move legacy and SmPL patch application into helper"), the functionality was changed by raising exceptions instead of return an error when applying patches fail. This breaks git-tracker, because it expects errors to be returned in such cases, to exit gracefully and print the error messages.

Fixes 4e84c2d807d5 ("backports: move legacy and SmPL patch application into helper")
---
 gentree.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
gentree.py +10 -6
index 772095f..419b13b 100755
@@ -549,7 +549,7 @@ def apply_patches(args, desc, source_dir, patch_src, target_dir, logwrite=lambda
                 logwrite("Failed to apply changes from %s" % print_name)
                 for line in output:
                     logwrite('> %s' % line)
-            raise Exception('Patch failed')
+            return 2
 
         if args.refresh:
             pfilef = open(pfile + '.tmp', 'a')
@@ -569,7 +569,7 @@ def apply_patches(args, desc, source_dir, patch_src, target_dir, logwrite=lambda
                     logwrite("Failed to diff to refresh %s" % print_name)
                     pfilef.close()
                     os.unlink(pfile + '.tmp')
-                    raise Exception('Refresh failed')
+                    return 2
             pfilef.close()
             os.rename(pfile + '.tmp', pfile)
 
@@ -602,7 +602,7 @@ def apply_patches(args, desc, source_dir, patch_src, target_dir, logwrite=lambda
         sprocess.wait()
         if sprocess.returncode != 0:
             logwrite("Failed to process SmPL patch %s" % print_name)
-            raise Exception('SmPL patch failed')
+            return 2
         output = output.split('\n')
         if output[-1] == '':
             output = output[:-1]
@@ -903,7 +903,9 @@ def process(kerneldir, copy_list_file, git_revision=None,
         bpcfg.disable_symbols(disable_list)
     git_debug_snapshot(args, 'Add automatic backports')
 
-    apply_patches(args, "backport", source_dir, 'patches', bpid.target_dir, logwrite)
+    failure = apply_patches(args, "backport", source_dir, 'patches', bpid.target_dir, logwrite)
+    if failure:
+        return failure
 
     # Kernel integration requires Kconfig.versions already generated for you,
     # we cannot do this for a package as we have no idea what kernel folks
@@ -1074,8 +1076,10 @@ def process(kerneldir, copy_list_file, git_revision=None,
         f.close()
         git_debug_snapshot(args, "hooked backport to top level Kconfig")
 
-        apply_patches(args, "integration", source_dir, 'integration-patches/',
-                      bpid.project_dir, logwrite)
+        failure = apply_patches(args, "integration", source_dir, 'integration-patches/',
+                                bpid.project_dir, logwrite)
+        if failure:
+            return failure
 
     if (args.kup or args.kup_test):
         req = reqs.Req()
Signature · 4 lines
2.8.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in
#4 lore raw

Re: [PATCH v3 01/21] backports: move legacy and SmPL patch application into helper

In reply to Johannes Berg
Quoted 10 lines · Johannes Berg
Quoted 7 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

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.

Obviously this patch was applied a long time ago,

Geesh yes over 2 year ago.

Quoted 20 lines

but you lied - it has a functional change:

Quoted 7 lines

+        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')

vs.

Quoted 7 lines

-        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

Quoted 1 line

This had a major impact on the devel/git-tracker.py tool.

Sorry about that, is there an easy fix for it? Is there a test we can do to avoid further regressions against the tracker ?

Luis
--
To unsubscribe from this list: send the line "unsubscribe backports" in

#5 lore raw

Re: [PATCH v3 01/21] backports: move legacy and SmPL patch application into helper

Quoted 8 lines · Luis R. Rodriguez
Quoted 7 lines · Johannes Berg
Quoted 6 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

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.

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

This should have no functional change.

Obviously this patch was applied a long time ago,

Geesh yes over 2 year ago.

:)

Quoted 20 lines
Quoted 20 lines

but you lied - it has a functional change:

Quoted 7 lines

+        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')

vs.

Quoted 7 lines

-        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

Quoted 5 lines
Quoted 1 line

This had a major impact on the devel/git-tracker.py tool.

Sorry about that, is there an easy fix for it? Is there a test we can do to avoid further regressions against the tracker ?

Luca has a fix.

johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in

#6 lore raw

PATCH v3 2/21 backports: ifdef around module_init() module_exit() for modules

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

We only need this for modules.

---
 backport/backport-include/linux/module.h | 2 ++
 1 file changed, 2 insertions(+)
backport/backport-include/linux/module.h +2 -0
index 82c96bd..e8f28b1 100644
@@ -25,6 +25,7 @@ extern void backport_dependency_symbol(void);
 		       " using backports " BACKPORTS_VERSION);
 #endif
 
+#ifdef MODULE
 #undef module_init
 #define module_init(initfn)						\
 	static int __init __init_backport(void)				\
@@ -58,6 +59,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
Signature · 1 line
2.1.1
#7 lore raw

PATCH v3 3/21 backports: move packaging kconfig hacks to its own file

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

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

---
 backport/Kconfig               | 9 ++-------
 backport/Kconfig.package.hacks | 8 ++++++++
 gentree.py                     | 3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 backport/Kconfig.package.hacks
backport/Kconfig +2 -7
index b14a268..a8f2867 100644
@@ -14,13 +14,8 @@ config BACKPORTED_KERNEL_NAME
 source Kconfig.kernel
 source Kconfig.versions
 
-# some hacks ...
-config WIRELESS
-	def_bool y
-config NET_CORE
-	def_bool y
-config EXPERT
-	def_bool y
+# Packaging hacks
+source Kconfig.package.hacks
 
 # this has the configuration for the backport code
 source compat/Kconfig
backport/Kconfig.package.hacks new file +8 -0
new file mode 100644
index 0000000..6a429dd
@@ -0,0 +1,8 @@
+# some hacks for when we use backports to generate a package
+# to build modules out of tree.
+config WIRELESS
+	def_bool y
+config NET_CORE
+	def_bool y
+config EXPERT
+	def_bool y
gentree.py +2 -1
index 59ae19d..7a6deef 100755
@@ -731,7 +731,8 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
 
     # do the copy
     backport_files = [(x, x) for x in [
-        'Kconfig', 'Makefile', 'Makefile.build', 'Makefile.kernel', '.gitignore',
+        'Kconfig', 'Kconfig.package.hacks',
+        'Makefile', 'Makefile.build', 'Makefile.kernel', '.gitignore',
         'Makefile.real', 'compat/', 'backport-include/', 'kconf/',
         'scripts/', '.blacklist.map',
     ]]
Signature · 1 line
2.1.1
#8 lore raw

PATCH v3 4/21 backports: grant parsers access to kconfig config and menuconfig

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

Allow parsers to query the type of option used, either config or menuconfig. This will be used later.

---
 lib/kconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kconfig.py +1 -1
index 179121a..3562630 100644
@@ -7,7 +7,7 @@ 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>.*)')
 
Signature · 1 line
2.1.1
#9 lore raw

PATCH v3 5/21 backports: keep track of original backported source symbols early on

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

We'll later want to do some modifications of symbols we backport when integrating, but before we do any modification on kconfig files we should keep track of the original source symbols.

This commit introduces no functional changes right now, it will become more useful after we start adjusting kconfig entries for integration.

---
 gentree.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
gentree.py +2 -1
index 7a6deef..cb39a3f 100755
@@ -768,6 +768,7 @@ 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")
@@ -829,7 +830,7 @@ 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)]:
+    for some_symbols in [orig_symbols[i:i + 50] for i in range(0, len(orig_symbols), 50)]:
         r = 'CONFIG_((' + '|'.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):
Signature · 1 line
2.1.1
#10 lore raw

PATCH v3 6/21 backports: allow for different backport prefix and simple integration support

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

The way we backport when packaging is to minimize the amount of changes required by taking advantage of the fact that Kconfig can treat CONFIG_ as 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, so to do that identify the backport and provide that to helpers.

This also provides initial basic support for integration where no additional code was required other than prefixes or ensuring certain things are not done for integration. Before we expose integration support we'll need to add quite a bit more things so this just assumes integration is never desired.

---
 devel/doc/kconfig-operation |  4 +--
 gentree.py                  | 83 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 67 insertions(+), 20 deletions(-)
devel/doc/kconfig-operation +1 -3
index 0245889..f1ecf60 100644
@@ -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
 -------------------------------
 
gentree.py +66 -17

164 lines not on this page · raw message

Signature · 1 line
2.1.1
#11 lore raw

PATCH v3 7/21 backports: add prefix for integration on dependencies

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

When integrating we need the BACKPORT prefix added to dependency symbols.

---
 gentree.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
gentree.py +4 -1
index 40b0a55..dd7af84 100755
@@ -921,7 +921,10 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
                     new.append('BACKPORT_DISABLED_KCONFIG_OPTION')
             else:
                     new.append('!BACKPORT_KERNEL_%s' % dep.replace('.', '_'))
-        deplist[sym] = new
+        if bpid.integrate:
+            deplist[sym] = ["BACKPORT_" + x for x in new]
+        else:
+            deplist[sym] = new
     configtree.add_dependencies(deplist)
     git_debug_snapshot(args, "add kernel version dependencies")
 
Signature · 1 line
2.1.1
#12 lore raw

PATCH v3 8/21 backports: replace BACKPORT_PWD with BACKPORT_DIR

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This will also be used for built-in kernel integration, by using this we can share more code with the built-in kernel approach.

---
 backport/Makefile             | 6 +++---
 backport/Makefile.build       | 4 ++--
 backport/Makefile.real        | 2 +-
 backport/scripts/uninstall.sh | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
backport/Makefile +3 -3
index ea3982b..fcf2f01 100644
@@ -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
backport/Makefile.build +2 -2
index d209041..a848b37 100644
@@ -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
backport/Makefile.real +1 -1
index f60d5ca..a0f4916 100644
@@ -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)
backport/scripts/uninstall.sh +2 -2
index 1eb42b0..b46d3fe 100755
@@ -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
Signature · 1 line
2.1.1
#13 lore raw

PATCH v3 9/21 backports: fold outdir as a backport identity target

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

The output directory is always the same as the project directory for packaging backports but for integration these will differ, to make introduction of integration easier to follow use the outdir as both project directory and target directory and fold the existing args.outdir under the backport identity object as both "project_dir" and "target_dir".

This commit has no functional changes.

---
 gentree.py | 140 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 78 insertions(+), 62 deletions(-)
gentree.py +78 -62
index dd7af84..04e8f5e 100755
@@ -30,7 +30,9 @@ class Bp_Identity(object):
     are added, how we actually use the others for regular printing will
     need to be considered.
     """
-    def __init__(self, integrate=False, kconfig_prefix='CPTCFG_', project_prefix=''):
+    def __init__(self, integrate=False, kconfig_prefix='CPTCFG_',
+                 project_prefix='', project_dir='',
+                 target_dir='', target_dir_name=''):
         self.integrate = integrate
         self.kconfig_prefix = kconfig_prefix
         self.kconfig_prefix_resafe = re.escape(kconfig_prefix)
@@ -38,6 +40,9 @@ class Bp_Identity(object):
         self.project_prefix_resafe = re.escape(project_prefix)
         self.full_prefix = kconfig_prefix + project_prefix
         self.full_prefix_resafe = re.escape(self.full_prefix)
+        self.project_dir = project_dir
+        self.target_dir = target_dir
+        self.target_dir_name = target_dir_name
 
 def read_copy_list(copyfile):
     """
@@ -217,11 +222,11 @@ def automatic_backport_mangle_c_file(name):
     return name.replace('/', '-')
 
 
-def add_automatic_backports(args, bpid):
+def add_automatic_backports(args):
     disable_list = []
     export = re.compile(r'^EXPORT_SYMBOL(_GPL)?\((?P<sym>[^\)]*)\)')
-    bpi = kconfig.get_backport_info(os.path.join(args.outdir, 'compat', 'Kconfig'))
-    configtree = kconfig.ConfigTree(os.path.join(args.outdir, 'Kconfig'))
+    bpi = kconfig.get_backport_info(os.path.join(args.bpid.target_dir, 'compat', 'Kconfig'))
+    configtree = kconfig.ConfigTree(os.path.join(args.bpid.target_dir, 'Kconfig'))
     all_selects = configtree.all_selects()
     for sym, vals in bpi.items():
         if sym.startswith('BACKPORT_BUILD_'):
@@ -238,41 +243,41 @@ def add_automatic_backports(args, bpid):
             files.append((os.path.join('include', f),
                           os.path.join('include', os.path.dirname(f), 'backport-' + os.path.basename(f))))
         if args.git_revision:
-            copy_git_files(args.kerneldir, files, args.git_revision, args.outdir)
+            copy_git_files(args.kerneldir, files, args.git_revision, args.bpid.target_dir)
         else:
-            copy_files(args.kerneldir, files, args.outdir)
+            copy_files(args.kerneldir, files, args.bpid.target_dir)
 
         # now add the Makefile line
-        mf = open(os.path.join(args.outdir, 'compat', 'Makefile'), 'a+')
+        mf = open(os.path.join(args.bpid.target_dir, 'compat', 'Makefile'), 'a+')
         o_files = [automatic_backport_mangle_c_file(f)[:-1] + 'o' for f in c_files]
         if symtype == 'tristate':
             if not module_name:
                 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' % (bpid.full_prefix, sym, module_name))
+            mf.write('obj-$(%s%s) += %s.o\n' % (args.bpid.full_prefix, sym, module_name))
         elif symtype == 'bool':
-            mf.write('compat-$(%s%s) += %s\n' % (bpid.full_prefix, sym, ' '.join(o_files)))
+            mf.write('compat-$(%s%s) += %s\n' % (args.bpid.full_prefix, sym, ' '.join(o_files)))
 
         # finally create the include file
         syms = []
         for f in c_files:
-            for l in open(os.path.join(args.outdir, 'compat',
+            for l in open(os.path.join(args.bpid.target_dir, 'compat',
                                        automatic_backport_mangle_c_file(f)), 'r'):
                 m = export.match(l)
                 if m:
                     syms.append(m.group('sym'))
         for f in h_files:
-            outf = open(os.path.join(args.outdir, 'include', f), 'w')
+            outf = open(os.path.join(args.bpid.target_dir, 'include', f), 'w')
             outf.write('/* Automatically created during backport process */\n')
-            outf.write('#ifndef %s%s\n' % (bpid.full_prefix, sym))
+            outf.write('#ifndef %s%s\n' % (args.bpid.full_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 /* %s%s */\n' % (bpid.full_prefix, sym))
+            outf.write('#endif /* %s%s */\n' % (args.bpid.full_prefix, sym))
     return disable_list
 
 def git_debug_init(args):
@@ -283,8 +288,8 @@ def git_debug_init(args):
     """
     if not args.gitdebug:
         return
-    git.init(tree=args.outdir)
-    git.commit_all("Copied backport", tree=args.outdir)
+    git.init(tree=args.bpid.project_dir)
+    git.commit_all("Copied backport", tree=args.bpid.project_dir)
 
 
 def git_debug_snapshot(args, name):
@@ -293,7 +298,7 @@ def git_debug_snapshot(args, name):
     """
     if not args.gitdebug:
         return
-    git.commit_all(name, tree=args.outdir)
+    git.commit_all(name, tree=args.bpid.project_dir)
 
 def get_rel_spec_stable(rel):
     """
@@ -426,12 +431,12 @@ def upload_release(args, rel_prep, logwrite=lambda x:None):
     if (rel_prep['stable']):
         korg_path += "/stable"
 
-    parent = os.path.dirname(args.outdir)
-    release = os.path.basename(args.outdir)
+    parent = os.path.dirname(args.bpid.project_dir)
+    release = os.path.basename(args.bpid.project_dir)
     tar_name = parent + '/' + release + ".tar"
     gzip_name = tar_name + ".gz"
 
-    create_tar_and_gz(tar_name, args.outdir)
+    create_tar_and_gz(tar_name, args.bpid.project_dir)
 
     logwrite(gpg.sign(tar_name, extra_args=['--armor', '--detach-sign']))
 
@@ -656,13 +661,42 @@ def _main():
                              'of changes done by Coccinelle.')
     args = parser.parse_args()
 
+    # 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 some users of the CPTCFG prefix.
+    bpid = None
+    integrate = False
+    if integrate:
+        bpid = Bp_Identity(integrate = integrate,
+                           kconfig_prefix = 'CONFIG_',
+                           project_prefix = 'BACKPORT_',
+                           project_dir = args.outdir,
+                           target_dir = os.path.join(args.outdir, 'backports/'),
+                           target_dir_name = 'backports/',
+                           )
+    else:
+        bpid = Bp_Identity(integrate = integrate,
+                           kconfig_prefix = 'CPTCFG_',
+                           project_prefix = '',
+                           project_dir = args.outdir,
+                           target_dir = args.outdir,
+                           target_dir_name = '',
+                           )
+
     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,
+    return process(args.kerneldir, args.copy_list,
+                   git_revision=args.git_revision,
+                   bpid=bpid,
+                   clean=args.clean,
                    refresh=args.refresh, base_name=args.base_name,
                    gitdebug=args.gitdebug, verbose=args.verbose,
                    extra_driver=args.extra_driver,
@@ -672,7 +706,8 @@ def _main():
                    profile_cocci=args.profile_cocci,
                    logwrite=logwrite)
 
-def process(kerneldir, outdir, copy_list_file, git_revision=None,
+def process(kerneldir, copy_list_file, git_revision=None,
+            bpid=None,
             clean=False, refresh=False, base_name="Linux", gitdebug=False,
             verbose=False, extra_driver=[], kup=False,
             kup_test=False,
@@ -681,16 +716,16 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
             logwrite=lambda x:None,
             git_tracked_version=False):
     class Args(object):
-        def __init__(self, kerneldir, outdir, copy_list_file,
-                     git_revision, clean, refresh, base_name,
+        def __init__(self, kerneldir, copy_list_file,
+                     git_revision, bpid, clean, refresh, base_name,
                      gitdebug, verbose, extra_driver, kup,
                      kup_test,
                      test_cocci,
                      profile_cocci):
             self.kerneldir = kerneldir
-            self.outdir = outdir
             self.copy_list = copy_list_file
             self.git_revision = git_revision
+            self.bpid = bpid
             self.clean = clean
             self.refresh = refresh
             self.base_name = base_name
@@ -712,30 +747,11 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
         else:
             logwrite('Validated tree: %s' % tree)
 
-    args = Args(kerneldir, outdir, copy_list_file,
-                git_revision, clean, refresh, base_name,
+    args = Args(kerneldir, copy_list_file,
+                git_revision, bpid, clean, refresh, base_name,
                 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 some users of the CPTCFG prefix.
-    bpid = None
-    if integrate:
-        bpid = Bp_Identity(integrate = integrate,
-                           kconfig_prefix = 'CONFIG_',
-                           project_prefix = 'BACKPORT_')
-    else:
-        bpid = Bp_Identity(integrate = integrate,
-                           kconfig_prefix = 'CPTCFG_',
-                           project_prefix = '')
 
     # start processing ...
     if (args.kup or args.kup_test):
@@ -743,7 +759,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
         git_paranoia(kerneldir, logwrite)
 
         rel_describe = git.describe(rev=None, tree=source_dir, extra_args=['--dirty'])
-        release = os.path.basename(args.outdir)
+        release = os.path.basename(bpid.target_dir)
         version = release.replace("backports-", "")
 
         rel_prep = get_rel_prep(version)
@@ -768,7 +784,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
     deplist = read_dependencies(os.path.join(source_dir, 'dependencies'))
 
     # validate output directory
-    check_output_dir(args.outdir, args.clean)
+    check_output_dir(bpid.target_dir, args.clean)
 
     # do the copy
     backport_files = [(x, x) for x in [
@@ -782,33 +798,33 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
     else:
         logwrite('Get original source files from git ...')
     
-    copy_files(os.path.join(source_dir, 'backport'), backport_files, args.outdir)
+    copy_files(os.path.join(source_dir, 'backport'), backport_files, bpid.target_dir)
 
     git_debug_init(args)
 
     if not args.git_revision:
-        copy_files(args.kerneldir, copy_list, args.outdir)
+        copy_files(args.kerneldir, copy_list, bpid.target_dir)
     else:
-        copy_git_files(args.kerneldir, copy_list, args.git_revision, args.outdir)
+        copy_git_files(args.kerneldir, copy_list, args.git_revision, bpid.target_dir)
 
     # FIXME: should we add a git version of this (e.g. --git-extra-driver)?
     for src, copy_list in args.extra_driver:
         if (args.kup or args.kup_test):
             git_paranoia(src)
-        copy_files(src, read_copy_list(open(copy_list, 'r')), args.outdir)
+        copy_files(src, read_copy_list(open(copy_list, 'r')), bpid.target_dir)
 
     git_debug_snapshot(args, 'Add driver sources')
 
-    disable_list = add_automatic_backports(args, bpid)
+    disable_list = add_automatic_backports(args)
     if disable_list:
-        bpcfg = kconfig.ConfigTree(os.path.join(args.outdir, 'compat', 'Kconfig'))
+        bpcfg = kconfig.ConfigTree(os.path.join(bpid.target_dir, 'compat', 'Kconfig'))
         bpcfg.disable_symbols(disable_list)
     git_debug_snapshot(args, 'Add automatic backports')
 
-    apply_patches(args, "backport", source_dir, 'patches', args.outdir, logwrite)
+    apply_patches(args, "backport", source_dir, 'patches', bpid.target_dir, logwrite)
 
     # some post-processing is required
-    configtree = kconfig.ConfigTree(os.path.join(args.outdir, 'Kconfig'))
+    configtree = kconfig.ConfigTree(os.path.join(bpid.target_dir, 'Kconfig'))
     orig_symbols = configtree.symbols()
 
     logwrite('Modify Kconfig tree ...')
@@ -831,7 +847,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
         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 = open(os.path.join(bpid.target_dir, '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)
@@ -844,7 +860,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
 
     # write local symbol list -- needed during packaging build
     if not bpid.integrate:
-        f = open(os.path.join(args.outdir, '.local-symbols'), 'w')
+        f = open(os.path.join(bpid.project_dir, '.local-symbols'), 'w')
         for sym in symbols:
             f.write('%s=\n' % sym)
         f.close()
@@ -852,7 +868,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
 
     # add defconfigs that we want
     defconfigs_dir = os.path.join(source_dir, 'backport', 'defconfigs')
-    os.mkdir(os.path.join(args.outdir, 'defconfigs'))
+    os.mkdir(os.path.join(bpid.target_dir, 'defconfigs'))
     for dfbase in os.listdir(defconfigs_dir):
         copy_defconfig = True
         dfsrc = os.path.join(defconfigs_dir, dfbase)
@@ -868,7 +884,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
                 copy_defconfig = False
                 break
         if copy_defconfig:
-            shutil.copy(dfsrc, os.path.join(args.outdir, 'defconfigs', dfbase))
+            shutil.copy(dfsrc, os.path.join(bpid.target_dir, 'defconfigs', dfbase))
 
     git_debug_snapshot(args, "add (useful) defconfig files")
 
@@ -880,7 +896,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
     for some_symbols in [orig_symbols[i:i + 50] for i in range(0, len(orig_symbols), 50)]:
         r = 'CONFIG_((' + '|'.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):
+    for root, dirs, files in os.walk(bpid.target_dir):
         # don't go into .git dir (possible debug thing)
         if '.git' in dirs:
             dirs.remove('.git')
@@ -899,7 +915,7 @@ 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'))
+    maketree = make.MakeTree(os.path.join(bpid.target_dir, 'Makefile.kernel'))
     disable_kconfig = []
     disable_makefile = []
     for sym in maketree.get_impossible_symbols():
Signature · 1 line
2.1.1
#14 lore raw

PATCH v3 10/21 backports: avoid git tree reinitialization

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

When using backports against for packaging with --gitdebug you either have to use --clean or assume the directory is empty already. In either case you start fresh. With integration this will be a bit different, you could end up with a project directory where the git tree was present but only the target directory was empty.

Calling git init on an already existing git directory will reinitialize your git tree, that can reset some config stuff, let's avoid that.

---
 gentree.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
gentree.py +4 -1
index 04e8f5e..68efce9 100755
@@ -288,7 +288,10 @@ def git_debug_init(args):
     """
     if not args.gitdebug:
         return
-    git.init(tree=args.bpid.project_dir)
+    # Git supports re-initialization, although not well documented it can
+    # reset config stuff, lets avoid that if the tree already exists.
+    if not os.path.exists(os.path.join(args.bpid.project_dir, '.git')):
+        git.init(tree=args.bpid.project_dir)
     git.commit_all("Copied backport", tree=args.bpid.project_dir)
 
 
Signature · 1 line
2.1.1
#15 lore raw

Re: [PATCH v3 10/21] backports: avoid git tree reinitialization

Quoted 10 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

When using backports against for packaging with --gitdebug you either have to use --clean or assume the directory is empty already. In either case you start fresh. With integration this will be a bit different, you could end up with a project directory where the git tree was present but only the target directory was empty.

Calling git init on an already existing git directory will reinitialize your git tree, that can reset some config stuff, let's avoid that.

I guess I don't care much, but it seems strange to me that you'd use --gitdebug in this case, you'd end up committing crappy patches to the top-level kernel tree?

johannes

#16 lore raw

Re: [PATCH v3 10/21] backports: avoid git tree reinitialization

Quoted 9 lines · Johannes Berg
Quoted 8 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

When using backports against for packaging with --gitdebug you either have to use --clean or assume the directory is empty already. In either case you start fresh. With integration this will be a bit different, you could end up with a project directory where the git tree was present but only the target directory was empty.

Quoted 6 lines
Quoted 2 lines

Calling git init on an already existing git directory will reinitialize your git tree, that can reset some config stuff, let's avoid that.

I guess I don't care much, but it seems strange to me that you'd use --gitdebug in this case, you'd end up committing crappy patches to the top-level kernel tree?

It was very useful to me when debugging, hence --gitdebug. Also, each step is actually what some folks may want to see done / committed as that may have been work done manually before for each kernel release bump, now its just automated.

Luis

#17 lore raw

PATCH v3 11/21 backports: modify kconfig parser to use bpid and target_dir

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

The kconfig parser sets a base directory using the directory in which the Kconfig file passed lives in. This strategy assumes the kernel uses relative paths, while this is truly supported in practice though upstream only deals with full paths based on the actual root directory of the kernel. Its safer, cleaner and much simpler to support full paths, and since the kernel uses full paths anyway lets stick to that and complain when relative paths are found. This also modifies our own provided Kconfig to use full paths as well, we'll need this later to adjust our Kconfigs for kernel integration.

$ time /home/mcgrof/backports/devel/ckmake --allyesconfig
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    44m3.002s
user    1188m20.708s
sys     140m25.540s
---
 backport/Kconfig | 36 ++++++++++++++++++------------------
 gentree.py       |  6 +++---
 lib/kconfig.py   | 51 +++++++++++++++++++++++++++++++++------------------
 3 files changed, 54 insertions(+), 39 deletions(-)
backport/Kconfig +18 -18
index a8f2867..415db89 100644
@@ -11,32 +11,32 @@ config BACKPORTED_KERNEL_NAME
 	option env="BACKPORTED_KERNEL_NAME"
 
 # these will be generated
-source Kconfig.kernel
-source Kconfig.versions
+source "Kconfig.kernel"
+source "Kconfig.versions"
 
 # Packaging hacks
-source Kconfig.package.hacks
+source "Kconfig.package.hacks"
 
 # this has the configuration for the backport code
-source compat/Kconfig
+source "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 "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 drivers/ssb/Kconfig
-source drivers/bcma/Kconfig
+source "drivers/ssb/Kconfig"
+source "drivers/bcma/Kconfig"
 
-source net/nfc/Kconfig
+source "net/nfc/Kconfig"
 
-source drivers/media/Kconfig
+source "drivers/media/Kconfig"
 
-source net/ieee802154/Kconfig
-source net/mac802154/Kconfig
-source drivers/net/ieee802154/Kconfig
+source "net/ieee802154/Kconfig"
+source "net/mac802154/Kconfig"
+source "drivers/net/ieee802154/Kconfig"
 
-source drivers/usb/class/Kconfig
+source "drivers/usb/class/Kconfig"
gentree.py +3 -3
index 68efce9..2c08bba 100755
@@ -226,7 +226,7 @@ def add_automatic_backports(args):
     disable_list = []
     export = re.compile(r'^EXPORT_SYMBOL(_GPL)?\((?P<sym>[^\)]*)\)')
     bpi = kconfig.get_backport_info(os.path.join(args.bpid.target_dir, 'compat', 'Kconfig'))
-    configtree = kconfig.ConfigTree(os.path.join(args.bpid.target_dir, 'Kconfig'))
+    configtree = kconfig.ConfigTree(os.path.join(args.bpid.target_dir, 'Kconfig'), args.bpid)
     all_selects = configtree.all_selects()
     for sym, vals in bpi.items():
         if sym.startswith('BACKPORT_BUILD_'):
@@ -820,14 +820,14 @@ def process(kerneldir, copy_list_file, git_revision=None,
 
     disable_list = add_automatic_backports(args)
     if disable_list:
-        bpcfg = kconfig.ConfigTree(os.path.join(bpid.target_dir, 'compat', 'Kconfig'))
+        bpcfg = kconfig.ConfigTree(os.path.join(bpid.target_dir, 'compat', 'Kconfig'), bpid)
         bpcfg.disable_symbols(disable_list)
     git_debug_snapshot(args, 'Add automatic backports')
 
     apply_patches(args, "backport", source_dir, 'patches', bpid.target_dir, logwrite)
 
     # some post-processing is required
-    configtree = kconfig.ConfigTree(os.path.join(bpid.target_dir, 'Kconfig'))
+    configtree = kconfig.ConfigTree(os.path.join(bpid.target_dir, 'Kconfig'), bpid)
     orig_symbols = configtree.symbols()
 
     logwrite('Modify Kconfig tree ...')
lib/kconfig.py +33 -18

137 lines not on this page · raw message

Signature · 1 line
2.1.1
#18 lore raw

PATCH v3 12/21 backports: make kconfig src_line backport / ConfigTree specific

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

The kconfig source line used on a backport project is very project specific. For backport packaging the source line simply should follow the full path of the project but for integration this will vary depending on the backport prefix directory used. We'll add support for that next.

$ time /home/mcgrof/backports/devel/ckmake --allyesconfig
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    43m56.439s
user    1187m4.516s
sys     138m53.328s
---
 lib/kconfig.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/kconfig.py +3 -3
index f348d4a..ac96613 100644
@@ -4,7 +4,6 @@
 
 import os, re
 
-src_line = re.compile(r'^\s*source\s+"(?P<src>[^\s"]*)"?\s*$')
 src_line_rel = 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')
@@ -16,6 +15,7 @@ class ConfigTree(object):
     def __init__(self, rootfile, bpid):
         self.bpid = bpid
         self.rootfile = os.path.basename(rootfile)
+        self.src_line = re.compile(r'^\s*source\s+"(?P<src>[^\s"]*)"?\s*$')
 
     def _check_relative_source(self, f, l):
     #
@@ -31,7 +31,7 @@ class ConfigTree(object):
     def _walk(self, f):
         yield f
         for l in open(os.path.join(self.bpid.target_dir, f), 'r'):
-            m = src_line.match(l)
+            m = self.src_line.match(l)
             if m and os.path.exists(os.path.join(self.bpid.target_dir, m.group('src'))):
                 for i in self._walk(m.group('src')):
                     yield i
@@ -42,7 +42,7 @@ class ConfigTree(object):
         for nf in self._walk(f):
             out = ''
             for l in open(os.path.join(self.bpid.target_dir, nf), 'r'):
-                m = src_line.match(l)
+                m = self.src_line.match(l)
                 if not m:
                     self._check_relative_source(nf, l)
                     out += l
Signature · 1 line
2.1.1
#19 lore raw

PATCH v3 13/21 backports: use BACKPORT_DIR prefix on kconfig sources

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This will allow us to do less work for built-in integration support. When packaging we only use BACKPORT_DIR for Kconfig sources we control, to avoid a large change we avoid doing this for other Kconfig files.

For integration we'll always have to use BACKPORT_DIR on kconfig sources.

Suporting 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.

$ time /home/mcgrof/backports/devel/ckmake --allyesconfig
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    42m41.825s
user    1187m38.880s
sys     141m11.760s
---
 backport/Kconfig | 40 +++++++++++++++---------------
 gentree.py       | 18 ++++++++++++--
 lib/kconfig.py   | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 107 insertions(+), 25 deletions(-)
backport/Kconfig +21 -19
index 415db89..b729d47 100644
@@ -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"
@@ -10,33 +13,32 @@ config BACKPORTED_KERNEL_NAME
 	string
 	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"
 
 # Packaging hacks
-source "Kconfig.package.hacks"
+source "$BACKPORT_DIR/Kconfig.package.hacks"
 
 # 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"
gentree.py +16 -2
index 2c08bba..7632b90 100755
@@ -32,7 +32,8 @@ class Bp_Identity(object):
     """
     def __init__(self, integrate=False, kconfig_prefix='CPTCFG_',
                  project_prefix='', project_dir='',
-                 target_dir='', target_dir_name=''):
+                 target_dir='', target_dir_name='',
+                 kconfig_source_var=None):
         self.integrate = integrate
         self.kconfig_prefix = kconfig_prefix
         self.kconfig_prefix_resafe = re.escape(kconfig_prefix)
@@ -43,6 +44,11 @@ class Bp_Identity(object):
         self.project_dir = project_dir
         self.target_dir = target_dir
         self.target_dir_name = target_dir_name
+        self.kconfig_source_var = kconfig_source_var
+        if self.kconfig_source_var:
+            self.kconfig_source_var_resafe = re.escape(self.kconfig_source_var)
+        else:
+            self.kconfig_source_var_resafe = None
 
 def read_copy_list(copyfile):
     """
@@ -681,6 +687,7 @@ def _main():
                            project_dir = args.outdir,
                            target_dir = os.path.join(args.outdir, 'backports/'),
                            target_dir_name = 'backports/',
+                           kconfig_source_var = '$BACKPORT_DIR',
                            )
     else:
         bpid = Bp_Identity(integrate = integrate,
@@ -689,6 +696,7 @@ def _main():
                            project_dir = args.outdir,
                            target_dir = args.outdir,
                            target_dir_name = '',
+                           kconfig_source_var = '$BACKPORT_DIR',
                            )
 
     def logwrite(msg):
@@ -820,6 +828,7 @@ def process(kerneldir, copy_list_file, git_revision=None,
 
     disable_list = add_automatic_backports(args)
     if disable_list:
+        # No need to verify_sources() as compat's Kconfig has no 'source' call
         bpcfg = kconfig.ConfigTree(os.path.join(bpid.target_dir, 'compat', 'Kconfig'), bpid)
         bpcfg.disable_symbols(disable_list)
     git_debug_snapshot(args, 'Add automatic backports')
@@ -828,10 +837,15 @@ def process(kerneldir, copy_list_file, git_revision=None,
 
     # some post-processing is required
     configtree = kconfig.ConfigTree(os.path.join(bpid.target_dir, 'Kconfig'), bpid)
+    ignore=['Kconfig.kernel', 'Kconfig.versions']
+
+    configtree.verify_sources(ignore=ignore)
+    git_debug_snapshot(args, "verify sources on top level backports Kconfig")
+
     orig_symbols = configtree.symbols()
 
     logwrite('Modify Kconfig tree ...')
-    configtree.prune_sources(ignore=['Kconfig.kernel', 'Kconfig.versions'])
+    configtree.prune_sources(ignore=ignore)
     git_debug_snapshot(args, "prune Kconfig tree")
 
     if not bpid.integrate:
lib/kconfig.py +70 -4

104 lines not on this page · raw message

Signature · 1 line
2.1.1
#20 lore raw

PATCH v3 14/21 backports: update dependencies map file

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

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.

---
 dependencies | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)
dependencies +23 -8
index 4964aa6..64903dc 100644
@@ -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
Signature · 1 line
2.1.1
#21 lore raw

PATCH v3 15/21 backports: split Kconfig into Kconfig.package and Kconfig.sources

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

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.

---
 backport/Kconfig         | 44 --------------------------------------------
 backport/Kconfig.package | 24 ++++++++++++++++++++++++
 backport/Kconfig.sources | 23 +++++++++++++++++++++++
 gentree.py               | 27 ++++++++++++++++++++++-----
 4 files changed, 69 insertions(+), 49 deletions(-)
 delete mode 100644 backport/Kconfig
 create mode 100644 backport/Kconfig.package
 create mode 100644 backport/Kconfig.sources
backport/Kconfig deleted +0 -44
deleted file mode 100644
index b729d47..0000000
@@ -1,44 +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"
-
-source "$BACKPORT_DIR/Kconfig.kernel"
-source "$BACKPORT_DIR/Kconfig.versions"
-
-# Packaging hacks
-source "$BACKPORT_DIR/Kconfig.package.hacks"
-
-# 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"
backport/Kconfig.package new file +24 -0
new file mode 100644
index 0000000..9684574
@@ -0,0 +1,24 @@
+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"
+
+# Packaging hacks
+source "$BACKPORT_DIR/Kconfig.package.hacks"
+
+# Code we backport
+source "$BACKPORT_DIR/Kconfig.sources"
+
+# these will be generated
+source "$BACKPORT_DIR/Kconfig.kernel"
+source "$BACKPORT_DIR/Kconfig.versions"
backport/Kconfig.sources new file +23 -0
new file mode 100644
index 0000000..cdf993c
@@ -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"
gentree.py +22 -5
index 7632b90..71e52e4 100755
@@ -798,12 +798,28 @@ def process(kerneldir, copy_list_file, git_revision=None,
     check_output_dir(bpid.target_dir, args.clean)
 
     # do the copy
+    backport_package_files = [(x, x) for x in [
+        'Makefile',
+        'kconf/',
+        'Makefile.real',
+        'Makefile.kernel',
+        'Kconfig.package.hacks',
+        'scripts/',
+        '.blacklist.map',
+        '.gitignore',
+        'Makefile.build'] ]
+    backport_package_files += [
+            ('Kconfig.package', 'Kconfig'),
+            ]
     backport_files = [(x, x) for x in [
-        'Kconfig', 'Kconfig.package.hacks',
-        'Makefile', 'Makefile.build', 'Makefile.kernel', '.gitignore',
-        'Makefile.real', 'compat/', 'backport-include/', 'kconf/',
-        'scripts/', '.blacklist.map',
+        'Kconfig.sources',
+        'compat/',
+        'backport-include/',
     ]]
+
+    if not bpid.integrate:
+        backport_files += backport_package_files
+
     if not args.git_revision:
         logwrite('Copy original source files ...')
     else:
@@ -827,6 +843,7 @@ def process(kerneldir, copy_list_file, git_revision=None,
     git_debug_snapshot(args, 'Add driver sources')
 
     disable_list = add_automatic_backports(args)
+
     if disable_list:
         # No need to verify_sources() as compat's Kconfig has no 'source' call
         bpcfg = kconfig.ConfigTree(os.path.join(bpid.target_dir, 'compat', 'Kconfig'), bpid)
@@ -877,7 +894,7 @@ def process(kerneldir, copy_list_file, git_revision=None,
 
     # write local symbol list -- needed during packaging build
     if not bpid.integrate:
-        f = open(os.path.join(bpid.project_dir, '.local-symbols'), 'w')
+        f = open(os.path.join(bpid.target_dir, '.local-symbols'), 'w')
         for sym in symbols:
             f.write('%s=\n' % sym)
         f.close()
Signature · 1 line
2.1.1
#22 lore raw

PATCH v3 16/21 backports: move version file generation to run earlier

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

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.

---
 gentree.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)
gentree.py +18 -18
index 71e52e4..afa4967 100755
@@ -843,6 +843,24 @@ def process(kerneldir, copy_list_file, git_revision=None,
     git_debug_snapshot(args, 'Add driver sources')
 
     disable_list = add_automatic_backports(args)
+    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 bpid.integrate:
+        f = open(os.path.join(bpid.target_dir, '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, "add versions files")
 
     if disable_list:
         # No need to verify_sources() as compat's Kconfig has no 'source' call
@@ -872,24 +890,6 @@ def process(kerneldir, 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(bpid.target_dir, '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, "add versions files")
-
     symbols = configtree.symbols()
 
     # write local symbol list -- needed during packaging build
Signature · 1 line
2.1.1
#23 lore raw

PATCH v3 17/21 backports: define C code backport version info using CPTCFG_

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

In order to help unify the naming scheme for shared backports versioning information rely on the CPTCFG_ prefix, when integration support gets added that will translate to the respective CONFIG_BACKPORT_ prefix. Kconfig opt env entries don't get propagated out, so we need to define these ourselves. This leaves all other names in place for packaging and just focuses on sharing on the C / header code.

---
 backport/Makefile.kernel                 |  6 +++---
 backport/backport-include/linux/module.h |  6 +++---
 backport/compat/main.c                   | 32 ++++++++++++++++----------------
 3 files changed, 22 insertions(+), 22 deletions(-)
backport/Makefile.kernel +3 -3
index dcb2ba7..a63184b 100644
@@ -10,9 +10,9 @@ 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)\" \
+	-DCPTCFG_VERSION=\"$(BACKPORTS_VERSION)\" \
+	-DCPTCFG_KERNEL_VERSION=\"$(BACKPORTED_KERNEL_VERSION)\" \
+	-DCPTCFG_KERNEL_NAME=\"$(BACKPORTED_KERNEL_NAME)\" \
 	$(BACKPORTS_GIT_TRACKER_DEF) \
 	$(CFLAGS)
 
backport/backport-include/linux/module.h +3 -3
index e8f28b1..8870abb 100644
@@ -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_KERNEL_NAME	\
+		       " (" CPTCFG_KERNEL_VERSION ")"		\
+		       " using backports " CPTCFG_VERSION);
 #endif
 
 #ifdef MODULE
backport/compat/main.c +16 -16
index d3f8944..04ebbfd 100644
@@ -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_KERNEL_NAME
+#error "You need a CPTCFG_KERNEL_NAME"
 #endif
 
-#ifndef BACKPORTED_KERNEL_VERSION
-#error "You need a BACKPORTED_KERNEL_VERSION"
+#ifndef CPTCFG_KERNEL_VERSION
+#error "You need a CPTCFG_KERNEL_VERSION"
 #endif
 
-#ifndef BACKPORTS_VERSION
-#error "You need a BACKPORTS_VERSION"
+#ifndef CPTCFG_VERSION
+#error "You need a CPTCFG_VERSION"
 #endif
 
-static char *backported_kernel_name = BACKPORTED_KERNEL_NAME;
+static char *backported_kernel_name = CPTCFG_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_KERNEL_NAME ")");
 
-#ifdef BACKPORTS_GIT_TRACKED 
+#ifdef BACKPORTS_GIT_TRACKED
 static char *backports_tracker_id = 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 ")");
 #else
-static char *backported_kernel_version = BACKPORTED_KERNEL_VERSION;
-static char *backports_version = BACKPORTS_VERSION;
+static char *backported_kernel_version = CPTCFG_KERNEL_VERSION;
+static char *backports_version = CPTCFG_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_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_VERSION ")");
 
 #endif
 
@@ -63,15 +63,15 @@ static int __init backport_init(void)
 		return ret;
 	}
 
-	printk(KERN_INFO "Loading modules backported from " BACKPORTED_KERNEL_NAME
+	printk(KERN_INFO "Loading modules backported from " CPTCFG_KERNEL_NAME
 #ifndef BACKPORTS_GIT_TRACKED
-		" version " BACKPORTED_KERNEL_VERSION
+		" version " CPTCFG_KERNEL_VERSION
 #endif
 		"\n");
 #ifdef BACKPORTS_GIT_TRACKED
 	printk(KERN_INFO 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_VERSION "\n");
 #endif
 
         return 0;
Signature · 1 line
2.1.1
#24 lore raw

PATCH v3 18/21 backports: add backport version parsing for kernel integration

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

The way we'll define backports versioning information for kernel integration is slightly different, we'll rely completely on Kconfig for the job, but in the end share the same C code defines.

---
 gentree.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
gentree.py +18 -0
index afa4967..3e130f1 100755
@@ -861,6 +861,24 @@ def process(kerneldir, copy_list_file, git_revision=None,
             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, "add versions files")
+    else:
+        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),
+        ]
+        out = ''
+        for l in open(os.path.join(bpid.target_dir, '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(bpid.target_dir, 'Kconfig'), 'w')
+        outf.write(out)
+        outf.close()
+        git_debug_snapshot(args, "modify top level backports/Kconfig with backports identity")
 
     if disable_list:
         # No need to verify_sources() as compat's Kconfig has no 'source' call
Signature · 1 line
2.1.1
#25 lore raw

PATCH v3 19/21 backports: prefix c-file / h-file auto backport with BPAUTO

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

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.

---
 backport/backport-include/asm/dma-mapping.h        |  4 +-
 backport/backport-include/backport/leds-disabled.h |  2 +-
 backport/compat/Kconfig                            | 74 +++++++++++-----------
 backport/compat/Makefile                           |  4 +-
 backport/compat/backports.h                        |  4 +-
 gentree.py                                         |  2 +-
 patches/backport-adjustments/devcoredump.patch     |  4 +-
 7 files changed, 47 insertions(+), 47 deletions(-)
backport/backport-include/asm/dma-mapping.h +2 -2
index 844fe3b..b73b7da 100644
@@ -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)
 
backport/backport-include/backport/leds-disabled.h +1 -1
index 501f2a0..156d7fa 100644
@@ -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>
backport/compat/Kconfig +37 -37

159 lines not on this page · raw message

backport/compat/Makefile +2 -2
index 6d210b0..0dd69fe 100644
@@ -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
backport/compat/backports.h +2 -2
index c9094ac..323c908 100644
@@ -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
gentree.py +1 -1
index 3e130f1..bf2112b 100755
@@ -235,7 +235,7 @@ def add_automatic_backports(args):
     configtree = kconfig.ConfigTree(os.path.join(args.bpid.target_dir, 'Kconfig'), args.bpid)
     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
patches/backport-adjustments/devcoredump.patch +2 -2
index 3378884..3bf35f9 100644
@@ -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 */
Signature · 1 line
2.1.1
#26 lore raw

PATCH v3 20/21 backports: remove extra BACKPORT_ prefix from kernel versioning

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

The CPTCFG_ prefix already implies backport, when integration is used we'd end up with a double BACKPORT_ prefix, so just remove the existing one as its not needed.

---
 backport/Makefile                                  |  2 +-
 backport/compat/Kconfig                            | 10 +++----
 backport/compat/Makefile                           | 34 +++++++++++-----------
 devel/doc/kconfig-operation                        |  6 ++--
 gentree.py                                         |  2 +-
 .../media/0002-no_dmabuf/v4l2.patch                |  6 ++--
 6 files changed, 30 insertions(+), 30 deletions(-)
backport/Makefile +1 -1
index fcf2f01..c21b813 100644
@@ -93,7 +93,7 @@ mrproper:
 		print=0									;\
 		for v in $$kvers ; do							\
 			if [ "$$print" = "1" ] ; then					\
-				echo config BACKPORT_KERNEL_$$(echo $$v | tr . _)	;\
+				echo config KERNEL_$$(echo $$v | tr . _)	;\
 				echo "    def_bool y"					;\
 			fi								;\
 			if [ "$$v" = "$$kver" ] ; then print=1 ; fi			;\
backport/compat/Kconfig +5 -5
index 06ef8d5..aadf246 100644
@@ -16,14 +16,14 @@
 #
 #	# 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 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 || KERNEL_X_Z
 #
 #	# build if driver needs it (it selects BPAUTO_FOO)
 #	default m if BPAUTO_FOO
@@ -43,7 +43,7 @@
 #
 # config BPAUTO_BUILD_KFIFO
 #	def_bool y
-#	depends on BACKPORT_KERNEL_2_6_36
+#	depends on KERNEL_2_6_36
 #
 #
 # C) similarly, a kconfig symbol for an option, e.g.
@@ -83,9 +83,9 @@ config BPAUTO_BUILD_DMA_SHARED_HELPERS
 	depends on HAS_DMA
 	# Build on other kernels kernels < 3.9 if HAVE_GENERIC_DMA_COHERENT is
 	# not set. Kernels >= 3.8 have this if HAS_DMA is set.
-	depends on (!HAVE_GENERIC_DMA_COHERENT || BACKPORT_KERNEL_3_9)
+	depends on (!HAVE_GENERIC_DMA_COHERENT || KERNEL_3_9)
 	# Always build if on 3.3 - 3.5
-	default y if (BACKPORT_KERNEL_3_4 || BACKPORT_KERNEL_3_5 || BACKPORT_KERNEL_3_6)
+	default y if (KERNEL_3_4 || KERNEL_3_5 || KERNEL_3_6)
 	# build for testing
 	default y if BPAUTO_USERSEL_BUILD_ALL
 
backport/compat/Makefile +17 -17
index 0dd69fe..e787763 100644
@@ -3,23 +3,23 @@ obj-m += compat.o
 compat-y += main.o
 
 # Kernel backport compatibility code
-compat-$(CPTCFG_BACKPORT_KERNEL_3_0) += compat-3.0.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_1) += compat-3.1.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_2) += backport-3.2.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_3) += compat-3.3.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_4) += compat-3.4.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_5) += compat-3.5.o user_namespace.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_6) += compat-3.6.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_7) += compat-3.7.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_8) += compat-3.8.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_9) += compat-3.9.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_10) += backport-3.10.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_12) += backport-3.12.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_13) += backport-3.13.o
-compat-$(CPTCFG_BACKPORT_KERNEL_3_14) += backport-3.14.o
-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_KERNEL_3_0) += compat-3.0.o
+compat-$(CPTCFG_KERNEL_3_1) += compat-3.1.o
+compat-$(CPTCFG_KERNEL_3_2) += backport-3.2.o
+compat-$(CPTCFG_KERNEL_3_3) += compat-3.3.o
+compat-$(CPTCFG_KERNEL_3_4) += compat-3.4.o
+compat-$(CPTCFG_KERNEL_3_5) += compat-3.5.o user_namespace.o
+compat-$(CPTCFG_KERNEL_3_6) += compat-3.6.o
+compat-$(CPTCFG_KERNEL_3_7) += compat-3.7.o
+compat-$(CPTCFG_KERNEL_3_8) += compat-3.8.o
+compat-$(CPTCFG_KERNEL_3_9) += compat-3.9.o
+compat-$(CPTCFG_KERNEL_3_10) += backport-3.10.o
+compat-$(CPTCFG_KERNEL_3_12) += backport-3.12.o
+compat-$(CPTCFG_KERNEL_3_13) += backport-3.13.o
+compat-$(CPTCFG_KERNEL_3_14) += backport-3.14.o
+compat-$(CPTCFG_KERNEL_3_15) += backport-3.15.o
+compat-$(CPTCFG_KERNEL_3_17) += backport-3.17.o
+compat-$(CPTCFG_KERNEL_3_18) += backport-3.18.o
 
 compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
 compat-$(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS) += dma-shared-helpers.o
devel/doc/kconfig-operation +3 -3
index f1ecf60..ddb4de7 100644
@@ -53,12 +53,12 @@ The second file (Kconfig.versions) is generated from just the version of
 the kernel and also contains invisible and unselectable boolean options
 like
 
-config BACKPORT_KERNEL_X
+config KERNEL_X
     def_bool y
 
 to indicate that APIs introduced in kernel version X (e.g. 3_3 for 3.3
 or 2_6_24 for 2.6.24) must be backported. Essentially, the presence of
-a symbol BACKPORT_KERNEL_X indicates that the kernel that the code is
+a symbol KERNEL_X indicates that the kernel that the code is
 being compiled against is older than X.
 
 All together, this allows the correct options to be selected by the user.
@@ -121,7 +121,7 @@ These are the problems and their solutions:
     requires at least 2.6.29 due to the shash crypto code. This cannot be
     determined easily automatically, so the 'dependencies' file is read
     and options that are listed there are rewritten to include
-        depends on !BACKPORT_KERNEL_X_Y
+        depends on !KERNEL_X_Y
     (where X_Y is the listed kernel version), which makes them available
     only on kernels >= X.Y.
 
gentree.py +1 -1
index bf2112b..90334ef 100755
@@ -988,7 +988,7 @@ def process(kerneldir, copy_list_file, git_revision=None,
             elif (dep == "DISABLE"):
                     new.append('BACKPORT_DISABLED_KCONFIG_OPTION')
             else:
-                    new.append('!BACKPORT_KERNEL_%s' % dep.replace('.', '_'))
+                    new.append('!KERNEL_%s' % dep.replace('.', '_'))
         if bpid.integrate:
             deplist[sym] = ["BACKPORT_" + x for x in new]
         else:
patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch +3 -3
index 02d042a..7f88c3e 100644
@@ -5,7 +5,7 @@
  # Used by drivers that need Videobuf2 modules
  config VIDEOBUF2_CORE
 -	select DMA_SHARED_BUFFER
-+	select DMA_SHARED_BUFFER if !BACKPORT_KERNEL_3_5
++	select DMA_SHARED_BUFFER if !KERNEL_3_5
  	tristate
  
  config VIDEOBUF2_MEMOPS
@@ -14,14 +14,14 @@
  	select VIDEOBUF2_CORE
  	select VIDEOBUF2_MEMOPS
 -	select DMA_SHARED_BUFFER
-+	select DMA_SHARED_BUFFER if !BACKPORT_KERNEL_3_5
++	select DMA_SHARED_BUFFER if !KERNEL_3_5
  
  config VIDEOBUF2_VMALLOC
  	tristate
  	select VIDEOBUF2_CORE
  	select VIDEOBUF2_MEMOPS
 -	select DMA_SHARED_BUFFER
-+	select DMA_SHARED_BUFFER if !BACKPORT_KERNEL_3_5
++	select DMA_SHARED_BUFFER if !KERNEL_3_5
  
  config VIDEOBUF2_DMA_SG
  	tristate
Signature · 1 line
2.1.1
#27 lore raw

PATCH v3 21/21 backports: add full kernel integration support

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

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.

mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean \
	/home/mcgrof/linux-next /home/mcgrof/build/backports-20141023

Copy original source files ...
Applying patches from patches to /home/mcgrof/build/backports-20141023
...
Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Done!

real    1m27.942s
user    13m23.752s
sys     0m47.608s
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    42m44.838s
user    1190m5.092s
sys     140m37.208s
---
 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                                         | 72 ++++++++++++++++++++--
 .../0001-enable-backports-built-in.patch           | 40 ++++++++++++
 lib/bpversion.py                                   | 48 +++++++++++++++
 lib/kconfig.py                                     | 67 ++++++++++++++++++++
 10 files changed, 291 insertions(+), 7 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
backport/Kconfig.integrate new file +36 -0
new file mode 100644
index 0000000..f64a3f6
@@ -0,0 +1,36 @@
+config BACKPORT_INTEGRATE
+	bool
+	def_bool y
+
+config BACKPORT_DIR
+	string
+	default "%%BACKPORT_DIR%%"
+
+config BACKPORT_VERSION
+	string
+	default "%%BACKPORTS_VERSION%%"
+
+config BACKPORT_KERNEL_VERSION
+	string
+	default "%%BACKPORTED_KERNEL_VERSION%%"
+
+config BACKPORT_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
backport/Makefile.kernel +13 -0
index a63184b..c57b2d3 100644
@@ -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,\
@@ -17,6 +18,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/
 
backport/backport-include/backport/backport.h +5 -0
index 7cf21aa..d1d3b10 100644
@@ -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 */
backport/compat/Makefile +4 -0
index e787763..f14b516 100644
@@ -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
backport/compat/main.c +7 -1
index 04ebbfd..5d45e3d 100644
@@ -71,8 +71,14 @@ static int __init backport_init(void)
 #ifdef BACKPORTS_GIT_TRACKED
 	printk(KERN_INFO BACKPORTS_GIT_TRACKED "\n");
 #else
+
+#ifdef CONFIG_BACKPORT_INTEGRATE
+	printk(KERN_INFO "Backport integrated by backports.git " CPTCFG_VERSION "\n");
+#else
 	printk(KERN_INFO "Backport generated by backports.git " CPTCFG_VERSION "\n");
-#endif
+#endif /* CONFIG_BACKPORT_INTEGRATE */
+
+#endif /* BACKPORTS_GIT_TRACKED */
 
         return 0;
 }
devel/doc/kconfig-operation +5 -0
index ddb4de7..35e198c 100644
@@ -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
 -------------------------------
 
gentree.py +66 -6

151 lines not on this page · raw message

integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch new file +40 -0
new file mode 100644
index 0000000..d66b203
@@ -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
lib/bpversion.py new file +48 -0

48 lines not on this page · raw message

lib/kconfig.py +67 -0

73 lines not on this page · raw message

Signature · 1 line
2.1.1
#28 lore raw
In reply to Luis R. Rodriguez
Quoted 8 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This third series should hopefully address all pending feedback. I've split out patches even more, but more importantly have made the parser simpler by both integrating the logic required to understand a backport by identifying the backport by type and strategy, sharing that, and then providing ignore lists on the parsers.

I think from a code change POV I should be OK with this, but I'll definitely want to run it and see the differences. I'll have to do that next week, it's getting late here.

johannes

#29 lore raw
Quoted 10 lines · Johannes Berg
Quoted 8 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This third series should hopefully address all pending feedback. I've split out patches even more, but more importantly have made the parser simpler by both integrating the logic required to understand a backport by identifying the backport by type and strategy, sharing that, and then providing ignore lists on the parsers.

Quoted 3 lines

I think from a code change POV I should be OK with this, but I'll definitely want to run it and see the differences. I'll have to do that next week, it's getting late here.

OK. So I shouldn't merge yet?

Luis

#30 lore raw
Quoted 12 lines · Luis R. Rodriguez
Quoted 10 lines · Johannes Berg
Quoted 8 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This third series should hopefully address all pending feedback. I've split out patches even more, but more importantly have made the parser simpler by both integrating the logic required to understand a backport by identifying the backport by type and strategy, sharing that, and then providing ignore lists on the parsers.

Quoted 5 lines
Quoted 3 lines

I think from a code change POV I should be OK with this, but I'll definitely want to run it and see the differences. I'll have to do that next week, it's getting late here.

OK. So I shouldn't merge yet?

I would prefer you didn't, but OTOH we can always fix up issues later as well.

johannes

#31 lore raw
Quoted 13 lines · Johannes Berg
Quoted 12 lines · Luis R. Rodriguez
Quoted 10 lines · Johannes Berg
Quoted 8 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This third series should hopefully address all pending feedback. I've split out patches even more, but more importantly have made the parser simpler by both integrating the logic required to understand a backport by identifying the backport by type and strategy, sharing that, and then providing ignore lists on the parsers.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

I think from a code change POV I should be OK with this, but I'll definitely want to run it and see the differences. I'll have to do that next week, it's getting late here.

OK. So I shouldn't merge yet?

I would prefer you didn't, but OTOH we can always fix up issues later as well.

I'll wait.

Luis

#32 lore raw
Quoted 19 lines · Luis R. Rodriguez
Quoted 17 lines · Johannes Berg
Quoted 16 lines · Luis R. Rodriguez
Quoted 13 lines · Johannes Berg
Quoted 8 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This third series should hopefully address all pending feedback. I've split out patches even more, but more importantly have made the parser simpler by both integrating the logic required to understand a backport by identifying the backport by type and strategy, sharing that, and then providing ignore lists on the parsers.

I think from a code change POV I should be OK with this, but I'll definitely want to run it and see the differences. I'll have to do that next week, it's getting late here.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

OK. So I shouldn't merge yet?

I would prefer you didn't, but OTOH we can always fix up issues later as well.

I'll wait.

Pushed.

Luis