[Glibc-bsd-commits] r2790 - in trunk/kfreebsd-8/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-09-14 07:37:59 +0000 (Mon, 14 Sep 2009)
New Revision: 2790

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in
   trunk/kfreebsd-8/debian/patches/904_dev_full.diff
   trunk/kfreebsd-8/debian/patches/series
   trunk/kfreebsd-8/debian/rules
Log:
merge from kfreebsd-7



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2009-09-13 08:10:16 UTC (rev 2789)
+++ trunk/kfreebsd-8/debian/changelog	2009-09-14 07:37:59 UTC (rev 2790)
@@ -1,4 +1,4 @@
-kfreebsd-8 (8.0~cvs20090830-1) experimental; urgency=low
+kfreebsd-8 (8.0~cvs20090914-1) EXPERIMENTAL; urgency=low
 
   [ Petr Salinger ]
   * New upstream snapshot of RELENG_8
@@ -18,6 +18,22 @@
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 30 Aug 2009 20:43:25 +0200
 
+kfreebsd-7 (7.2-8) unstable; urgency=low
+
+  [ Petr Salinger ]
+  * Extend 904_dev_full.diff to support non-blocking mode
+    of /dev/full, /dev/null, /dev/zero
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 13 Sep 2009 00:17:20 +0200
+
+kfreebsd-7 (7.2-7) unstable; urgency=low
+
+  * Don't ship /boot/kernel, but create it in the postinst if symlinks are
+    enabled.
+  * Add 914_psm.diff to debian/series.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 31 Aug 2009 22:05:09 +0200
+
 kfreebsd-7 (7.2-6) unstable; urgency=low
 
   [ Aurelien Jarno ]

Modified: trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in	2009-09-13 08:10:16 UTC (rev 2789)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in	2009-09-14 07:37:59 UTC (rev 2790)
@@ -32,6 +32,8 @@
                     exit 1
                 fi
             done
+
+	    mkdir -p /boot/kernel
     
             if [ "$(readlink -f /boot/kernel/kernel.gz)" != "/boot/kfreebsd-$RELEASE.gz" ] ; then
                 rm -f /boot/kernel/kernel.old.gz

Modified: trunk/kfreebsd-8/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/904_dev_full.diff	2009-09-13 08:10:16 UTC (rev 2789)
+++ trunk/kfreebsd-8/debian/patches/904_dev_full.diff	2009-09-14 07:37:59 UTC (rev 2790)
@@ -1,5 +1,6 @@
 
-Status: Rejected in upstream (kern/68961)
+Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
+	/dev/full already rejected in upstream (kern/68961)
 
 --- src.orig/sys/dev/null/null.c
 +++ src/sys/dev/null/null.c
@@ -35,7 +36,7 @@
  static struct cdevsw zero_cdevsw = {
  	.d_version =	D_VERSION,
  	.d_read =	zero_read,
-@@ -81,6 +92,15 @@
+@@ -81,11 +92,25 @@
  
  /* ARGSUSED */
  static int
@@ -46,11 +47,21 @@
 +	return (ENOSPC);
 +}
 +
++#include <sys/filio.h>
 +/* ARGSUSED */
 +static int
  null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused,
      int flags __unused, struct thread *td)
  {
+ 	int error;
+ 
++	if (cmd == FIONBIO)
++		return 0;
++	if ((cmd == FIOASYNC) && ((*(int *)data) == 0))
++		return 0;
+ 	if (cmd != DIOCSKERNELDUMP)
+ 		return (ENOIOCTL);
+ 	error = priv_check(td, PRIV_SETDUMPER);
 @@ -117,12 +137,15 @@
  		zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
  		null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT,

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2009-09-13 08:10:16 UTC (rev 2789)
+++ trunk/kfreebsd-8/debian/patches/series	2009-09-14 07:37:59 UTC (rev 2790)
@@ -19,5 +19,6 @@
 910_GENERIC_hints.diff
 912_binutils.diff
 913_uudecode.diff
+914_psm.diff
 950_no_stack_protector.diff
 999_config.diff

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2009-09-13 08:10:16 UTC (rev 2789)
+++ trunk/kfreebsd-8/debian/rules	2009-09-14 07:37:59 UTC (rev 2790)
@@ -181,17 +181,14 @@
 	rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf
 	rm -rf $(IMAGE_PACKAGE)-$*/boot/defaults
 
-	# create /boot/kernel/ directory
-	mkdir -p $(IMAGE_PACKAGE)-$*/boot/kernel/
-
 	# remove device.hints (built into kernel)
 	rm -f $(IMAGE_PACKAGE)-$*/boot/device.hints
 
 	# README file
-	mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/doc/$(IMAGE_PACKAGE)-$*
+	mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/doc/kfreebsd-image-$(version)-$(abiname)-$*
 	install -p -o root -g root -m 644 \
 		debian/kfreebsd-image.README.Debian \
-		$(IMAGE_PACKAGE)-$*/usr/share/doc/$(IMAGE_PACKAGE)-$*/README.Debian
+		$(IMAGE_PACKAGE)-$*/usr/share/doc/kfreebsd-image-$(version)-$(abiname)-$*/README.Debian
 
 	# override file
 	mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides