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

[Arno Töll]

Author: atoell-guest
Date: 2012-11-03 02:50:03 +0000 (Sat, 03 Nov 2012)
New Revision: 4371

Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/rules
Log:
Touch conf/DEBIAN in debian/rules. This makes people happy who build their own kernel with firmware included

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2012-11-03 02:31:03 UTC (rev 4370)
+++ trunk/kfreebsd-9/debian/changelog	2012-11-03 02:50:03 UTC (rev 4371)
@@ -1,3 +1,10 @@
+kfreebsd-9 (9.0-9) unstable; urgency=low
+
+  * Touch conf/DEBIAN to avoid build failures in case someone wants to build the
+    kernel with firmware included.
+
+ -- Arno Töll <arno at debian.org>  Sat, 03 Nov 2012 03:48:17 +0100
+
 kfreebsd-9 (9.0-8) unstable; urgency=low
   
   * Build source package on a kfreebsd system

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2012-11-03 02:31:03 UTC (rev 4370)
+++ trunk/kfreebsd-9/debian/rules	2012-11-03 02:50:03 UTC (rev 4371)
@@ -179,6 +179,11 @@
 	# 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)