gentree: make automatic backport filenames unique

Instead of copying drivers/base/hdmi.c to just hdmi.c copy it to
drivers-base-hdmi.c as there can be multiple files with the same
name (e.g. "core.c"). While at it, also fix this mechanism for
modules -- before having more than a single file for a module
would have caused multiple modules which clearly can't work, now
it's needed to give a #module-name and it will be added to the
Makefile correctly.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/gentree.py b/gentree.py
index 16316e08464070cae4f62333482b509d1d4943aa..b1a6be300ed4f4c28638f7ee6e4a01a0bcbfd61f 100755 (executable)
--- a/gentree.py
+++ b/gentree.py
@@ -171,17 +171,20 @@ def copy_git_files(srcpath, copy_list, rev, outdir):
             outf.close()
             os.chmod(f, int(m, 8))
 
+def automatic_backport_mangle_c_file(name):
+    return name.replace('/', '-')
+
 
 def add_automatic_backports(args):
     export = re.compile(r'^EXPORT_SYMBOL(_GPL)?\((?P<sym>[^\)]*)\)')
     bpi = kconfig.get_backport_info(os.path.join(args.outdir, 'compat', 'Kconfig'))
     for sym, vals in bpi.iteritems():
-        symtype, c_files, h_files = vals
+        symtype, module_name, c_files, h_files = vals
 
         # first copy files
         files = []
         for f in c_files:
-            files.append((f, os.path.join('compat', os.path.basename(f))))
+            files.append((f, os.path.join('compat', automatic_backport_mangle_c_file(f))))
         for f in h_files:
             files.append((os.path.join('include', f),
                           os.path.join('include', os.path.dirname(f), 'backport-' + os.path.basename(f))))
@@ -192,16 +195,21 @@ def add_automatic_backports(args):
 
         # now add the Makefile line
         mf = open(os.path.join(args.outdir, 'compat', 'Makefile'), 'a+')
-        o_files = [os.path.basename(f)[:-1] + 'o' for f in c_files]
+        o_files = [automatic_backport_mangle_c_file(f)[:-1] + 'o' for f in c_files]
         if symtype == 'tristate':
-            mf.write('obj-$(CPTCFG_%s) += %s\n' % (sym, ' '.join(o_files)))
+            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-$(CPTCFG_%s) += %s.o\n' % (sym, module_name))
         elif symtype == 'bool':
             mf.write('compat-$(CPTCFG_%s) += %s\n' % (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', os.path.basename(f)), 'r'):
+            for l in open(os.path.join(args.outdir, 'compat',
+                                       automatic_backport_mangle_c_file(f)), 'r'):
                 m = export.match(l)
                 if m:
                     syms.append(m.group('sym'))

diff --git a/lib/kconfig.py b/lib/kconfig.py
index b971c2057e86a0def8f73fa408a6df7c7c770736..406e375b5c5b724155d2b1f8a91e4a36c486f3a9 100644 (file)
--- a/lib/kconfig.py
+++ b/lib/kconfig.py
@@ -9,7 +9,7 @@ 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]*)')
 sel_line = re.compile(r'^(?P<spc>\s+)select\s+(?P<sym>[^\s]*)\s*$')
-ch_line = re.compile(r'^\s+#(?P<ch>[ch])-file\s*(?P<file>.*)')
+backport_line = re.compile(r'^\s+#(?P<key>[ch]-file|module-name)\s*(?P<name>.*)')
 
 class ConfigTree(object):
     def __init__(self, rootfile):
@@ -118,6 +118,7 @@ def get_backport_info(filename):
     f = open(filename, 'r')
     result = {}
     conf = None
+    module_name = None
 
     # trick to always have an empty line last
     def append_empty(f):
@@ -129,9 +130,10 @@ def get_backport_info(filename):
         m = cfg_line.match(line)
         if not line.strip() or m:
             if conf and conf_type and (c_files or h_files):
-                result[conf] = (conf_type, c_files, h_files)
+                result[conf] = (conf_type, module_name, c_files, h_files)
             conf = None
             conf_type = None
+            module_name = None
             c_files = []
             h_files = []
             if m:
@@ -147,10 +149,12 @@ def get_backport_info(filename):
         if m:
             conf_type = 'bool'
             continue
-        m = ch_line.match(line)
+        m = backport_line.match(line)
         if m:
-            if m.group('ch') == 'c':
-                c_files.append(m.group('file'))
-            elif m.group('ch') == 'h':
-                h_files.append(m.group('file'))
+            if m.group('key') == 'c-file':
+                c_files.append(m.group('name'))
+            elif m.group('key') == 'h-file':
+                h_files.append(m.group('name'))
+            elif m.group('key') == 'module-name':
+                module_name = m.group('name')
     return result

diff --git a/patches/backport-adjustments/dma-buf.patch b/patches/backport-adjustments/dma-buf.patch
index cec56269f81d6acde5c4cfa34d1c7a8b61845827..06ed9f6516542ff3ae52dc2822ea08af5107db3d 100644 (file)
--- a/patches/backport-adjustments/dma-buf.patch
+++ b/patches/backport-adjustments/dma-buf.patch
@@ -1,5 +1,5 @@
---- a/compat/dma-buf.c
-+++ b/compat/dma-buf.c
+--- a/compat/drivers-base-dma-buf.c
++++ b/compat/drivers-base-dma-buf.c
 @@ -27,6 +27,9 @@
  #include <linux/dma-buf.h>
  #include <linux/anon_inodes.h>