[Glibc-bsd-commits] r2705 - in trunk/kfreebsd-7/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2009-08-10 09:05:15 +0000 (Mon, 10 Aug 2009)
New Revision: 2705

Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-7/debian/rules
Log:
* Build the ZFS module, and at a README.Debian explaining it may not
  be legaly possible to load both ext2fs.ko and zfs.ko at the same time.



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2009-08-10 08:25:55 UTC (rev 2704)
+++ trunk/kfreebsd-7/debian/changelog	2009-08-10 09:05:15 UTC (rev 2705)
@@ -3,8 +3,10 @@
   [ Aurelien Jarno ]
   * Move some changes from 999_config.diff into the configuration files.
   * Enable FDESCFS and LINSYSFS as they are always mounted at boot.
+  * Build the ZFS module, and at a README.Debian explaining it may not
+    be legaly possible to load both ext2fs.ko and zfs.ko at the same time.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 22 Jul 2009 16:10:10 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 10 Aug 2009 11:01:30 +0200
 
 kfreebsd-7 (7.2-3) unstable; urgency=low
 

Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2009-08-10 08:25:55 UTC (rev 2704)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2009-08-10 09:05:15 UTC (rev 2705)
@@ -314,14 +314,6 @@
  	${_padlock} \
  	patm \
  	${_pccard} \
-@@ -331,7 +325,6 @@
- 	${_xe} \
- 	xfs \
- 	xl \
--	${_zfs} \
- 	zlib \
- 	zyd
- 
 @@ -423,10 +416,6 @@
  .if ${MK_NCP} != "no"
  _nwfs=		nwfs
@@ -333,16 +325,6 @@
  _pccard=	pccard
  _pcfclock=	pcfclock
  _pecoff=	pecoff
-@@ -448,9 +437,6 @@
- _tmpfs= 	tmpfs
- _wi=		wi
- _xe=		xe
--.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
--_zfs=		zfs
--.endif
- .if ${MACHINE} == "i386"
- _aac=		aac
- _acpi=		acpi
 @@ -468,8 +454,6 @@
  _dpt=		dpt
  _ex=		ex

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2009-08-10 08:25:55 UTC (rev 2704)
+++ trunk/kfreebsd-7/debian/rules	2009-08-10 09:05:15 UTC (rev 2705)
@@ -184,6 +184,12 @@
 	# remove device.hints (built into kernel)
 	rm -f $(IMAGE_PACKAGE)-$*/boot/device.hints
 
+	# README file
+	mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/doc
+	install -p -o root -g root -m 644 \
+		debian/kfreebsd-image.README.Debian \
+		$(IMAGE_PACKAGE)-$*/usr/share/doc/$(IMAGE_PACKAGE)-$*/README.Debian
+
 	# override file
 	mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides
 	install -p -o root -g root -m 644 \