[kernel] r16794 - in dists/trunk/firmware-nonfree/debian: . bin

[Ben Hutchings]

Author: benh
Date: Sun Jan  9 02:33:57 2011
New Revision: 16794

Log:
Add support for installing symlinks

Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/rules.real

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Sun Jan  9 01:50:59 2011	(r16793)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Sun Jan  9 02:33:57 2011	(r16794)
@@ -212,6 +212,7 @@
 
         files_orig = config_entry['files']
         files_real = {}
+        links = {}
 
         for root, dirs, files in os.walk(package):
             try:
@@ -219,8 +220,13 @@
             except ValueError:
                 pass
             for f in files:
+                cur_path = root + '/' + f
                 if root != package:
                     f = root[len(package) + 1 : ] + '/' + f
+                if os.path.islink(cur_path):
+                    if f in files_orig:
+                        links[f] = os.readlink(cur_path)
+                    continue
                 f1 = f.rsplit('-', 1)
                 if f in files_orig:
                     files_real[f] = f, f, None
@@ -234,9 +240,14 @@
         makeflags['FILES'] = ' '.join(["%s:%s" % (i[1], i[0]) for i in files_real.itervalues()])
         vars['files_real'] = ' '.join(["/lib/firmware/%s" % i for i in config_entry['files']])
 
+        makeflags['LINKS'] = ' '.join(["%s:%s" % (link, target)
+                                       for link, target in links.iteritems()])
+
         files_desc = ["Contents:"]
 
         for f in config_entry['files']:
+            if f in links:
+                continue
             f, f_real, version = files_real[f]
             c = self.config.get(('base', package, f), {})
             desc = c.get('desc')

Modified: dists/trunk/firmware-nonfree/debian/rules.real
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules.real	Sun Jan  9 01:50:59 2011	(r16793)
+++ dists/trunk/firmware-nonfree/debian/rules.real	Sun Jan  9 02:33:57 2011	(r16794)
@@ -24,6 +24,12 @@
 	  echo install -m644 -D "$$s" debian/$(PACKAGE_NAME)"$$d"; \
 	  install -m644 -D "$$s" debian/$(PACKAGE_NAME)"$$d"; \
 	done
+	@for i in $(LINKS); do \
+	  link=debian/$(PACKAGE_NAME)/lib/firmware/"$${i%:*}"; \
+	  target="$${i#*:}"; \
+	  echo ln -s "$$target" "$$link"; \
+	  ln -s "$$target" "$$link"; \
+	done
 	dh_bugfiles
 	dh_installchangelogs
 	dh_installdocs