90 lines
3.2 KiB
Diff
90 lines
3.2 KiB
Diff
From: Bastian Blank <waldi@debian.org>
|
|
Subject: Add debian version information to kernel version string
|
|
Date: Sun, 20 May 2007 11:46:51 +0200
|
|
|
|
Include the package version in /proc/version and the initial log
|
|
banner.
|
|
|
|
Determine the target distribution ($DISTRIBUTION) with lsb_release,
|
|
defaulting to Debian.
|
|
|
|
For distribution binary packages we assume
|
|
$DISTRIBUTION_OFFICIAL_BUILD is set. Add $DISTRIBUTION and
|
|
$DISTRIBUTION_VERSION after the kernel version (UTS_RELEASE), and
|
|
replace the account name used to build the package with
|
|
$DISTRIBUTION_UPLOADER.
|
|
|
|
[bwh: Changed $DISTRIBUTION_UPLOADER to $DISTRIBUTION_MAINTAINER.]
|
|
|
|
For custom packages built from a linux-source package, read the
|
|
package version from version.$DISTRIBUTION and add that after
|
|
the kernel version string.
|
|
|
|
--- a/init/version.c
|
|
+++ b/init/version.c
|
|
@@ -36,12 +36,31 @@ struct uts_namespace init_uts_ns = {
|
|
};
|
|
EXPORT_SYMBOL_GPL(init_uts_ns);
|
|
|
|
-/* FIXED STRINGS! Don't touch! */
|
|
const char linux_banner[] =
|
|
- "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
|
|
- LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
|
|
+ "Linux version " UTS_RELEASE
|
|
+#ifdef LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
|
|
+ " (" LINUX_COMPILE_DISTRIBUTION " "
|
|
+ LINUX_COMPILE_DISTRIBUTION_VERSION ")"
|
|
+ " (" LINUX_COMPILE_DISTRIBUTION_MAINTAINER ")"
|
|
+#else
|
|
+# ifdef LINUX_COMPILE_DISTRIBUTION_VERSION
|
|
+ " (" LINUX_COMPILE_DISTRIBUTION_VERSION ")"
|
|
+# endif
|
|
+ " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
|
|
+#endif
|
|
+ " (" LINUX_COMPILER ")"
|
|
+ " " UTS_VERSION "\n";
|
|
|
|
const char linux_proc_banner[] =
|
|
"%s version %s"
|
|
+#ifdef LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
|
|
+ " (" LINUX_COMPILE_DISTRIBUTION " "
|
|
+ LINUX_COMPILE_DISTRIBUTION_VERSION ")"
|
|
+ " (" LINUX_COMPILE_DISTRIBUTION_MAINTAINER ")"
|
|
+#else
|
|
+# ifdef LINUX_COMPILE_DISTRIBUTION_VERSION
|
|
+ " (" LINUX_COMPILE_DISTRIBUTION_VERSION ")"
|
|
+# endif
|
|
" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
|
|
+#endif
|
|
" (" LINUX_COMPILER ") %s\n";
|
|
--- a/scripts/mkcompile_h
|
|
+++ b/scripts/mkcompile_h
|
|
@@ -73,7 +73,25 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
|
|
|
|
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
|
|
|
|
- echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
|
|
- echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
|
|
+ DISTRIBUTION=$(lsb_release -is 2>/dev/null)
|
|
+ DISTRIBUTION=${DISTRIBUTION:-Debian}
|
|
+ echo \#define LINUX_COMPILE_DISTRIBUTION \"$DISTRIBUTION\"
|
|
+
|
|
+ if [ "$DISTRIBUTION_OFFICIAL_BUILD" ]; then
|
|
+ echo \#define LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
|
|
+ echo \#define LINUX_COMPILE_DISTRIBUTION_MAINTAINER \"$DISTRIBUTION_MAINTAINER\"
|
|
+ echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$DISTRIBUTION_VERSION\"
|
|
+ echo \#define LINUX_COMPILE_BY \"unknown\"
|
|
+ echo \#define LINUX_COMPILE_HOST \"$DISTRIBUTION\"
|
|
+ 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 \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
|
|
+ echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
|
|
+ fi
|
|
|
|
echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
|