From 1f31091990d1463d728ca2ff0d09c9ad07603b1d0966fbb1f917141b7e933153 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 23 Jan 2014 23:11:47 +0000 Subject: [PATCH] - Dropped xen-changeset.patch. It is no longer needed. OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=292 --- xen-changeset.patch | 30 ------------------------------ xen.changes | 5 +++++ xen.spec | 5 +---- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 xen-changeset.patch diff --git a/xen-changeset.patch b/xen-changeset.patch deleted file mode 100644 index 75ca207..0000000 --- a/xen-changeset.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: xen-4.4.0-testing/xen/Makefile -=================================================================== ---- xen-4.4.0-testing.orig/xen/Makefile -+++ xen-4.4.0-testing/xen/Makefile -@@ -1,3 +1,4 @@ -+export XEN_CHANGESET = unavailable - # This is the correct place to edit the build version. - # All other places this is stored (eg. compile.h) should be autogenerated. - export XEN_VERSION = 4 -@@ -122,7 +123,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/@@whoami@@/$(XEN_WHOAMI)/g' \ -@@ -132,9 +133,9 @@ include/xen/compile.h: include/xen/compi - -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!@@changeset@@!$(XEN_CHANGESET)!g' \ - < include/xen/compile.h.in > $@.new -- @cat .banner -+ @echo "Xen $(XEN_FULLVERSION)" > .banner - @$(PYTHON) tools/fig-to-oct.py < .banner >> $@.new - @mv -f $@.new $@ - diff --git a/xen.changes b/xen.changes index affd8b1..d945c5f 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 23 16:11:39 MST 2014 - carnold@suse.com + +- Dropped xen-changeset.patch. It is no longer needed. + ------------------------------------------------------------------- Sun Jan 19 00:13:06 CET 2014 - ohering@suse.de diff --git a/xen.spec b/xen.spec index b6abd9d..b92c3b9 100644 --- a/xen.spec +++ b/xen.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: xen ExclusiveArch: %ix86 x86_64 %arm aarch64 %define xvers 4.4 @@ -204,8 +203,7 @@ Patch257: 0007-e1000-verify-we-have-buffers-upfront.patch Patch258: 0008-e1000-check-buffer-availability.patch # Our platform specific patches Patch301: xen-destdir.patch -Patch302: xen-changeset.patch -Patch303: xen-xmexample.patch +Patch302: xen-xmexample.patch Patch310: bridge-opensuse.patch Patch311: bridge-vlan.patch Patch312: bridge-bonding.patch @@ -553,7 +551,6 @@ Authors: # Our platform specific patches %patch301 -p1 %patch302 -p1 -%patch303 -p1 %patch310 -p1 %patch311 -p1 %patch312 -p1