[Glibc-bsd-commits] r3909 - in trunk: kfreebsd-10/debian kfreebsd-9/debian

[Robert Millan]

Author: rmh
Date: 2011-12-01 07:06:05 +0000 (Thu, 01 Dec 2011)
New Revision: 3909

Modified:
   trunk/kfreebsd-10/debian/rules
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/rules
Log:
Fix kernel-image major number suffix hack.

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2011-11-30 18:34:08 UTC (rev 3908)
+++ trunk/kfreebsd-10/debian/rules	2011-12-01 07:06:05 UTC (rev 3909)
@@ -197,7 +197,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
@@ -249,10 +249,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 \
@@ -274,15 +270,33 @@
 	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
-	mv $(CURDIR)/debian/kernel-image-$(version)-$(abiname)-$*-di/boot/kfreebsd{,-$(major)}.gz
+
+	# override file
+	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
+
+	# fixup kernel path (so that this udeb can be installed alongside
+	# other major versions of kfreebsd)
+	for i in debian/arch/$(DEB_HOST_ARCH_CPU)/*.installer ; do \
+		subarch=`basename $$i .installer` ; \
+		mv debian/kernel-image-$(version)-$(abiname)-$${subarch}-di/boot/kfreebsd{,-$(major)}.gz ; \
+	done
 endif
+	touch $@
 
-	touch install-flavor-$*-stamp
 
-
 # Build architecture-independent files here.
 binary-indep: build-indep install-indep
 	dh_testdir

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-11-30 18:34:08 UTC (rev 3908)
+++ trunk/kfreebsd-9/debian/changelog	2011-12-01 07:06:05 UTC (rev 3909)
@@ -1,3 +1,9 @@
+kfreebsd-9 (9.0~svn227451-6) UNRELEASED; urgency=low
+
+  * Fix kernel-image major number suffix hack.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 30 Nov 2011 19:25:57 +0100
+
 kfreebsd-9 (9.0~svn227451-5) unstable; urgency=medium
 
   * Use major number for kfreebsd.gz in kernel-image, so that it can be

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-11-30 18:34:08 UTC (rev 3908)
+++ trunk/kfreebsd-9/debian/rules	2011-12-01 07:06:05 UTC (rev 3909)
@@ -209,7 +209,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
@@ -261,10 +261,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 \
@@ -286,15 +282,33 @@
 	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
-	mv $(CURDIR)/debian/kernel-image-$(version)-$(abiname)-$*-di/boot/kfreebsd{,-$(major)}.gz
+
+	# override file
+	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
+
+	# fixup kernel path (so that this udeb can be installed alongside
+	# other major versions of kfreebsd)
+	for i in debian/arch/$(DEB_HOST_ARCH_CPU)/*.installer ; do \
+		subarch=`basename $$i .installer` ; \
+		mv debian/kernel-image-$(version)-$(abiname)-$${subarch}-di/boot/kfreebsd{,-$(major)}.gz ; \
+	done
 endif
+	touch $@
 
-	touch install-flavor-$*-stamp
 
-
 # Build architecture-independent files here.
 binary-indep: build-indep install-indep
 	dh_testdir