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

[Bastian Blank]

Author: waldi
Date: Fri Jul  6 20:35:19 2007
New Revision: 9091

Log:
* debian/bin/gencontrol.py: Export file list.
* debian/rules.real: Install files.


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	(original)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Fri Jul  6 20:35:19 2007
@@ -107,6 +107,7 @@
                         raise RuntimeError("Multiple files for %s" % t1[0])
                     files[t1[0]] = t, t1[1]
 
+        makeflags['FILES'] = ' '.join(["%s:%s" % (i[1][0], i[0]) for i in files.iteritems()])
         vars['files_real'] = ' '.join(["/lib/firmware/%s" % i for i in config_entry['files']])
 
         files_desc = ["Contents:"]
@@ -130,8 +131,6 @@
             postinst = self.templates['postinst.initramfs-tools']
             file("debian/firmware-%s.postinst" % package, 'w').write(self.substitute(postinst, vars))
 
-            file("debian/firmware-%s.dirs" % package, 'w').write("/usr/share/initramfs-tools/hooks\n")
-
         packages.extend(packages_binary)
         packages.extend(packages_binary_udeb)
 

Modified: dists/trunk/firmware-nonfree/debian/rules.real
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules.real	(original)
+++ dists/trunk/firmware-nonfree/debian/rules.real	Fri Jul  6 20:35:19 2007
@@ -19,11 +19,18 @@
 install:
 	dh_testdir
 	dh_testroot
-	dh_installdirs
-	if [ -e debian/$(PACKAGE_NAME).hook.initramfs-tools ]; then \
+	@for i in $(FILES); do \
+	  s=$(PACKAGE)/"$${i%:*}"; \
+	  d=/lib/firmware/"$${i#*:}"; \
+	  echo install -m644 -D "$$s" debian/$(PACKAGE_NAME)"$$d"; \
+	  install -m644 -D "$$s" debian/$(PACKAGE_NAME)"$$d"; \
+	  echo install -m644 -D "$$s" debian/$(PACKAGE_NAME_UDEB)"$$d"; \
+	  install -m644 -D "$$s" debian/$(PACKAGE_NAME_UDEB)"$$d"; \
+	done
+	@if [ -e debian/$(PACKAGE_NAME).hook.initramfs-tools ]; then \
+	  echo install -D debian/$(PACKAGE_NAME).hook.initramfs-tools debian/$(PACKAGE_NAME)/usr/share/initramfs-tools/hooks/firmware_$(PACKAGE); \
 	  install -D debian/$(PACKAGE_NAME).hook.initramfs-tools debian/$(PACKAGE_NAME)/usr/share/initramfs-tools/hooks/firmware_$(PACKAGE); \
 	fi
-	dh_install
 	dh_installchangelogs
 	dh_installdocs
 	dh_compress