aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Blank <waldi@debian.org>2006-05-26 11:42:43 +0000
committerBastian Blank <waldi@debian.org>2006-05-26 11:42:43 +0000
commit4eddf826fee11ce3ad30bc782b33eba39aba4536 (patch)
tree3c44b16f6ae5f8f626147b446eeca52359f78b34
parent7d97d26a675fd675b784ed24f8e2bc93af1ba6b5 (diff)
downloadkernel_replicant_linux-4eddf826fee11ce3ad30bc782b33eba39aba4536.tar.gz
kernel_replicant_linux-4eddf826fee11ce3ad30bc782b33eba39aba4536.tar.bz2
kernel_replicant_linux-4eddf826fee11ce3ad30bc782b33eba39aba4536.zip
debian/patches/version.patch: Update.
svn path=/dists/trunk/linux-2.6/; revision=6707
-rw-r--r--debian/patches/version.patch28
1 files changed, 15 insertions, 13 deletions
diff --git a/debian/patches/version.patch b/debian/patches/version.patch
index 02ff5eefa218..d265ec2eb69e 100644
--- a/debian/patches/version.patch
+++ b/debian/patches/version.patch
@@ -21,21 +21,13 @@ index 3ddc3ce..c2111a7 100644
+#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 @@ index d7b8a38..65b7991 100755
+ 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`\"
+