diff --git a/xen.changes b/xen.changes index 64ac704..d3774a8 100644 --- a/xen.changes +++ b/xen.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Thu Jan 27 19:53:39 MST 2014 - carnold@suse.com + +- On platforms where xend is still supported don't output a + deprecation warning when using xm. + xend-remove-xm-deprecation-warning.patch + ------------------------------------------------------------------- Thu Jan 23 16:11:39 MST 2014 - carnold@suse.com -- Changed License to GPL v2 only (from GPL-2.0+) +- Changed License to GPL-2.0 (from GPL-2.0+) ------------------------------------------------------------------- Thu Jan 23 16:11:39 MST 2014 - carnold@suse.com @@ -20,6 +27,8 @@ Sat Jan 18 00:35:46 CET 2014 - ohering@suse.de pv-on-hvm files. Rely on core kernel to skip initialization of emulated hardware Handle xen_emul_unplug= from xenlinux based core kernel-default + xen_pvonhvm.xen_emul_unplug.patch + Dropped xen_pvdrivers.conf ------------------------------------------------------------------- Wed Jan 16 13:11:32 MST 2014 - carnold@suse.com @@ -34,6 +43,7 @@ Wed Jan 15 19:55:32 CET 2014 - ohering@suse.de - fate#316071: add discard support for file backed storage (qdisk) to qemu-upstream, enabled unconditionally + qemu-xen-upstream-blkif-discard.patch ------------------------------------------------------------------- Tue Jan 14 12:13:45 MST 2014 - carnold@suse.com @@ -44,6 +54,10 @@ Tue Jan 14 12:13:45 MST 2014 - carnold@suse.com Tue Jan 9 11:44:11 MST 2014 - carnold@suse.com - Restore 32bit ix86 support in spec file for kmps and domU tools +- Restore a few missing xend patches + xend-config-enable-dump-comment.patch + xend-tools-watchdog-support.patch + xend-vif-route-ifup.patch ------------------------------------------------------------------- Tue Jan 2 11:52:11 MST 2014 - carnold@suse.com diff --git a/xen.spec b/xen.spec index 923e1ef..6d9ba8d 100644 --- a/xen.spec +++ b/xen.spec @@ -70,10 +70,10 @@ BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: libaio-devel BuildRequires: libbz2-devel -BuildRequires: libpixman-1-0-devel BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: libyajl-devel +BuildRequires: libpixman-1-0-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: python-devel @@ -82,10 +82,10 @@ BuildRequires: transfig BuildRequires: texinfo BuildRequires: texlive %if %suse_version > 1220 +BuildRequires: texlive-latex BuildRequires: texlive-courier BuildRequires: texlive-dvips BuildRequires: texlive-helvetic -BuildRequires: texlive-latex BuildRequires: texlive-psnfss BuildRequires: texlive-times BuildRequires: tex(a4.sty) @@ -293,6 +293,7 @@ Patch434: xend-domain-lock-sfex.patch Patch435: xend-32on64-extra-mem.patch Patch436: xend-hv_extid_compatibility.patch Patch437: xend-xenpaging.autostart.patch +Patch438: xend-remove-xm-deprecation-warning.patch # Other bug fixes or features Patch450: libxen_permissive.patch Patch451: xenconsole-no-multiple-connections.patch @@ -640,6 +641,9 @@ Authors: %patch435 -p1 %patch436 -p1 %patch437 -p1 +%if %suse_version <= 1230 +%patch438 -p1 +%endif %endif # Other bug fixes or features %patch450 -p1 diff --git a/xend-remove-xm-deprecation-warning.patch b/xend-remove-xm-deprecation-warning.patch new file mode 100644 index 0000000..16ae230 --- /dev/null +++ b/xend-remove-xm-deprecation-warning.patch @@ -0,0 +1,34 @@ +Index: xen-4.4.0-testing/tools/python/xen/xm/xm +=================================================================== +--- xen-4.4.0-testing.orig/tools/python/xen/xm/xm ++++ xen-4.4.0-testing/tools/python/xen/xm/xm +@@ -4,17 +4,17 @@ import sys, os.path + + from xen.xm import main + +-print >>sys.stderr, ("WARNING: xend/xm is deprecated.") +- +-if not os.path.exists("/var/run/xm-deprecation-long-warning"): +- print >>sys.stderr, (""" +-xend is deprecated and scheduled for removal. Please migrate to another +-toolstack ASAP. +- +-See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on +-other alternatives, including xl which is designed to be a drop in +-replacement for xm (http://wiki.xen.org/wiki/XL). +-""") +- open("/var/run/xm-deprecation-long-warning", "w").close() ++#print >>sys.stderr, ("WARNING: xend/xm is deprecated.") ++# ++#if not os.path.exists("/var/run/xm-deprecation-long-warning"): ++# print >>sys.stderr, (""" ++#xend is deprecated and scheduled for removal. Please migrate to another ++#toolstack ASAP. ++# ++#See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on ++#other alternatives, including xl which is designed to be a drop in ++#replacement for xm (http://wiki.xen.org/wiki/XL). ++#""") ++# open("/var/run/xm-deprecation-long-warning", "w").close() + + main.main(sys.argv)