[kernel] r19287 - dists/sid/linux/debian/patches/debian

[Ben Hutchings]

Author: benh
Date: Mon Jul 23 23:22:18 2012
New Revision: 19287

Log:
Move pasting of package version information from init/version.c to mkcompile_h

We should be using this information elsewhere, which will be easier
if we don't have to use lots of #ifdefs.

Modified:
   dists/sid/linux/debian/patches/debian/version.patch

Modified: dists/sid/linux/debian/patches/debian/version.patch
==============================================================================
--- dists/sid/linux/debian/patches/debian/version.patch	Mon Jul 23 14:32:25 2012	(r19286)
+++ dists/sid/linux/debian/patches/debian/version.patch	Mon Jul 23 23:22:18 2012	(r19287)
@@ -22,7 +22,7 @@
 
 --- a/init/version.c
 +++ b/init/version.c
-@@ -37,12 +37,31 @@
+@@ -37,12 +37,12 @@ struct uts_namespace init_uts_ns = {
  };
  EXPORT_SYMBOL_GPL(init_uts_ns);
  
@@ -30,36 +30,18 @@
  const char linux_banner[] =
 -	"Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
 -	LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
-+	"Linux version " UTS_RELEASE
-+#ifdef LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
-+	" (" LINUX_COMPILE_DISTRIBUTION " "
-+	     LINUX_COMPILE_DISTRIBUTION_VERSION ")"
-+	" (" LINUX_COMPILE_DISTRIBUTION_MAINTAINER ")"
-+#else
-+# ifdef LINUX_COMPILE_DISTRIBUTION_VERSION
-+	" (" LINUX_COMPILE_DISTRIBUTION_VERSION ")"
-+# endif
-+	" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
-+#endif
-+	" (" LINUX_COMPILER ")"
-+	" " UTS_VERSION "\n";
++	"Linux version " UTS_RELEASE LINUX_PACKAGE_ID
++	LINUX_COMPILE_ID " (" LINUX_COMPILER ") " UTS_VERSION "\n";
  
  const char linux_proc_banner[] =
  	"%s version %s"
-+#ifdef LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
-+	" (" LINUX_COMPILE_DISTRIBUTION " "
-+	     LINUX_COMPILE_DISTRIBUTION_VERSION ")"
-+	" (" LINUX_COMPILE_DISTRIBUTION_MAINTAINER ")"
-+#else
-+# ifdef LINUX_COMPILE_DISTRIBUTION_VERSION
-+	" (" LINUX_COMPILE_DISTRIBUTION_VERSION ")"
-+# endif
- 	" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
-+#endif
+-	" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
++	LINUX_PACKAGE_ID
++	LINUX_COMPILE_ID
  	" (" LINUX_COMPILER ") %s\n";
 --- a/scripts/mkcompile_h
 +++ b/scripts/mkcompile_h
-@@ -73,8 +73,26 @@
+@@ -73,8 +73,25 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
  
    echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
  
@@ -67,23 +49,22 @@
 -  echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
 +  DISTRIBUTION=$(lsb_release -is 2>/dev/null)
 +  DISTRIBUTION=${DISTRIBUTION:-Debian}
-+  echo \#define LINUX_COMPILE_DISTRIBUTION \"$DISTRIBUTION\"
 +
 +  if [ "$DISTRIBUTION_OFFICIAL_BUILD" ]; then
-+    echo \#define LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
-+    echo \#define LINUX_COMPILE_DISTRIBUTION_MAINTAINER \"$DISTRIBUTION_MAINTAINER\"
-+    echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$DISTRIBUTION_VERSION\"
++    echo \#define LINUX_PACKAGE_ID \" \($DISTRIBUTION $DISTRIBUTION_VERSION\)\"
 +    echo \#define LINUX_COMPILE_BY \"unknown\"
 +    echo \#define LINUX_COMPILE_HOST \"$DISTRIBUTION\"
++    echo \#define LINUX_COMPILE_ID \" \($DISTRIBUTION_MAINTAINER\)\"
 +  else
 +    if [ -e version.$DISTRIBUTION ]; then
-+      echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$(cut -d" " -f1 version.$DISTRIBUTION)\"
++      DISTRIBUTION_VERSION=$(cut -d" " -f1 version.$DISTRIBUTION)
 +    else
-+      echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"unknown\"
++      DISTRIBUTION_VERSION=unknown
 +    fi
-+
++    echo \#define LINUX_PACKAGE_ID \" \($DISTRIBUTION_VERSION\)\"
 +    echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
 +    echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
++    echo \#define LINUX_COMPILE_ID \" \(\" LINUX_COMPILE_BY \"@\" LINUX_COMPILE_HOST \"\)\"
 +  fi
  
    echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"