summaryrefslogtreecommitdiff
path: root/debian/patches/debian/version.patch
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2010-07-04 20:11:06 +0000
committerBen Hutchings <benh@debian.org>2010-07-04 20:11:06 +0000
commit0c747108a8f6dcca9d37b5a9320689e93cfd8a11 (patch)
tree9521557d52ee138a8cec6180b9558380a7721d35 /debian/patches/debian/version.patch
parent39f01da48865f66d4da955c77a4a19f91a336d20 (diff)
Update to upstream release candidate 2.6.35-rc3
Refresh/remove patches as appropriate. Add patches for SD7220 firmware in ip_qib where it moved from ipath. svn path=/dists/trunk/linux-2.6/; revision=15933
Diffstat (limited to 'debian/patches/debian/version.patch')
-rw-r--r--debian/patches/debian/version.patch13
1 files changed, 4 insertions, 9 deletions
diff --git a/debian/patches/debian/version.patch b/debian/patches/debian/version.patch
index 2037982f0..63bf4020e 100644
--- a/debian/patches/debian/version.patch
+++ b/debian/patches/debian/version.patch
@@ -1,8 +1,6 @@
-diff --git a/init/version.c b/init/version.c
-index 9d17d70..ef8aa6e 100644
--- a/init/version.c
+++ b/init/version.c
-@@ -33,12 +33,31 @@ struct uts_namespace init_uts_ns = {
+@@ -36,12 +36,31 @@ struct uts_namespace init_uts_ns = {
};
EXPORT_SYMBOL_GPL(init_uts_ns);
@@ -37,20 +35,17 @@ index 9d17d70..ef8aa6e 100644
" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+#endif
" (" LINUX_COMPILER ") %s\n";
-diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
-index 82d0af4..d8e0d05 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
-@@ -47,19 +47,34 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
+@@ -64,18 +64,34 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
- echo \#define LINUX_COMPILE_BY \"`whoami`\"
- echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
-- if [ -x /bin/dnsdomainname ]; then
-- domain=`dnsdomainname 2> /dev/null`
-- elif [ -x /bin/domainname ]; then
+- domain=`dnsdomainname 2> /dev/null`
+- if [ -z "$domain" ]; then
- domain=`domainname 2> /dev/null`
- fi
-