[Glibc-bsd-commits] r3443 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-06-15 12:28:16 +0000 (Wed, 15 Jun 2011)
New Revision: 3443

Added:
   trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/control.in
   trunk/kfreebsd-9/debian/kfreebsd-image.overrides
   trunk/kfreebsd-9/debian/patches/series
   trunk/kfreebsd-9/debian/rules
Log:
resync with kfreebsd-8

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-06-14 13:51:08 UTC (rev 3442)
+++ trunk/kfreebsd-9/debian/changelog	2011-06-15 12:28:16 UTC (rev 3443)
@@ -7,6 +7,13 @@
     - Remove patch target in debian/rules.
     - Remove now unneeded README.source.
 
+  [ Robert Millan ]
+  * Add lintian override for "embedded-library" (zlib.ko).
+  * Automatically propagate GCC version dependency to debian/control.
+
+  [ Petr Salinger ]
+  * Add 111_linprocfs_kthread.diff. Closes #630104.
+
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 19 Feb 2011 23:01:52 +0100
 
 kfreebsd-8 (8.2-1) unstable; urgency=low

Modified: trunk/kfreebsd-9/debian/control.in
===================================================================
--- trunk/kfreebsd-9/debian/control.in	2011-06-14 13:51:08 UTC (rev 3442)
+++ trunk/kfreebsd-9/debian/control.in	2011-06-15 12:28:16 UTC (rev 3443)
@@ -7,7 +7,7 @@
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
  freebsd-buildutils (>= 8.1-2) [!kfreebsd-any] | freebsd-buildutils (>= 7) [kfreebsd-any],
- gcc-4.3, libdb-dev,
+ gcc- at gcc_version@, libdb-dev,
  libbsd-dev, libsbuf-dev
 Standards-Version: 3.9.2
 

Modified: trunk/kfreebsd-9/debian/kfreebsd-image.overrides
===================================================================
--- trunk/kfreebsd-9/debian/kfreebsd-image.overrides	2011-06-14 13:51:08 UTC (rev 3442)
+++ trunk/kfreebsd-9/debian/kfreebsd-image.overrides	2011-06-15 12:28:16 UTC (rev 3443)
@@ -1,3 +1,4 @@
 shlib-with-non-pic-code
 shared-lib-without-dependency-information
 embedded-zlib
+embedded-library

Added: trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff	2011-06-15 12:28:16 UTC (rev 3443)
@@ -0,0 +1,29 @@
+
+See #630104
+Submitted upstream as http://www.freebsd.org/cgi/query-pr.cgi?pr=157871
+
+
+--- a/sys/compat/linprocfs/linprocfs.c
++++ b/sys/compat/linprocfs/linprocfs.c
+@@ -1044,6 +1044,10 @@
+ 		PROC_UNLOCK(p);
+ 		return (ret);
+ 	}
++	if (p->p_flag & P_KTHREAD) {
++		PROC_UNLOCK(p);
++		return (0);
++	}
+ 	if (p->p_args != NULL) {
+ 		sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length);
+ 		PROC_UNLOCK(p);
+@@ -1068,6 +1072,10 @@
+ 		PROC_UNLOCK(p);
+ 		return (ret);
+ 	}
++	if (p->p_flag & P_KTHREAD) {
++		PROC_UNLOCK(p);
++		return (0);
++	}
+ 	PROC_UNLOCK(p);
+ 
+ 	ret = linprocfs_doargv(td, p, sb, ps_string_env);

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-06-14 13:51:08 UTC (rev 3442)
+++ trunk/kfreebsd-9/debian/patches/series	2011-06-15 12:28:16 UTC (rev 3443)
@@ -16,6 +16,7 @@
 108_teken_utf8_table.diff
 109_linprocfs_non_x86.diff
 110_disable_trampoline_flavour.diff
+111_linprocfs_kthread.diff
 200_xen.diff
 902_version.diff
 903_disable_non-free_drivers.diff 

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-06-14 13:51:08 UTC (rev 3442)
+++ trunk/kfreebsd-9/debian/rules	2011-06-15 12:28:16 UTC (rev 3443)
@@ -18,6 +18,7 @@
 configfile	:= DEBCUSTOM
 abiname		:= 0
 ld_target	:= $(shell ld --help | sed -ne "s/^ld: supported targets: \([^ ]*\) .*/\1/p")
+gcc_version	:= 4.3
 
 ifeq ($(cpu), mipsel)
 kfreebsd_cpu	:= mips
@@ -38,7 +39,7 @@
 FLAVOR_DIR	:= flavor-$(version)-$(abiname)
 ORIG_DIR	:= kfreebsd-$(major)-$(tar_version)
 ORIG_TAR	:= kfreebsd-$(major)_$(tar_version).orig.tar.gz
-MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) CC=gcc-4.3 WERROR=
+MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) CC=gcc-$(gcc_version) WERROR=
 PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
 
 get-orig-source:
@@ -51,7 +52,7 @@
 	rm -rf $(ORIG_DIR)
 
 control: clean
-	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
+	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@gcc_version@/$(gcc_version)/g" \
 		$(CURDIR)/debian/control.in > $(CURDIR)/debian/control
 	echo >> $(CURDIR)/debian/control
 	for arch in `ls $(CURDIR)/debian/arch/` ; do \