[Glibc-bsd-commits] r4375 - trunk/kfreebsd-9/debian

[Steven Chamberlain]

Author: stevenc-guest
Date: 2012-12-09 21:00:00 +0000 (Sun, 09 Dec 2012)
New Revision: 4375

Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/rules
Log:
Sync SVN with changes in -10 upload

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2012-11-23 22:15:14 UTC (rev 4374)
+++ trunk/kfreebsd-9/debian/changelog	2012-12-09 21:00:00 UTC (rev 4375)
@@ -1,3 +1,9 @@
+kfreebsd-9 (9.0-10) unstable; urgency=low
+
+  * Revert "Touch conf/DEBIAN" causing build failures in "normal" mode
+
+ -- Christoph Egger <christoph at debian.org>  Fri, 23 Nov 2012 19:32:25 -0800
+
 kfreebsd-9 (9.0-9) unstable; urgency=medium
 
   * Apply patch for SA-12:08 / CVE-2012-4576:

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2012-11-23 22:15:14 UTC (rev 4374)
+++ trunk/kfreebsd-9/debian/rules	2012-12-09 21:00:00 UTC (rev 4375)
@@ -179,11 +179,6 @@
 	# Configure the kernel
 	cp debian/arch/$(cpu)/$*.config $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/conf/
 	ln -sf $*.config $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/conf/$(configfile)
-	# this file is generated by 999_firmware.patch. However, pretending
-	# someone wants to build a custom kernel with firmware included this
-	# yields to a build failure if the file does not exist. It can be empty,
-	# however.
-	touch $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/conf/DEBIAN
 	cd $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/conf \
 		&& config $(configfile)