[Pkg-xen-changes] [xen] 03/30: version
Bastian Blank
waldi at moszumanska.debian.org
Sun May 31 20:14:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
waldi pushed a commit to branch develop
in repository xen.
commit bc6195d65e5765928d9ab890b1bff72701e9ff23
Author: Bastian Blank <waldi at debian.org>
Date: Sat Jul 5 11:46:43 2014 +0200
version
Patch-Name: version.diff
---
xen/Makefile | 11 +++++------
xen/common/kernel.c | 4 ++--
xen/common/version.c | 21 +++++++++++----------
xen/drivers/char/console.c | 9 +++------
xen/include/xen/compile.h.in | 8 ++++----
xen/include/xen/version.h | 8 ++++----
6 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/xen/Makefile b/xen/Makefile
index 5720393..11c7369 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -125,20 +125,19 @@ delete-unfresh-files:
@mv -f $@.tmp $@
# compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
-include/xen/compile.h: include/xen/compile.h.in .banner
+include/xen/compile.h: include/xen/compile.h.in
@sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \
-e 's/@@time@@/$(shell LC_ALL=C date +%T)/g' \
- -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \
- -e 's/@@domain@@/$(XEN_DOMAIN)/g' \
- -e 's/@@hostname@@/$(shell hostname)/g' \
-e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \
-e 's/@@version@@/$(XEN_VERSION)/g' \
-e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
-e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
-e 's!@@changeset@@!$(shell tools/scmversion $(XEN_ROOT) || echo "unavailable")!g' \
+ -e 's/@@system_distribution@@/$(shell lsb_release -is)/g' \
+ -e 's/@@system_maintainer_domain@@/$(shell cd ../../../..; dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<[^@>]*@\([^>]*\)>,\1,p')/g' \
+ -e 's/@@system_maintainer_local@@/$(shell cd ../../../..; dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^@>]*\)@.*>,\1,p')/g' \
+ -e 's/@@system_version@@/$(shell cd ../../../..; dpkg-parsechangelog | awk '/^Version:/ {print $$2}')/g' \
< include/xen/compile.h.in > $@.new
- @cat .banner
- @$(PYTHON) tools/fig-to-oct.py < .banner >> $@.new
@mv -f $@.new $@
include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index bafd44f..4a140ad 100644
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -254,8 +254,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
memset(&info, 0, sizeof(info));
safe_strcpy(info.compiler, xen_compiler());
- safe_strcpy(info.compile_by, xen_compile_by());
- safe_strcpy(info.compile_domain, xen_compile_domain());
+ safe_strcpy(info.compile_by, xen_compile_system_maintainer_local());
+ safe_strcpy(info.compile_domain, xen_compile_system_maintainer_domain());
safe_strcpy(info.compile_date, xen_compile_date());
if ( copy_to_guest(arg, &info, 1) )
return -EFAULT;
diff --git a/xen/common/version.c b/xen/common/version.c
index b152e27..7b5af55 100644
--- a/xen/common/version.c
+++ b/xen/common/version.c
@@ -11,19 +11,24 @@ const char *xen_compile_time(void)
return XEN_COMPILE_TIME;
}
-const char *xen_compile_by(void)
+const char *xen_compile_system_distribution(void)
{
- return XEN_COMPILE_BY;
+ return XEN_COMPILE_SYSTEM_DISTRIBUTION;
}
-const char *xen_compile_domain(void)
+const char *xen_compile_system_maintainer_local(void)
{
- return XEN_COMPILE_DOMAIN;
+ return XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL;
}
-const char *xen_compile_host(void)
+const char *xen_compile_system_maintainer_domain(void)
{
- return XEN_COMPILE_HOST;
+ return XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN;
+}
+
+const char *xen_compile_system_version(void)
+{
+ return XEN_COMPILE_SYSTEM_VERSION;
}
const char *xen_compiler(void)
@@ -51,7 +56,3 @@ const char *xen_changeset(void)
return XEN_CHANGESET;
}
-const char *xen_banner(void)
-{
- return XEN_BANNER;
-}
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 0b8d3d4..99507df 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -727,14 +727,11 @@ void __init console_init_preirq(void)
serial_set_rx_handler(sercon_handle, serial_rx);
/* HELLO WORLD --- start-of-day banner text. */
- spin_lock(&console_lock);
- __putstr(xen_banner());
- spin_unlock(&console_lock);
- printk("Xen version %d.%d%s (%s@%s) (%s) debug=%c %s\n",
+ printk("Xen version %d.%d%s (%s %s) (%s@%s) (%s) debug=%c %s\n",
xen_major_version(), xen_minor_version(), xen_extra_version(),
- xen_compile_by(), xen_compile_domain(),
+ xen_compile_system_distribution(), xen_compile_system_version(),
+ xen_compile_system_maintainer_local(), xen_compile_system_maintainer_domain(),
xen_compiler(), debug_build() ? 'y' : 'n', xen_compile_date());
- printk("Latest ChangeSet: %s\n", xen_changeset());
if ( opt_sync_console )
{
diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in
index 440ecb2..0c3ca58 100644
--- a/xen/include/xen/compile.h.in
+++ b/xen/include/xen/compile.h.in
@@ -1,8 +1,9 @@
#define XEN_COMPILE_DATE "@@date@@"
#define XEN_COMPILE_TIME "@@time@@"
-#define XEN_COMPILE_BY "@@whoami@@"
-#define XEN_COMPILE_DOMAIN "@@domain@@"
-#define XEN_COMPILE_HOST "@@hostname@@"
+#define XEN_COMPILE_SYSTEM_DISTRIBUTION "@@system_distribution@@"
+#define XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN "@@system_maintainer_domain@@"
+#define XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL "@@system_maintainer_local@@"
+#define XEN_COMPILE_SYSTEM_VERSION "@@system_version@@"
#define XEN_COMPILER "@@compiler@@"
#define XEN_VERSION @@version@@
@@ -10,4 +11,3 @@
#define XEN_EXTRAVERSION "@@extraversion@@"
#define XEN_CHANGESET "@@changeset@@"
-#define XEN_BANNER \
diff --git a/xen/include/xen/version.h b/xen/include/xen/version.h
index 81a3c7d..c25937e 100644
--- a/xen/include/xen/version.h
+++ b/xen/include/xen/version.h
@@ -3,14 +3,14 @@
const char *xen_compile_date(void);
const char *xen_compile_time(void);
-const char *xen_compile_by(void);
-const char *xen_compile_domain(void);
-const char *xen_compile_host(void);
+const char *xen_compile_system_distribution(void);
+const char *xen_compile_system_maintainer_domain(void);
+const char *xen_compile_system_maintainer_local(void);
+const char *xen_compile_system_version(void);
const char *xen_compiler(void);
unsigned int xen_major_version(void);
unsigned int xen_minor_version(void);
const char *xen_extra_version(void);
const char *xen_changeset(void);
-const char *xen_banner(void);
#endif /* __XEN_VERSION_H__ */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git
More information about the Pkg-xen-changes
mailing list