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

[Bastian Blank]

Author: waldi
Date: Fri May 26 11:42:43 2006
New Revision: 6707

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	Fri May 26 11:42:43 2006
@@ -21,21 +21,13 @@
 +#endif
 +	"(" LINUX_COMPILER ") " UTS_VERSION "\n";
 diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
-index d7b8a38..65b7991 100755
+index d7b8a38..87035a0 100755
 --- a/scripts/mkcompile_h
 +++ b/scripts/mkcompile_h
-@@ -46,16 +46,30 @@ ( echo /\* This file is auto generated, 
+@@ -46,16 +46,34 @@ ( 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}
@@ -46,11 +38,21 @@
 +    echo \#define LINUX_COMPILE_SYSTEM_VERSION \"$VERSION\"
 +  fi
 +
+   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
 +  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 \"unknown\"
++    echo \#define LINUX_COMPILE_HOST \"$DISTRIBUTION\"
+     echo \#define LINUX_COMPILE_DOMAIN
++  else
 +    echo \#define LINUX_COMPILE_BY \"`whoami`\"
 +    echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
 +