[Glibc-bsd-commits] r1502 - trunk/kfreebsd-6/debian

[Robert Millan]

Author: rmh
Date: 2006-04-26 20:22:04 +0000 (Wed, 26 Apr 2006)
New Revision: 1502

Removed:
   trunk/kfreebsd-6/debian/kfreebsd-image.conffiles.in
Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/kfreebsd-image.overrides
   trunk/kfreebsd-6/debian/rules
Log:
Get rid of /boot/device.hints (now embedded in kernel image).

Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2006-04-26 20:16:11 UTC (rev 1501)
+++ trunk/kfreebsd-6/debian/changelog	2006-04-26 20:22:04 UTC (rev 1502)
@@ -6,8 +6,9 @@
     essential stuff (use kfreebsd-common to load them as modules).
     Network and storage drivers _are_ still present (untill we port
     hotplug/discover).  On -486, this saves 544 KB in kernel.gz.
+  * Get rid of /boot/device.hints (now embedded in kernel image).
 
- -- Robert Millan <rmh at aybabtu.com>  Wed, 26 Apr 2006 20:56:45 +0200
+ -- Robert Millan <rmh at aybabtu.com>  Wed, 26 Apr 2006 22:21:26 +0200
 
 kfreebsd-6 (6.0-0.2) unreleased; urgency=low
 

Deleted: trunk/kfreebsd-6/debian/kfreebsd-image.conffiles.in
===================================================================
--- trunk/kfreebsd-6/debian/kfreebsd-image.conffiles.in	2006-04-26 20:16:11 UTC (rev 1501)
+++ trunk/kfreebsd-6/debian/kfreebsd-image.conffiles.in	2006-04-26 20:22:04 UTC (rev 1502)
@@ -1 +0,0 @@
-/boot/device.hints

Modified: trunk/kfreebsd-6/debian/kfreebsd-image.overrides
===================================================================
--- trunk/kfreebsd-6/debian/kfreebsd-image.overrides	2006-04-26 20:16:11 UTC (rev 1501)
+++ trunk/kfreebsd-6/debian/kfreebsd-image.overrides	2006-04-26 20:22:04 UTC (rev 1502)
@@ -1,4 +1,3 @@
 shlib-with-non-pic-code
 shared-lib-without-dependency-information
-non-etc-file-marked-as-conffile /boot/device.hints
 

Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules	2006-04-26 20:16:11 UTC (rev 1501)
+++ trunk/kfreebsd-6/debian/rules	2006-04-26 20:22:04 UTC (rev 1502)
@@ -49,7 +49,7 @@
 	dh_testdir
 	dh_testroot
 	rm -rf src kfreebsd-source-* flavor-* config
-	rm -f debian/kfreebsd-image-*.{conffiles,preinst,postinst}
+	rm -f debian/kfreebsd-image-*.{preinst,postinst}
 
 	rm -f *-stamp
 	dh_clean
@@ -139,11 +139,7 @@
 	dh_testdir
 	dh_testroot
 
-	# install device.hints
 	mkdir -p $(IMAGE_PACKAGE)-$*/boot/kernel
-	install -o root -g root -m 644 \
-		$(FLAVOR_DIR)-$*/sys/$(cpu)/conf/GENERIC.hints \
-		$(IMAGE_PACKAGE)-$*/boot/device.hints
 
 	# make the install target happy
 	install -o root -g root -m 644 \
@@ -175,8 +171,6 @@
 		$(NDIS_PACKAGE)-$*/boot/kernel/
 
 	# scripts
-	cp -f debian/kfreebsd-image.conffiles.in \
-		debian/kfreebsd-image-$(version)-$(abiname)-$*.conffiles
 	cp -f debian/kfreebsd-image.postinst.in \
 		debian/kfreebsd-image-$(version)-$(abiname)-$*.postinst
 	cp -f debian/kfreebsd-image.preinst.in \