[Glibc-bsd-commits] r5724 - trunk/kfreebsd-11/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-07-07 21:40:14 +0000 (Tue, 07 Jul 2015)
New Revision: 5724

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/rules
Log:
* In get-orig-source, svn export with --ignore-keywords so that
  revision tags do not fuzzy the patches
* Match on exact CLANG_VERSION used upstream (3.6.1) in the
  debian/rules check


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2015-07-07 20:25:41 UTC (rev 5723)
+++ trunk/kfreebsd-11/debian/changelog	2015-07-07 21:40:14 UTC (rev 5724)
@@ -1,4 +1,4 @@
-kfreebsd-11 (11.0~svn273432-1) UNRELEASED; urgency=medium
+kfreebsd-11 (11.0~svn285254-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot of -CURRENT
     - Fix for EN-14:05:
@@ -8,6 +8,8 @@
       (Closes: #748745)
     - Fix memory leak in sandboxed namei lookup. [SA-14:22]
       (CVE-2014-3711) (Closes: #766279)
+    - :TODO:
+  * Build kernel images only on kfreebsd-any arches.
   * DEB_HOST_ARCH_CPU on armel is arm;  update debian/rules detection
     and thereby correctly specify any-arm in debian/control too.
   * Build with clang-3.6 on i386, amd64, arm;  due to clang-3.4
@@ -22,7 +24,8 @@
     and directories in the tarball are not writable by the src
     group, but readable by all, regardless of the umask setting
     when the package is built. (Closes: #791584)
-  * Build kernel images only on kfreebsd-any arches.
+  * In get-orig-source, svn export with --ignore-keywords so that
+    revision tags do not fuzzy the patches
   * Add myself to Uploaders.
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 07 Jul 2015 21:00:25 +0100

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2015-07-07 20:25:41 UTC (rev 5723)
+++ trunk/kfreebsd-11/debian/rules	2015-07-07 21:40:14 UTC (rev 5724)
@@ -65,7 +65,7 @@
 # Clang is the default compiler on these architectures (see src/share/mk/src.opts.mk)
 clang_cpus	:= i386 amd64 arm
 
-ifneq ($(clang_version), 3.6)
+ifneq ($(clang_version), 3.6.1)
 $(error Upstream is now using a different Clang version than we expected. Consider updating cc_pkg and cc_cmd)
 endif
 
@@ -91,7 +91,7 @@
 
 get-orig-source:
 	rm -rf $(ORIG_DIR)
-	svn export -r $(svn_revision) $(SVN)/sys $(ORIG_DIR)/sys
+	svn export --ignore-keywords -r $(svn_revision) $(SVN)/sys $(ORIG_DIR)/sys
 	# The Clang version used by upstream
 	svn cat -r $(svn_revision) $(SVN)/lib/clang/include/clang/Basic/Version.inc \
 		| sed -ne 's/.*\sCLANG_VERSION\s\+//p' \