[Glibc-bsd-commits] r5517 - in branches/experimental/kfreebsd-10/debian: . patches

stevenc-guest at alioth.debian.org stevenc-guest at alioth.debian.org
Tue Sep 9 17:59:15 UTC 2014 

Author: stevenc-guest
Date: 2014-09-09 17:59:15 +0000 (Tue, 09 Sep 2014)
New Revision: 5517

Removed:
   branches/experimental/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
Modified:
   branches/experimental/kfreebsd-10/debian/changelog
   branches/experimental/kfreebsd-10/debian/patches/107_mount_update.diff
   branches/experimental/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
   branches/experimental/kfreebsd-10/debian/patches/999_config.diff
   branches/experimental/kfreebsd-10/debian/patches/series
   branches/experimental/kfreebsd-10/debian/rules
Log:
* New upstream snapshot of 10.1-PRERELEASE
  - Improves performance of vt(4) on vga (Closes: #755739)
* Use the new 'make firmware' target to rebuild aic7xxx firmware from
  sources, no longer done upstream but required per the DFSG
* Drop obsolete patch
  - 003_glibc_dev_aicasm.diff
* Refresh patches
  - userland.diff
  - 107_mount_update.diff
  - 917_disable_kgssapi.diff
  - 999_config.diff


Modified: branches/experimental/kfreebsd-10/debian/changelog
===================================================================
--- branches/experimental/kfreebsd-10/debian/changelog	2014-09-03 13:45:22 UTC (rev 5516)
+++ branches/experimental/kfreebsd-10/debian/changelog	2014-09-09 17:59:15 UTC (rev 5517)
@@ -1,12 +1,24 @@
-kfreebsd-10 (10.1~svn270273-3) UNRELEASED; urgency=medium
+kfreebsd-10 (10.1~svn271306-1) UNRELEASED; urgency=medium
 
+  [ Steven Chamberlain ]
+  * New upstream snapshot of 10.1-PRERELEASE
+    - Improves performance of vt(4) on vga (Closes: #755739)
+  * Use the new 'make firmware' target to rebuild aic7xxx firmware from
+    sources, no longer done upstream but required per the DFSG
+  * Drop obsolete patch
+    - 003_glibc_dev_aicasm.diff
+  * Refresh patches
+    - userland.diff
+    - 107_mount_update.diff
+    - 917_disable_kgssapi.diff
+    - 999_config.diff
   * Improve build reproducibility:
     - remove last remaining occurrences of the full build path from the
       output files
     - use brandelf to give kernel modules the ELF ABI number for
       FreeBSD, even when building on Linux
 
- -- Steven Chamberlain <steven at pyro.eu.org>  Wed, 27 Aug 2014 05:13:07 +0100
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Tue, 09 Sep 2014 12:52:07 +0100
 
 kfreebsd-10 (10.1~svn270273-2) experimental; urgency=medium
 

Deleted: branches/experimental/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff	2014-09-03 13:45:22 UTC (rev 5516)
+++ branches/experimental/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff	2014-09-09 17:59:15 UTC (rev 5517)
@@ -1,23 +0,0 @@
-
-Partially sent to freebsd-hackers (2011-07-02)
-
---- a/sys/dev/aic7xxx/aicasm/Makefile
-+++ b/sys/dev/aic7xxx/aicasm/Makefile
-@@ -16,6 +16,9 @@
- DPADD=	${LIBL}
- LDADD=	-ll
- WARNS?=	5
-+NO_WERROR?=	1
-+LDADD+= -ldb -lbsd
-+CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd
- 
- # Correct path for kernel builds
- # Don't rely on the kernel's .depend file
-@@ -24,7 +27,6 @@
- DEPENDFILE=	.depend_aicasm
- .endif
- 
--CFLAGS+= -I.
- .ifdef MAKESRCPATH
- CFLAGS+= -I${MAKESRCPATH}
- .endif

Modified: branches/experimental/kfreebsd-10/debian/patches/107_mount_update.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/107_mount_update.diff	2014-09-03 13:45:22 UTC (rev 5516)
+++ branches/experimental/kfreebsd-10/debian/patches/107_mount_update.diff	2014-09-09 17:59:15 UTC (rev 5517)
@@ -7,7 +7,7 @@
 
 --- a/sys/kern/vfs_mount.c
 +++ b/sys/kern/vfs_mount.c
-@@ -652,6 +652,24 @@
+@@ -656,6 +656,24 @@
  	}
  
  	/*

Modified: branches/experimental/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2014-09-03 13:45:22 UTC (rev 5516)
+++ branches/experimental/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2014-09-09 17:59:15 UTC (rev 5517)
@@ -1,6 +1,6 @@
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -178,8 +178,6 @@
+@@ -181,8 +181,6 @@
  	jme \
  	joy \
  	kbdmux \

Modified: branches/experimental/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/999_config.diff	2014-09-03 13:45:22 UTC (rev 5516)
+++ branches/experimental/kfreebsd-10/debian/patches/999_config.diff	2014-09-09 17:59:15 UTC (rev 5517)
@@ -2,7 +2,7 @@
 +++ b/sys/amd64/conf/GENERIC
 @@ -18,8 +18,8 @@
  #
- # $FreeBSD: stable/10/sys/amd64/conf/GENERIC 268813 2014-07-17 22:31:46Z imp $
+ # $FreeBSD: stable/10/sys/amd64/conf/GENERIC 271234 2014-09-07 18:43:26Z markj $
  
 -cpu		HAMMER
 -ident		GENERIC
@@ -24,7 +24,7 @@
 +++ b/sys/i386/conf/GENERIC
 @@ -18,10 +18,10 @@
  #
- # $FreeBSD: stable/10/sys/i386/conf/GENERIC 268813 2014-07-17 22:31:46Z imp $
+ # $FreeBSD: stable/10/sys/i386/conf/GENERIC 271234 2014-09-07 18:43:26Z markj $
  
 -cpu		I486_CPU
 -cpu		I586_CPU

Modified: branches/experimental/kfreebsd-10/debian/patches/series
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/series	2014-09-03 13:45:22 UTC (rev 5516)
+++ branches/experimental/kfreebsd-10/debian/patches/series	2014-09-09 17:59:15 UTC (rev 5517)
@@ -8,7 +8,6 @@
 userland.diff
 001_misc.diff
 002_maxpathlen.diff
-003_glibc_dev_aicasm.diff
 004_xargs.diff
 #007_clone_signals.diff
 #009_disable_duped_modules.diff

Modified: branches/experimental/kfreebsd-10/debian/rules
===================================================================
--- branches/experimental/kfreebsd-10/debian/rules	2014-09-03 13:45:22 UTC (rev 5516)
+++ branches/experimental/kfreebsd-10/debian/rules	2014-09-09 17:59:15 UTC (rev 5517)
@@ -207,6 +207,10 @@
 	cd $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/conf \
 		&& config $(configfile)
 
+	# We must rebuild firmware from sources, per the DFSG
+	CFLAGS='-D_GNU_SOURCE -isystem /usr/include/freebsd' LDFLAGS='-ldb -lbsd' \
+	 $(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/modules/aic7xxx/ firmware
+
 	# Build it
 	$(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/ depend
 	$(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/

More information about the Glibc-bsd-commits mailing list