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

[Robert Millan]

Author: rmh
Date: 2011-07-08 16:01:47 +0000 (Fri, 08 Jul 2011)
New Revision: 3547

Removed:
   trunk/kfreebsd-9/debian/patches/008_config.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/999_firmware.diff
   trunk/kfreebsd-9/debian/patches/series
   trunk/kfreebsd-9/debian/rules
Log:
  * New upstream snapshot.
    - Refresh all patches.

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-07-08 14:01:19 UTC (rev 3546)
+++ trunk/kfreebsd-9/debian/changelog	2011-07-08 16:01:47 UTC (rev 3547)
@@ -1,10 +1,14 @@
-kfreebsd-9 (9.0~svn223728-3) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn223870-1) experimental; urgency=low
 
+  * New upstream snapshot.
+    - Refresh all patches.
+
+  [ Robert Millan ]
   * Only depend on freebsd-utils and kldutils on [kfreebsd-any].
   * 002_maxpathlen.diff: Fix FTBFS on hurd-i386.
   * Remove versioned dependency that confused buildds.
 
- -- Robert Millan <rmh at debian.org>  Fri, 08 Jul 2011 15:55:02 +0200
+ -- Robert Millan <rmh at debian.org>  Fri, 08 Jul 2011 16:36:10 +0200
 
 kfreebsd-9 (9.0~svn223728-2) experimental; urgency=low
 

Deleted: trunk/kfreebsd-9/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/008_config.diff	2011-07-08 14:01:19 UTC (rev 3546)
+++ trunk/kfreebsd-9/debian/patches/008_config.diff	2011-07-08 16:01:47 UTC (rev 3547)
@@ -1,28 +0,0 @@
-
-Sent to freebsd-hackers (2011-07-02)
-
---- a/usr.sbin/config/main.c
-+++ b/usr.sbin/config/main.c
-@@ -591,7 +591,11 @@
- 	if ((dirp = opendir(p)) == NULL)
- 		err(EX_OSERR, "opendir %s", p);
- 	while ((dp = readdir(dirp)) != NULL) {
-+#ifdef _DIRENT_HAVE_D_NAMLEN
- 		i = dp->d_namlen - 2;
-+#else
-+		i = strlen (dp->d_name) - 2;
-+#endif
- 		/* Skip non-headers */
- 		if (dp->d_name[i] != '.' || dp->d_name[i + 1] != 'h')
- 			continue;
---- a/usr.sbin/config/Makefile
-+++ b/usr.sbin/config/Makefile
-@@ -12,7 +12,7 @@
- CFLAGS+= -I. -I${.CURDIR}
- 
- DPADD=	${LIBL} ${LIBSBUF}
--LDADD=	-ll -lsbuf
-+LDADD=	-ll -lsbuf -lbsd
- 
- CLEANFILES+=	kernconf.c
- 

Modified: trunk/kfreebsd-9/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_firmware.diff	2011-07-08 14:01:19 UTC (rev 3546)
+++ trunk/kfreebsd-9/debian/patches/999_firmware.diff	2011-07-08 16:01:47 UTC (rev 3547)
@@ -481,7 +481,7 @@
  dev/uart/uart_bus_acpi.c	optional uart acpi
  #dev/uart/uart_bus_cbus.c	optional uart cbus
  dev/uart/uart_bus_ebus.c	optional uart ebus
-@@ -1914,17 +1549,15 @@
+@@ -1914,18 +1549,16 @@
  dev/usb/net/if_cdce.c		optional cdce
  dev/usb/net/if_cue.c		optional cue
  dev/usb/net/if_ipheth.c		optional ipheth
@@ -489,6 +489,7 @@
  dev/usb/net/if_mos.c		optional mos
  dev/usb/net/if_rue.c		optional rue
  dev/usb/net/if_udav.c		optional udav
+ dev/usb/net/if_usie.c		optional usie
 -dev/usb/net/usb_ethernet.c	optional aue | axe | cdce | cue | kue | mos | \
 +dev/usb/net/usb_ethernet.c	optional aue | axe | cdce | cue | mos | \
  					 rue | udav
@@ -500,7 +501,7 @@
  dev/usb/wlan/if_run.c		optional run
  runfw.c				optional runfw							\
  	compile-with	"${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw -c${.TARGET}"	\
-@@ -1940,11 +1573,9 @@
+@@ -1941,11 +1574,9 @@
  	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/run/rt2870.fw.uu"		\
  	no-obj no-implicit-rule									\
  	clean		"runfw"
@@ -737,8 +738,8 @@
  
  SUBDIR = usb
  SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci}
--SUBDIR += rum run uath upgt ural zyd ${_urtw}
-+SUBDIR += run upgt ural ${_urtw}
+-SUBDIR += rum run uath upgt usie ural zyd ${_urtw}
++SUBDIR += run upgt usie ural ${_urtw}
  SUBDIR += atp uhid ukbd ums udbp ufm uep
  SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
  	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-07-08 14:01:19 UTC (rev 3546)
+++ trunk/kfreebsd-9/debian/patches/series	2011-07-08 16:01:47 UTC (rev 3547)
@@ -3,7 +3,6 @@
 003_glibc_dev_aicasm.diff
 004_xargs.diff
 007_clone_signals.diff
-008_config.diff
 #009_disable_duped_modules.diff
 013_ip_packed.diff
 020_linker.diff 

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-07-08 14:01:19 UTC (rev 3546)
+++ trunk/kfreebsd-9/debian/rules	2011-07-08 16:01:47 UTC (rev 3547)
@@ -139,7 +139,7 @@
 config-stamp: src
 	rm -rf config
 	cp -af src/usr.sbin/config config
-	CFLAGS="-D__va_list=__builtin_va_list $(shell pkg-config --cflags libbsd-overlay)" $(MAKE) -C config
+	CFLAGS="-D__va_list=__builtin_va_list $(shell pkg-config --cflags libbsd-overlay) -lbsd" $(MAKE) -C config
 	touch $@
 
 build-arch: $(foreach flavor,$(flavours),build-flavor-$(flavor)-stamp)