[kernel] r8536 - in dists/trunk/linux-2.6/debian: . patches/debian

[Bastian Blank]

Author: waldi
Date: Tue May  1 16:23:01 2007
New Revision: 8536

Modified:
   dists/trunk/linux-2.6/debian/patches/debian/version.patch
   dists/trunk/linux-2.6/debian/rules.real
Log:
* debian/patches/debian/version.patch: Don't rely on version.Debian.
* debian/rules.real: Export version into the build.


Modified: dists/trunk/linux-2.6/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/version.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/version.patch	Tue May  1 16:23:01 2007
@@ -1,8 +1,8 @@
 diff --git a/init/version.c b/init/version.c
-index 6c01ec1..831993d 100644
+index 9d17d70..ef8aa6e 100644
 --- a/init/version.c
 +++ b/init/version.c
-@@ -34,12 +34,31 @@ struct uts_namespace init_uts_ns = {
+@@ -33,12 +33,31 @@ struct uts_namespace init_uts_ns = {
  };
  EXPORT_SYMBOL_GPL(init_uts_ns);
  
@@ -38,10 +38,10 @@
 +#endif
  	" (" LINUX_COMPILER ") %s\n";
 diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
-index d7b8a38..540df31 100755
+index 82d0af4..d8e0d05 100755
 --- a/scripts/mkcompile_h
 +++ b/scripts/mkcompile_h
-@@ -47,15 +47,32 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
+@@ -47,15 +47,35 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
    echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
  
    echo \#define LINUX_COMPILE_TIME \"`LC_ALL=C LANG=C date +%T`\"
@@ -55,19 +55,22 @@
 -  else
 +  DISTRIBUTION=$(lsb_release -is 2>/dev/null)
 +  DISTRIBUTION=${DISTRIBUTION:-Debian}
-+
-+  if [ -e version.$DISTRIBUTION ]; then
-+    echo \#define LINUX_COMPILE_DISTRIBUTION \"$DISTRIBUTION\"
-+    echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$(cut -d" " -f1 version.$DISTRIBUTION)\"
-+  fi
++  echo \#define LINUX_COMPILE_DISTRIBUTION \"$DISTRIBUTION\"
 +
 +  if [ "$DISTRIBUTION_OFFICIAL_BUILD" ]; then
 +    echo \#define LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
 +    echo \#define LINUX_COMPILE_DISTRIBUTION_UPLOADER \"$DISTRIBUTION_UPLOADER\"
++    echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$DISTRIBUTION_VERSION\"
 +    echo \#define LINUX_COMPILE_BY \"unknown\"
 +    echo \#define LINUX_COMPILE_HOST \"$DISTRIBUTION\"
      echo \#define LINUX_COMPILE_DOMAIN
 +  else
++    if [ -e version.$DISTRIBUTION ]; then
++      echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$(cut -d" " -f1 version.$DISTRIBUTION)\"
++    else
++      echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"unknown\"
++    fi
++
 +    echo \#define LINUX_COMPILE_BY \"`whoami`\"
 +    echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
 +
@@ -80,4 +83,4 @@
 +    fi
    fi
  
-   echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
+   echo \#define LINUX_COMPILER \"`LC_ALL=C LANG=C $CC -v 2>&1 | tail -n 1`\"

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Tue May  1 16:23:01 2007
@@ -52,7 +52,7 @@
   JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
 endif
 
-setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER)
+setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DISTRIBUTION_VERSION="$(SOURCEVERSION)"
 
 #
 # Targets