linux/debian/patches/debian/version.patch

86 lines
3.0 KiB
Diff

--- 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_UPLOADER ")"
+#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_UPLOADER ")"
+#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
@@ -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`\"
- domain=`dnsdomainname 2> /dev/null`
- if [ -z "$domain" ]; then
- domain=`domainname 2> /dev/null`
- fi
-
- if [ -n "$domain" ]; then
- echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\"
- else
- echo \#define LINUX_COMPILE_DOMAIN
+ 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_UPLOADER \"$DISTRIBUTION_UPLOADER\"
+ 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 \"`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
+ echo \#define LINUX_COMPILE_DOMAIN
+ fi
fi
echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"