[Glibc-bsd-commits] r3923 - trunk/kfreebsd-8.2/debian

[Robert Millan]

Author: rmh
Date: 2011-12-03 19:56:33 +0000 (Sat, 03 Dec 2011)
New Revision: 3923

Modified:
   trunk/kfreebsd-8.2/debian/changelog
   trunk/kfreebsd-8.2/debian/rules
Log:
Install udeb files in their own target.

Modified: trunk/kfreebsd-8.2/debian/changelog
===================================================================
--- trunk/kfreebsd-8.2/debian/changelog	2011-12-03 19:42:26 UTC (rev 3922)
+++ trunk/kfreebsd-8.2/debian/changelog	2011-12-03 19:56:33 UTC (rev 3923)
@@ -1,8 +1,9 @@
 kfreebsd-8 (8.2-16) UNRELEASED; urgency=low
 
   * 108_teken_utf8_table.diff: Fix sockets over nullfs.
+  * Install udeb files in their own target.
 
- -- Robert Millan <rmh at debian.org>  Sat, 03 Dec 2011 17:36:42 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 03 Dec 2011 20:56:24 +0100
 
 kfreebsd-8 (8.2-15) unstable; urgency=low
 

Modified: trunk/kfreebsd-8.2/debian/rules
===================================================================
--- trunk/kfreebsd-8.2/debian/rules	2011-12-03 19:42:26 UTC (rev 3922)
+++ trunk/kfreebsd-8.2/debian/rules	2011-12-03 19:56:33 UTC (rev 3923)
@@ -212,7 +212,7 @@
 
 	touch install-common-stamp
 
-install-arch: $(foreach flavor,$(flavours),install-flavor-$(flavor)-stamp)
+install-arch: $(foreach flavor,$(flavours),install-flavor-$(flavor)-stamp) install-udeb-stamp
 install-flavor-%-stamp: install-common-stamp build-flavor-%-stamp
 	dh_testdir
 	dh_testroot
@@ -264,10 +264,6 @@
 	install -p -o root -g root -m 644 \
 		debian/kfreebsd-image.overrides \
 		$(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides/kfreebsd-image-$(version)-$(abiname)-$*
-	mkdir -p $(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-$*-di/usr/share/lintian/overrides
-	install -p -o root -g root -m 644 \
-		debian/zlib-modules.overrides \
-		$(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-$*-di/usr/share/lintian/overrides/zlib-modules-$(version)-$(abiname)-$*-di
 
 	# scripts
 	for script in preinst prerm postinst postrm ; do \
@@ -289,14 +285,29 @@
 	done
 	ln -s $(kfreebsd_cpu)/include $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/machine
 
+	touch install-flavor-$*-stamp
+
+install-udeb-stamp: $(foreach flavor,$(flavours),install-flavor-$(flavor)-stamp)
 ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+	dh_testdir
+	dh_testroot
+	dh_clean -k -pkernel-image-$(version)-$(abiname)-$*-di
+
 	KW_CONFIG_DIR=debian/arch/$(DEB_HOST_ARCH_CPU)/installer kernel-wedge install-files \
 		$(version)-$(abiname) debian/arch/$(DEB_HOST_ARCH_CPU)/installer
+
+	for i in debian/arch/$(DEB_HOST_ARCH_CPU)/*.installer ; do \
+		subarch=`basename $$i .installer` ; \
+		# override file \n\
+		mkdir -p $(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-$${subarch}-di/usr/share/lintian/overrides ; \
+		install -p -o root -g root -m 644 \
+			debian/zlib-modules.overrides \
+			$(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-$${subarch}-di/usr/share/lintian/overrides/zlib-modules-$(version)-$(abiname)-$${subarch}-di ; \
+	done
 endif
+	touch $@
 
-	touch install-flavor-$*-stamp
 
-
 # Build architecture-independent files here.
 binary-indep: build-indep install-indep
 	dh_testdir