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

[Bastian Blank]

Author: waldi
Date: Tue Sep  5 21:43:44 2006
New Revision: 7350

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

Log:
* debian/bin/gencontrol.py: Fix creation of hook.
* debian/rules.real: Install hook if necessary.


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	Tue Sep  5 21:43:44 2006
@@ -71,22 +71,21 @@
         file("debian/firmware-%s.copyright" % package, 'w').write(self.substitute(copyright, vars))
 
         install = []
-        install_deb = []
         install.append("%s /lib/firmware" % ' '.join(["%s/%s" % (package, i) for i in config_entry['files']]))
 
         vars['files_real'] = ' '.join(["/lib/firmware/%s" % i for i in config_entry['files']])
 
         if 'initramfs-tools' in config_entry.get('support', []):
             hook = self.templates['hook.initramfs-tools']
-            hook_filename = "debian/firmware_%s" % package
+            hook_filename = "debian/firmware-%s.hook.initramfs-tools" % package
             file(hook_filename, 'w').write(self.substitute(hook, vars))
-            os.chmod(hook_filename, 0755)
-            install_deb.append("%s /usr/share/initramfs-tools/hooks" % hook_filename)
 
             postinst = self.templates['postinst.initramfs-tools']
             file("debian/firmware-%s.postinst" % package, 'w').write(self.substitute(postinst, vars))
 
-        file("debian/firmware-%s.install" % package, 'w').write('\n'.join(install + install_deb) + '\n')
+            file("debian/firmware-%s.dirs" % package, 'w').write("/usr/share/initramfs-tools/hooks\n")
+
+        file("debian/firmware-%s.install" % package, 'w').write('\n'.join(install) + '\n')
         file("debian/firmware-%s-di.install" % package, 'w').write('\n'.join(install) + '\n')
 
         packages.extend(packages_binary)

Modified: dists/trunk/firmware-nonfree/debian/rules.real
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules.real	(original)
+++ dists/trunk/firmware-nonfree/debian/rules.real	Tue Sep  5 21:43:44 2006
@@ -13,23 +13,23 @@
 #
 binary-indep: install
 
-install-base:
-	dh_install
+install: PACKAGE_NAME = firmware-$(PACKAGE)
+install: PACKAGE_NAME_UDEB = firmware-$(PACKAGE)-di
+install: DH_OPTIONS = -p$(PACKAGE_NAME) -p$(PACKAGE_NAME_UDEB)
+install:
+	dh_testdir
+	dh_testroot
 	dh_installdirs
+	if [ -e debian/$(PACKAGE_NAME).hook.initramfs-tools ]; then \
+	  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
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol -- $(GENCONTROL_ARGS)
+	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-install: PACKAGE_NAME = firmware-$(PACKAGE) -pfirmware-$(PACKAGE)-di
-install: PACKAGE_NAME_UDEB = firmware-$(PACKAGE)-di
-install: DH_OPTIONS = -p$(PACKAGE_NAME) -p$(PACKAGE_NAME_UDEB)
-install:
-	dh_testdir
-	dh_testroot
-	$(MAKE) -f debian/rules.real install-base
-