[kernel] r6704 - dists/trunk/linux-2.6/debian/patches

[Bastian Blank]

Author: waldi
Date: Thu May 25 17:28:45 2006
New Revision: 6704

Modified:
   dists/trunk/linux-2.6/debian/patches/version.patch

Log:
debian/patches/version.patch: Update.


Modified: dists/trunk/linux-2.6/debian/patches/version.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/version.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/version.patch	Thu May 25 17:28:45 2006
@@ -1,57 +1,5 @@
-Attach informations from debian/changelog to compile.h.
-
----
-commit 932fa20ce2db25e496f6aedf6f624e939f3dafa8
-tree 87ebceaf3f1a47f9fafef53ad36510fab9cf3d5f
-parent 05dbb1e557b392c8cef3675b4ba6497794ad4124
-author Bastian Blank <waldi at debian.org> Tue, 13 Sep 2005 22:03:33 +0000
-committer Bastian Blank <waldi at debian.org> Tue, 13 Sep 2005 22:03:33 +0000
-
- scripts/mkcompile_h |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
---- a/scripts/mkcompile_h
-+++ b/scripts/mkcompile_h
-@@ -55,6 +55,19 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}
-   fi
- 
-   echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
-+
-+  if [ -e debian/changelog ]; then
-+    DISTRIBUTION=$(lsb_release -is 2>/dev/null)
-+    [ "$DISTRIBUTION" ] || DISTRIBUTION=Debian
-+    MAINTAINER=$(dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
-+    VERSION=$(dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-+    echo \#define LINUX_COMPILE_SYSTEM_DISTRIBUTION \"$DISTRIBUTION\"
-+    echo \#define LINUX_COMPILE_SYSTEM_MAINTAINER \"$MAINTAINER\"
-+    echo \#define LINUX_COMPILE_SYSTEM_VERSION \"$VERSION\"
-+    if [ -e debian/official ]; then
-+      echo \#define LINUX_COMPILE_SYSTEM_OFFICIAL
-+    fi
-+  fi
- ) > .tmpcompile
- 
- # Only replace the real compile.h if the new one is different,
-
-
-
-!-------------------------------------------------------------flip-
-
-
-Use debian packaging informations in version string.
-
----
-commit f9117a71c91d355243befb1a24bc557ea5d98e5b
-tree 30e508720f0783c2a93b9103edd5e710f81f7f34
-parent 932fa20ce2db25e496f6aedf6f624e939f3dafa8
-author Bastian Blank <waldi at debian.org> Tue, 13 Sep 2005 22:04:14 +0000
-committer Bastian Blank <waldi at debian.org> Tue, 13 Sep 2005 22:04:14 +0000
-
- init/version.c |   14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
 diff --git a/init/version.c b/init/version.c
+index 3ddc3ce..c2111a7 100644
 --- a/init/version.c
 +++ b/init/version.c
 @@ -29,5 +29,15 @@ struct new_utsname system_utsname = {
@@ -72,9 +20,47 @@
 +	"(" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") "
 +#endif
 +	"(" LINUX_COMPILER ") " UTS_VERSION "\n";
-
-
-
-!-------------------------------------------------------------flip-
-
-
+diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
+index d7b8a38..65b7991 100755
+--- a/scripts/mkcompile_h
++++ b/scripts/mkcompile_h
+@@ -46,16 +46,30 @@ ( echo /\* This file is auto generated, 
+ 
+   echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
+ 
+-  echo \#define LINUX_COMPILE_TIME \"`LC_ALL=C LANG=C date +%T`\"
+-  echo \#define LINUX_COMPILE_BY \"`whoami`\"
+-  echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
+-
+-  if [ -x /bin/dnsdomainname ]; then
+-    echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\"
+-  elif [ -x /bin/domainname ]; then
+-    echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\"
++  if [ -e debian/changelog ]; then
++    DISTRIBUTION=$(lsb_release -is 2>/dev/null)
++    DISTRIBUTION=${DISTRIBUTION:-Debian}
++    MAINTAINER=$(dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
++    VERSION=$(dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
++    echo \#define LINUX_COMPILE_SYSTEM_DISTRIBUTION \"$DISTRIBUTION\"
++    echo \#define LINUX_COMPILE_SYSTEM_MAINTAINER \"$MAINTAINER\"
++    echo \#define LINUX_COMPILE_SYSTEM_VERSION \"$VERSION\"
++  fi
++
++  if [ -e debian/official ]; then
++    echo \#define LINUX_COMPILE_SYSTEM_OFFICIAL
+   else
+-    echo \#define LINUX_COMPILE_DOMAIN
++    echo \#define LINUX_COMPILE_TIME \"`LC_ALL=C LANG=C date +%T`\"
++    echo \#define LINUX_COMPILE_BY \"`whoami`\"
++    echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
++
++    if [ -x /bin/dnsdomainname ]; then
++      echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\"
++    elif [ -x /bin/domainname ]; then
++      echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\"
++    else
++      echo \#define LINUX_COMPILE_DOMAIN
++    fi
+   fi
+ 
+   echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"