[Pkg-xen-changes] [xen] 01/01: Revert "Build depend on figlet and remove patches which previously avoided the in-tree copy."
Ian Campbell
ijc-guest at moszumanska.debian.org
Thu Jul 17 09:42:19 UTC 2014
This is an automated email from the git hooks/post-receive script.
ijc-guest pushed a commit to branch feature/4.4-updates
in repository xen.
commit 0941b7b75718fe1adc2476e1d069cfa192bab972
Author: Ian Campbell <ijc at hellion.org.uk>
Date: Thu Jul 17 10:41:40 2014 +0100
Revert "Build depend on figlet and remove patches which previously avoided the in-tree copy."
This reverts commit df5a4db50577adce62f32cfda32be4557aa79d26, reversing
changes made to 42a122753515cf191566e213ca9556d6146bbfe4.
---
debian/.git-dpm | 4 +-
debian/changelog | 2 -
debian/patches/0001-version.patch | 70 +++++++++++++++-------
debian/patches/0002-config-prefix.diff.patch | 2 +-
.../0003-tools-libfsimage-abiname.diff.patch | 2 +-
debian/patches/0004-tools-libxc-abiname.diff.patch | 2 +-
debian/patches/0005-tools-libxl-abiname.diff.patch | 2 +-
.../patches/0006-tools-xenstat-abiname.diff.patch | 2 +-
debian/patches/0007-tools-rpath.diff.patch | 2 +-
.../patches/0008-tools-blktap2-prefix.diff.patch | 2 +-
.../patches/0009-tools-console-prefix.diff.patch | 2 +-
.../0010-tools-libfsimage-prefix.diff.patch | 2 +-
.../patches/0011-tools-libfsimage-rpath.diff.patch | 2 +-
debian/patches/0012-tools-libxl-prefix.diff.patch | 2 +-
debian/patches/0013-tools-misc-prefix.diff.patch | 2 +-
debian/patches/0014-tools-misc-rpath.diff.patch | 2 +-
debian/patches/0015-tools-pygrub-prefix.diff.patch | 2 +-
debian/patches/0016-tools-python-prefix.diff.patch | 2 +-
debian/patches/0017-tools-python-rpath.diff.patch | 2 +-
debian/patches/0018-tools-xcutils-rpath.diff.patch | 2 +-
debian/patches/0019-tools-xenmon-prefix.diff.patch | 2 +-
debian/patches/0020-tools-xenmon-rpath.diff.patch | 2 +-
.../patches/0021-tools-xenpaging-prefix.diff.patch | 2 +-
.../patches/0022-tools-xenstat-prefix.diff.patch | 2 +-
debian/patches/0023-tools-xenstat-rpath.diff.patch | 2 +-
.../patches/0024-tools-xenstore-prefix.diff.patch | 2 +-
.../patches/0025-tools-xenstore-rpath.diff.patch | 2 +-
.../patches/0026-tools-xentrace-prefix.diff.patch | 2 +-
.../patches/0027-tools-xentrace-rpath.diff.patch | 2 +-
.../0028-tools-python-xen-relative-path.diff.patch | 2 +-
.../0029-tools-misc-xend-startup.diff.patch | 2 +-
debian/patches/0030-tools-disable.diff.patch | 2 +-
...-tools-examples-xend-disable-network.diff.patch | 2 +-
...ols-examples-xend-disable-relocation.diff.patch | 2 +-
...ools-pygrub-remove-static-solaris-support.patch | 2 +-
.../patches/0034-tools-include-install.diff.patch | 2 +-
.../patches/0035-tools-xenmon-install.diff.patch | 2 +-
.../0036-tools-hotplug-udevrules.diff.patch | 2 +-
.../patches/0037-tools-python-shebang.diff.patch | 2 +-
.../patches/0038-tools-ocaml-fix-build.diff.patch | 2 +-
.../0039-tools-xenstore-compatibility.diff.patch | 2 +-
debian/templates/control.source.in | 1 -
xen/Makefile | 4 +-
xen/common/version.c | 4 --
xen/drivers/char/console.c | 3 -
xen/include/xen/compile.h.in | 1 -
xen/include/xen/version.h | 1 -
47 files changed, 90 insertions(+), 76 deletions(-)
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 75b608f..825e495 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-5ef7cfd58163baebdb1539312e107e399d042ec2
-5ef7cfd58163baebdb1539312e107e399d042ec2
+67c0cb5a0a066779caa8c56831ecc896cadbb7cd
+67c0cb5a0a066779caa8c56831ecc896cadbb7cd
960b45d65509eb156ccdac8f50a31ffa28e963a1
960b45d65509eb156ccdac8f50a31ffa28e963a1
xen_4.4.0.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 9cdf0a3..f3395bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,6 @@ xen (4.4.0-1) UNRELEASED; urgency=medium
* Use system qemu-xen via new configure option instead of patching.
* Use system seabios via new configure option instead of patching.
* Use APPEND_{CFLAGS,CPPFLAGS,LDFLAGS} during build.
- * Build depend on figlet and remove patches which previously avoided the
- in-tree copy.
-- Bastian Blank <waldi at debian.org> Sat, 05 Jul 2014 12:54:54 +0200
diff --git a/debian/patches/0001-version.patch b/debian/patches/0001-version.patch
index ac1a018..2f712fd 100644
--- a/debian/patches/0001-version.patch
+++ b/debian/patches/0001-version.patch
@@ -1,24 +1,28 @@
-From 27fa7a7f352b1e1854dc754800aebbaa7cd66e51 Mon Sep 17 00:00:00 2001
+From 3af76d3edaea67658163e3d1fc8c1ed3a70a31ae Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:43 +0200
Subject: version
@DPATCH@
---
- xen/Makefile | 7 ++++---
+ xen/Makefile | 11 +++++------
xen/common/kernel.c | 4 ++--
- xen/common/version.c | 17 +++++++++++------
- xen/drivers/char/console.c | 6 +++---
- xen/include/xen/compile.h.in | 7 ++++---
- xen/include/xen/version.h | 7 ++++---
- 6 files changed, 28 insertions(+), 20 deletions(-)
+ 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 39839a3..68d50ea 100644
+index 39839a3..dc41ffe 100644
--- a/xen/Makefile
+++ b/xen/Makefile
-@@ -125,14 +125,15 @@ delete-unfresh-files:
- include/xen/compile.h: include/xen/compile.h.in .banner
+@@ -122,20 +122,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' \
@@ -34,8 +38,11 @@ index 39839a3..68d50ea 100644
+ -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
+- @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 b371f8f..877d461 100644
--- a/xen/common/kernel.c
@@ -52,7 +59,7 @@ index b371f8f..877d461 100644
if ( copy_to_guest(arg, &info, 1) )
return -EFAULT;
diff --git a/xen/common/version.c b/xen/common/version.c
-index b152e27..8ad3c40 100644
+index b152e27..7b5af55 100644
--- a/xen/common/version.c
+++ b/xen/common/version.c
@@ -11,19 +11,24 @@ const char *xen_compile_time(void)
@@ -86,14 +93,25 @@ index b152e27..8ad3c40 100644
}
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 532c426..bd1531b 100644
+index 532c426..c561a91 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
-@@ -670,11 +670,11 @@ void __init console_init_preirq(void)
- spin_lock(&console_lock);
- __putstr(xen_banner());
- spin_unlock(&console_lock);
+@@ -667,14 +667,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(),
@@ -106,7 +124,7 @@ index 532c426..bd1531b 100644
if ( opt_sync_console )
{
diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in
-index 440ecb2..93edf4b 100644
+index 440ecb2..0c3ca58 100644
--- a/xen/include/xen/compile.h.in
+++ b/xen/include/xen/compile.h.in
@@ -1,8 +1,9 @@
@@ -122,11 +140,16 @@ index 440ecb2..93edf4b 100644
#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..e57db02 100644
+index 81a3c7d..c25937e 100644
--- a/xen/include/xen/version.h
+++ b/xen/include/xen/version.h
-@@ -3,9 +3,10 @@
+@@ -3,14 +3,14 @@
const char *xen_compile_date(void);
const char *xen_compile_time(void);
@@ -140,3 +163,8 @@ index 81a3c7d..e57db02 100644
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__ */
diff --git a/debian/patches/0002-config-prefix.diff.patch b/debian/patches/0002-config-prefix.diff.patch
index c7d1919..57d0c8e 100644
--- a/debian/patches/0002-config-prefix.diff.patch
+++ b/debian/patches/0002-config-prefix.diff.patch
@@ -1,4 +1,4 @@
-From e4debe347eec07af9aa843234129a98994f53d7a Mon Sep 17 00:00:00 2001
+From 8b0bf3ad05a7e948baa42a05f65fa5ff7c7cc5be Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:45 +0200
Subject: config-prefix.diff
diff --git a/debian/patches/0003-tools-libfsimage-abiname.diff.patch b/debian/patches/0003-tools-libfsimage-abiname.diff.patch
index 96cc664..770281f 100644
--- a/debian/patches/0003-tools-libfsimage-abiname.diff.patch
+++ b/debian/patches/0003-tools-libfsimage-abiname.diff.patch
@@ -1,4 +1,4 @@
-From dc880977f0b0e8883c761659cb5fabbfac752919 Mon Sep 17 00:00:00 2001
+From f2203c717c8e26d6c203bf96199343c74163badb Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:47 +0200
Subject: tools-libfsimage-abiname.diff
diff --git a/debian/patches/0004-tools-libxc-abiname.diff.patch b/debian/patches/0004-tools-libxc-abiname.diff.patch
index 714535b..a22f003 100644
--- a/debian/patches/0004-tools-libxc-abiname.diff.patch
+++ b/debian/patches/0004-tools-libxc-abiname.diff.patch
@@ -1,4 +1,4 @@
-From 120094b857f6f340aea749412bde795fc4328bb8 Mon Sep 17 00:00:00 2001
+From ccabc6a4e41371130dbe94853d1e6066ae8ddab2 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:48 +0200
Subject: tools-libxc-abiname.diff
diff --git a/debian/patches/0005-tools-libxl-abiname.diff.patch b/debian/patches/0005-tools-libxl-abiname.diff.patch
index 88fb029..40a9766 100644
--- a/debian/patches/0005-tools-libxl-abiname.diff.patch
+++ b/debian/patches/0005-tools-libxl-abiname.diff.patch
@@ -1,4 +1,4 @@
-From 7596147aafeeffa5aa2fa11b50148bc48d7290de Mon Sep 17 00:00:00 2001
+From 0764e612e4b46dab9adad7106aab901bf0896ef3 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:49 +0200
Subject: tools-libxl-abiname.diff
diff --git a/debian/patches/0006-tools-xenstat-abiname.diff.patch b/debian/patches/0006-tools-xenstat-abiname.diff.patch
index 544ed23..85f7ad7 100644
--- a/debian/patches/0006-tools-xenstat-abiname.diff.patch
+++ b/debian/patches/0006-tools-xenstat-abiname.diff.patch
@@ -1,4 +1,4 @@
-From f74cf74772e194e38957796e892a663808ae594b Mon Sep 17 00:00:00 2001
+From 51579fa479c4afbc5c677725c73baf854360f1b8 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:50 +0200
Subject: tools-xenstat-abiname.diff
diff --git a/debian/patches/0007-tools-rpath.diff.patch b/debian/patches/0007-tools-rpath.diff.patch
index 3999958..d51f240 100644
--- a/debian/patches/0007-tools-rpath.diff.patch
+++ b/debian/patches/0007-tools-rpath.diff.patch
@@ -1,4 +1,4 @@
-From 9027a2701e0d0d0e6862cab9145af314d5a861a3 Mon Sep 17 00:00:00 2001
+From 479d90ee22e4a370a65f3fb90476884ff1e2629d Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:51 +0200
Subject: tools-rpath.diff
diff --git a/debian/patches/0008-tools-blktap2-prefix.diff.patch b/debian/patches/0008-tools-blktap2-prefix.diff.patch
index 75acfb8..02ce3d7 100644
--- a/debian/patches/0008-tools-blktap2-prefix.diff.patch
+++ b/debian/patches/0008-tools-blktap2-prefix.diff.patch
@@ -1,4 +1,4 @@
-From 5924dcd8f139134be57ee173c3b60f6f6fd3209e Mon Sep 17 00:00:00 2001
+From eef276f7bc0ea0355ee0fb4a65797675fbaff6db Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:53 +0200
Subject: tools-blktap2-prefix.diff
diff --git a/debian/patches/0009-tools-console-prefix.diff.patch b/debian/patches/0009-tools-console-prefix.diff.patch
index 5d1cf14..e3ff7e3 100644
--- a/debian/patches/0009-tools-console-prefix.diff.patch
+++ b/debian/patches/0009-tools-console-prefix.diff.patch
@@ -1,4 +1,4 @@
-From fd2bc11b9f0e812b59fb7e5c0dea31473b959888 Mon Sep 17 00:00:00 2001
+From e4f9e8c63dd2ea84a9484537850fcaf20596c418 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:54 +0200
Subject: tools-console-prefix.diff
diff --git a/debian/patches/0010-tools-libfsimage-prefix.diff.patch b/debian/patches/0010-tools-libfsimage-prefix.diff.patch
index 7c6c7f2..2650491 100644
--- a/debian/patches/0010-tools-libfsimage-prefix.diff.patch
+++ b/debian/patches/0010-tools-libfsimage-prefix.diff.patch
@@ -1,4 +1,4 @@
-From f7d3c3e6cc58b9092018b45cf968bc3dede376f4 Mon Sep 17 00:00:00 2001
+From 6ea03d7a26b3ef4f0e97c9f75a227850e68b4c22 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:55 +0200
Subject: tools-libfsimage-prefix.diff
diff --git a/debian/patches/0011-tools-libfsimage-rpath.diff.patch b/debian/patches/0011-tools-libfsimage-rpath.diff.patch
index 6da8758..8c5b19e 100644
--- a/debian/patches/0011-tools-libfsimage-rpath.diff.patch
+++ b/debian/patches/0011-tools-libfsimage-rpath.diff.patch
@@ -1,4 +1,4 @@
-From 329f9004b6b7b718a89ccc6a4567ea5651ffda5c Mon Sep 17 00:00:00 2001
+From edac38c6428c11764047b4c3847d7ee9d2d20e80 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:56 +0200
Subject: tools-libfsimage-rpath.diff
diff --git a/debian/patches/0012-tools-libxl-prefix.diff.patch b/debian/patches/0012-tools-libxl-prefix.diff.patch
index 738d956..251b412 100644
--- a/debian/patches/0012-tools-libxl-prefix.diff.patch
+++ b/debian/patches/0012-tools-libxl-prefix.diff.patch
@@ -1,4 +1,4 @@
-From 893a1e7f7ba6fdea629214fe5ac25bbc9273a80f Mon Sep 17 00:00:00 2001
+From 115e1e09532eaa3c48f29cd8fea6043decafef3b Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:57 +0200
Subject: tools-libxl-prefix.diff
diff --git a/debian/patches/0013-tools-misc-prefix.diff.patch b/debian/patches/0013-tools-misc-prefix.diff.patch
index 69ca33f..267fab2 100644
--- a/debian/patches/0013-tools-misc-prefix.diff.patch
+++ b/debian/patches/0013-tools-misc-prefix.diff.patch
@@ -1,4 +1,4 @@
-From 678559cb4602785b84cb6d356ff6ea9713cb7cd4 Mon Sep 17 00:00:00 2001
+From 63986546e43197e064de938e8c99baec0214a8cc Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:46:59 +0200
Subject: tools-misc-prefix.diff
diff --git a/debian/patches/0014-tools-misc-rpath.diff.patch b/debian/patches/0014-tools-misc-rpath.diff.patch
index b1aec49..5b2b9f0 100644
--- a/debian/patches/0014-tools-misc-rpath.diff.patch
+++ b/debian/patches/0014-tools-misc-rpath.diff.patch
@@ -1,4 +1,4 @@
-From 0cac77b038871806ed07eb7d76a3f66fb277a067 Mon Sep 17 00:00:00 2001
+From bf9b7e12f1b97bc48e46e7610515a4d866c99c37 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:00 +0200
Subject: tools-misc-rpath.diff
diff --git a/debian/patches/0015-tools-pygrub-prefix.diff.patch b/debian/patches/0015-tools-pygrub-prefix.diff.patch
index 1df80f6..8d48153 100644
--- a/debian/patches/0015-tools-pygrub-prefix.diff.patch
+++ b/debian/patches/0015-tools-pygrub-prefix.diff.patch
@@ -1,4 +1,4 @@
-From b34ea27bf3f7165e94dcb643c3b14b83f58ae578 Mon Sep 17 00:00:00 2001
+From 6ec7b50ff252a9933fff45c784670c0841b598b5 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:01 +0200
Subject: tools-pygrub-prefix.diff
diff --git a/debian/patches/0016-tools-python-prefix.diff.patch b/debian/patches/0016-tools-python-prefix.diff.patch
index 8ca90fa..0ab3e3f 100644
--- a/debian/patches/0016-tools-python-prefix.diff.patch
+++ b/debian/patches/0016-tools-python-prefix.diff.patch
@@ -1,4 +1,4 @@
-From 137e59a6806376af78c9fdf928337d6868187f8d Mon Sep 17 00:00:00 2001
+From 8694cab781c57fd1a2a0625008b7a71c3946e7be Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:02 +0200
Subject: tools-python-prefix.diff
diff --git a/debian/patches/0017-tools-python-rpath.diff.patch b/debian/patches/0017-tools-python-rpath.diff.patch
index 96f5ae2..dfcc2c2 100644
--- a/debian/patches/0017-tools-python-rpath.diff.patch
+++ b/debian/patches/0017-tools-python-rpath.diff.patch
@@ -1,4 +1,4 @@
-From 27a3c2fd3f86180ebb949c97e454d0729ca969d5 Mon Sep 17 00:00:00 2001
+From a2a35eed745082415d89f2ef5893708d3247abf6 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:03 +0200
Subject: tools-python-rpath.diff
diff --git a/debian/patches/0018-tools-xcutils-rpath.diff.patch b/debian/patches/0018-tools-xcutils-rpath.diff.patch
index 639c092..25b54ad 100644
--- a/debian/patches/0018-tools-xcutils-rpath.diff.patch
+++ b/debian/patches/0018-tools-xcutils-rpath.diff.patch
@@ -1,4 +1,4 @@
-From df930c793767552b904db3a46b4a1de78462490f Mon Sep 17 00:00:00 2001
+From 90fe4cf21df373149af41da2b85ea9eee941f1f3 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:05 +0200
Subject: tools-xcutils-rpath.diff
diff --git a/debian/patches/0019-tools-xenmon-prefix.diff.patch b/debian/patches/0019-tools-xenmon-prefix.diff.patch
index c39d68c..d3a97fa 100644
--- a/debian/patches/0019-tools-xenmon-prefix.diff.patch
+++ b/debian/patches/0019-tools-xenmon-prefix.diff.patch
@@ -1,4 +1,4 @@
-From 7ba3dbe0aa35cc78b9c8c79272a5f1d4d87bc7f0 Mon Sep 17 00:00:00 2001
+From 0c76747bca83b242b069196e534a7f3675466a8e Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:06 +0200
Subject: tools-xenmon-prefix.diff
diff --git a/debian/patches/0020-tools-xenmon-rpath.diff.patch b/debian/patches/0020-tools-xenmon-rpath.diff.patch
index 2181a8d..916840c 100644
--- a/debian/patches/0020-tools-xenmon-rpath.diff.patch
+++ b/debian/patches/0020-tools-xenmon-rpath.diff.patch
@@ -1,4 +1,4 @@
-From acdca05864766d7f69c9fb108750163dfabe27ef Mon Sep 17 00:00:00 2001
+From dccfc292f512dbae0a0c10f921d8cd3167c64ce9 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:07 +0200
Subject: tools-xenmon-rpath.diff
diff --git a/debian/patches/0021-tools-xenpaging-prefix.diff.patch b/debian/patches/0021-tools-xenpaging-prefix.diff.patch
index 460a9ce..43da9d7 100644
--- a/debian/patches/0021-tools-xenpaging-prefix.diff.patch
+++ b/debian/patches/0021-tools-xenpaging-prefix.diff.patch
@@ -1,4 +1,4 @@
-From b11ade99b1ea5638c0daed12e6e265fe19fb9cb5 Mon Sep 17 00:00:00 2001
+From 2127da1d6784fa1f0cc88e67bba409ac19ec364e Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:08 +0200
Subject: tools-xenpaging-prefix.diff
diff --git a/debian/patches/0022-tools-xenstat-prefix.diff.patch b/debian/patches/0022-tools-xenstat-prefix.diff.patch
index 37bdb6f..057d496 100644
--- a/debian/patches/0022-tools-xenstat-prefix.diff.patch
+++ b/debian/patches/0022-tools-xenstat-prefix.diff.patch
@@ -1,4 +1,4 @@
-From c9ac2843393ca27edd76be8bff0ce1ccd5bde439 Mon Sep 17 00:00:00 2001
+From aa64e1364605a735b0ec993619efe91b219870c7 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:09 +0200
Subject: tools-xenstat-prefix.diff
diff --git a/debian/patches/0023-tools-xenstat-rpath.diff.patch b/debian/patches/0023-tools-xenstat-rpath.diff.patch
index 9eb99f2..5c6f6ef 100644
--- a/debian/patches/0023-tools-xenstat-rpath.diff.patch
+++ b/debian/patches/0023-tools-xenstat-rpath.diff.patch
@@ -1,4 +1,4 @@
-From ac59ae692116b89de918f9c1b19fbc685ec13db7 Mon Sep 17 00:00:00 2001
+From 2586599a8d40916dcdba19d83d6ea64997c7045a Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:11 +0200
Subject: tools-xenstat-rpath.diff
diff --git a/debian/patches/0024-tools-xenstore-prefix.diff.patch b/debian/patches/0024-tools-xenstore-prefix.diff.patch
index 89136e8..3b12564 100644
--- a/debian/patches/0024-tools-xenstore-prefix.diff.patch
+++ b/debian/patches/0024-tools-xenstore-prefix.diff.patch
@@ -1,4 +1,4 @@
-From b46e0d0c6e2cd3746e9ba9445a0ccaf46fa35864 Mon Sep 17 00:00:00 2001
+From 02ab630bf4b056fd3e042be3fa76536d9c2164c6 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:12 +0200
Subject: tools-xenstore-prefix.diff
diff --git a/debian/patches/0025-tools-xenstore-rpath.diff.patch b/debian/patches/0025-tools-xenstore-rpath.diff.patch
index 9309bb1..27ce8f9 100644
--- a/debian/patches/0025-tools-xenstore-rpath.diff.patch
+++ b/debian/patches/0025-tools-xenstore-rpath.diff.patch
@@ -1,4 +1,4 @@
-From a659ebeab18af5d7e033821e37d336ae4183cd0c Mon Sep 17 00:00:00 2001
+From 90380bf46fb8ed13ee7b896f215c645008f992e1 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:13 +0200
Subject: tools-xenstore-rpath.diff
diff --git a/debian/patches/0026-tools-xentrace-prefix.diff.patch b/debian/patches/0026-tools-xentrace-prefix.diff.patch
index 5b40960..43efbd7 100644
--- a/debian/patches/0026-tools-xentrace-prefix.diff.patch
+++ b/debian/patches/0026-tools-xentrace-prefix.diff.patch
@@ -1,4 +1,4 @@
-From b1319f184b163be82c9b1013313b13237c55ac28 Mon Sep 17 00:00:00 2001
+From 6cfdf1c164beaec90d7d5edfe7b65a6f0f0389a0 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:14 +0200
Subject: tools-xentrace-prefix.diff
diff --git a/debian/patches/0027-tools-xentrace-rpath.diff.patch b/debian/patches/0027-tools-xentrace-rpath.diff.patch
index bcad912..2a1994e 100644
--- a/debian/patches/0027-tools-xentrace-rpath.diff.patch
+++ b/debian/patches/0027-tools-xentrace-rpath.diff.patch
@@ -1,4 +1,4 @@
-From d4433f41d64111588938346aae6bdb3ce5d9b4cf Mon Sep 17 00:00:00 2001
+From f0078305a097d55a4028d44054b3e1edc9d8f0b0 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:15 +0200
Subject: tools-xentrace-rpath.diff
diff --git a/debian/patches/0028-tools-python-xen-relative-path.diff.patch b/debian/patches/0028-tools-python-xen-relative-path.diff.patch
index 91aa27a..89c42b3 100644
--- a/debian/patches/0028-tools-python-xen-relative-path.diff.patch
+++ b/debian/patches/0028-tools-python-xen-relative-path.diff.patch
@@ -1,4 +1,4 @@
-From 125062eb433a873021777f03be95c7608e047155 Mon Sep 17 00:00:00 2001
+From 304ab83d71fd0e5070b81a36d5fa220083a84e09 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:19 +0200
Subject: tools-python-xen-relative-path.diff
diff --git a/debian/patches/0029-tools-misc-xend-startup.diff.patch b/debian/patches/0029-tools-misc-xend-startup.diff.patch
index ae814ec..a58c77b 100644
--- a/debian/patches/0029-tools-misc-xend-startup.diff.patch
+++ b/debian/patches/0029-tools-misc-xend-startup.diff.patch
@@ -1,4 +1,4 @@
-From 2f21d3451cfb37a25346579c348c4ab16f1df789 Mon Sep 17 00:00:00 2001
+From 1037430905680efb485a1ddc2eb4f28f8f703404 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:20 +0200
Subject: tools-misc-xend-startup.diff
diff --git a/debian/patches/0030-tools-disable.diff.patch b/debian/patches/0030-tools-disable.diff.patch
index 6c24e76..a280fbc 100644
--- a/debian/patches/0030-tools-disable.diff.patch
+++ b/debian/patches/0030-tools-disable.diff.patch
@@ -1,4 +1,4 @@
-From b324aacc1f73b78e947c1c612ba1531671be4a8f Mon Sep 17 00:00:00 2001
+From 0f2567c76adb8217d3bce54772458334e8f1ff1b Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:23 +0200
Subject: tools-disable.diff
diff --git a/debian/patches/0031-tools-examples-xend-disable-network.diff.patch b/debian/patches/0031-tools-examples-xend-disable-network.diff.patch
index b8e5c78..1e787c1 100644
--- a/debian/patches/0031-tools-examples-xend-disable-network.diff.patch
+++ b/debian/patches/0031-tools-examples-xend-disable-network.diff.patch
@@ -1,4 +1,4 @@
-From 1059b3bcc00ca0a010b819f05135ec04f47fbb20 Mon Sep 17 00:00:00 2001
+From ccd27b88d14fb9b8450c776bbb768d9068ef6f41 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:24 +0200
Subject: tools-examples-xend-disable-network.diff
diff --git a/debian/patches/0032-tools-examples-xend-disable-relocation.diff.patch b/debian/patches/0032-tools-examples-xend-disable-relocation.diff.patch
index 151089d..ca5281c 100644
--- a/debian/patches/0032-tools-examples-xend-disable-relocation.diff.patch
+++ b/debian/patches/0032-tools-examples-xend-disable-relocation.diff.patch
@@ -1,4 +1,4 @@
-From e5850dacf957ef4f0b125cb872d35b88fbe9b037 Mon Sep 17 00:00:00 2001
+From c7ed987e69ab06c4c2241de1e2c885e3485209c1 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:25 +0200
Subject: tools-examples-xend-disable-relocation.diff
diff --git a/debian/patches/0033-tools-pygrub-remove-static-solaris-support.patch b/debian/patches/0033-tools-pygrub-remove-static-solaris-support.patch
index c2d6439..c5833fb 100644
--- a/debian/patches/0033-tools-pygrub-remove-static-solaris-support.patch
+++ b/debian/patches/0033-tools-pygrub-remove-static-solaris-support.patch
@@ -1,4 +1,4 @@
-From eba23ab0e12f4d0dbecf317fe1e5eb41428883c5 Mon Sep 17 00:00:00 2001
+From 3ac76cd474a0df61206685ea32f7d606edcd0eab Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:29 +0200
Subject: tools-pygrub-remove-static-solaris-support
diff --git a/debian/patches/0034-tools-include-install.diff.patch b/debian/patches/0034-tools-include-install.diff.patch
index f30d47a..9be7a99 100644
--- a/debian/patches/0034-tools-include-install.diff.patch
+++ b/debian/patches/0034-tools-include-install.diff.patch
@@ -1,4 +1,4 @@
-From 738701ca54c65e0b6a3729d51616e40e395d80fb Mon Sep 17 00:00:00 2001
+From 3e76f694f4a8707e5c9d6cd115a4bd1b45ead0ad Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:30 +0200
Subject: tools-include-install.diff
diff --git a/debian/patches/0035-tools-xenmon-install.diff.patch b/debian/patches/0035-tools-xenmon-install.diff.patch
index e97e274..ba973f9 100644
--- a/debian/patches/0035-tools-xenmon-install.diff.patch
+++ b/debian/patches/0035-tools-xenmon-install.diff.patch
@@ -1,4 +1,4 @@
-From ed2d5874ad013e4bfd2fbeb83e07bb702247750d Mon Sep 17 00:00:00 2001
+From e16bd9e6d1442a765debb612b4294bdce01a0202 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:31 +0200
Subject: tools-xenmon-install.diff
diff --git a/debian/patches/0036-tools-hotplug-udevrules.diff.patch b/debian/patches/0036-tools-hotplug-udevrules.diff.patch
index 60f5e69..5519500 100644
--- a/debian/patches/0036-tools-hotplug-udevrules.diff.patch
+++ b/debian/patches/0036-tools-hotplug-udevrules.diff.patch
@@ -1,4 +1,4 @@
-From 106f3431320109b97e4c211a3d39a9240b9882b5 Mon Sep 17 00:00:00 2001
+From d1c768ea46c9b5ba443651a0ab58221a879bd198 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:32 +0200
Subject: tools-hotplug-udevrules.diff
diff --git a/debian/patches/0037-tools-python-shebang.diff.patch b/debian/patches/0037-tools-python-shebang.diff.patch
index 57ce9f0..44de22c 100644
--- a/debian/patches/0037-tools-python-shebang.diff.patch
+++ b/debian/patches/0037-tools-python-shebang.diff.patch
@@ -1,4 +1,4 @@
-From e41b2afb11150c53652d1f50f744c28708aa5758 Mon Sep 17 00:00:00 2001
+From c244013161c4bd79b28d1d605dfc70df2efc8471 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:33 +0200
Subject: tools-python-shebang.diff
diff --git a/debian/patches/0038-tools-ocaml-fix-build.diff.patch b/debian/patches/0038-tools-ocaml-fix-build.diff.patch
index 5c3c0a1..8c3a59d 100644
--- a/debian/patches/0038-tools-ocaml-fix-build.diff.patch
+++ b/debian/patches/0038-tools-ocaml-fix-build.diff.patch
@@ -1,4 +1,4 @@
-From 5ae9bdadd642a203f8c85f9186e91fbfd663a3d2 Mon Sep 17 00:00:00 2001
+From 34dac57f09adbc451cd2b4c56a13376b3abfeb3a Mon Sep 17 00:00:00 2001
From: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
Date: Tue, 29 Nov 2011 11:45:27 +0000
Subject: tools-ocaml-fix-build.diff
diff --git a/debian/patches/0039-tools-xenstore-compatibility.diff.patch b/debian/patches/0039-tools-xenstore-compatibility.diff.patch
index 822632f..e8096ad 100644
--- a/debian/patches/0039-tools-xenstore-compatibility.diff.patch
+++ b/debian/patches/0039-tools-xenstore-compatibility.diff.patch
@@ -1,4 +1,4 @@
-From 5ef7cfd58163baebdb1539312e107e399d042ec2 Mon Sep 17 00:00:00 2001
+From 67c0cb5a0a066779caa8c56831ecc896cadbb7cd Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi at debian.org>
Date: Sat, 5 Jul 2014 11:47:36 +0200
Subject: tools-xenstore-compatibility.diff
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index fc79114..232cd8e 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -10,7 +10,6 @@ Build-Depends:
bcc,
gcc-multilib,
e2fslibs-dev,
- figlet,
iasl,
seabios,
libaio-dev,
diff --git a/xen/Makefile b/xen/Makefile
index 68d50ea..dc41ffe 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -122,7 +122,7 @@ 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!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \
@@ -135,8 +135,6 @@ include/xen/compile.h: include/xen/compile.h.in .banner
-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/version.c b/xen/common/version.c
index 8ad3c40..7b5af55 100644
--- a/xen/common/version.c
+++ b/xen/common/version.c
@@ -56,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 bd1531b..c561a91 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -667,9 +667,6 @@ 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@%s) (%s) debug=%c %s\n",
xen_major_version(), xen_minor_version(), xen_extra_version(),
xen_compile_system_distribution(), xen_compile_system_version(),
diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in
index 93edf4b..0c3ca58 100644
--- a/xen/include/xen/compile.h.in
+++ b/xen/include/xen/compile.h.in
@@ -11,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 e57db02..c25937e 100644
--- a/xen/include/xen/version.h
+++ b/xen/include/xen/version.h
@@ -12,6 +12,5 @@ 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