debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* debian/patches/debian/version.patch: Don't rely on version.Debian. 

* debian/rules.real: Export version into the build.

svn path=/dists/trunk/linux-2.6/; revision=8536
This commit is contained in:
Bastian Blank 2007-05-01 16:23:01 +00:00
parent 8bdd86a764
commit 258c5cc7f0
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
debian/patches/debian/version.patch vendored
View File

@ -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 @@ index 6c01ec1..831993d 100644
+#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 @@ index d7b8a38..540df31 100755
- 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 @@ index d7b8a38..540df31 100755
+ 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`\"

2
debian/rules.real vendored
View File

@ -52,7 +52,7 @@ ifdef DEBIAN_KERNEL_JOBS
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