2005-09-14 09:03:26 +00:00
|
|
|
diff --git a/init/version.c b/init/version.c
|
2006-05-25 17:28:45 +00:00
|
|
|
index 3ddc3ce..c2111a7 100644
|
2005-09-14 09:03:26 +00:00
|
|
|
--- a/init/version.c
|
|
|
|
+++ b/init/version.c
|
|
|
|
@@ -29,5 +29,15 @@ struct new_utsname system_utsname = {
|
|
|
|
EXPORT_SYMBOL(system_utsname);
|
|
|
|
|
|
|
|
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_SYSTEM_OFFICIAL
|
|
|
|
+ "(" LINUX_COMPILE_SYSTEM_DISTRIBUTION " "
|
|
|
|
+ LINUX_COMPILE_SYSTEM_VERSION ") "
|
|
|
|
+ "(" LINUX_COMPILE_SYSTEM_MAINTAINER ") "
|
|
|
|
+#else
|
|
|
|
+# ifdef LINUX_COMPILE_SYSTEM_VERSION
|
|
|
|
+ "(" LINUX_COMPILE_SYSTEM_VERSION ") "
|
|
|
|
+# endif
|
|
|
|
+ "(" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") "
|
|
|
|
+#endif
|
|
|
|
+ "(" LINUX_COMPILER ") " UTS_VERSION "\n";
|
2006-05-25 17:28:45 +00:00
|
|
|
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
|
2006-05-26 11:42:43 +00:00
|
|
|
index d7b8a38..87035a0 100755
|
2006-05-25 17:28:45 +00:00
|
|
|
--- a/scripts/mkcompile_h
|
|
|
|
+++ b/scripts/mkcompile_h
|
2006-05-26 11:42:43 +00:00
|
|
|
@@ -46,16 +46,34 @@ ( echo /\* This file is auto generated,
|
2006-05-25 17:28:45 +00:00
|
|
|
|
|
|
|
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
|
|
|
|
|
|
|
|
+ if [ -e debian/changelog ]; then
|
|
|
|
+ DISTRIBUTION=$(lsb_release -is 2>/dev/null)
|
|
|
|
+ DISTRIBUTION=${DISTRIBUTION:-Debian}
|
|
|
|
+ MAINTAINER=$(dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
|
|
|
|
+ VERSION=$(dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
|
|
|
|
+ echo \#define LINUX_COMPILE_SYSTEM_DISTRIBUTION \"$DISTRIBUTION\"
|
|
|
|
+ echo \#define LINUX_COMPILE_SYSTEM_MAINTAINER \"$MAINTAINER\"
|
|
|
|
+ echo \#define LINUX_COMPILE_SYSTEM_VERSION \"$VERSION\"
|
|
|
|
+ fi
|
|
|
|
+
|
2006-05-26 11:42:43 +00:00
|
|
|
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
|
2006-05-25 17:28:45 +00:00
|
|
|
+ if [ -e debian/official ]; then
|
|
|
|
+ echo \#define LINUX_COMPILE_SYSTEM_OFFICIAL
|
2006-05-26 11:42:43 +00:00
|
|
|
+ echo \#define LINUX_COMPILE_BY \"unknown\"
|
|
|
|
+ echo \#define LINUX_COMPILE_HOST \"$DISTRIBUTION\"
|
|
|
|
echo \#define LINUX_COMPILE_DOMAIN
|
|
|
|
+ else
|
2006-05-25 17:28:45 +00:00
|
|
|
+ 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`\"
|