From 321d8bf36dddc26775d723da231a62aaeab944cb33f8bc0712e112d707c14db4 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Wed, 23 Mar 2016 20:51:29 +0000 Subject: [PATCH] - Use system SeaBIOS instead of building/installing another one FATE#320638 Dropped files: seabios-dir-remote.tar.bz2 xen-c99-fix.patch xen.build-compare.seabios.patch - spec: drop BuildRequires that were only needed for qemu-xen OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=413 --- seabios-dir-remote.tar.bz2 | 3 --- xen-c99-fix.patch | 15 ------------- xen.build-compare.seabios.patch | 23 -------------------- xen.changes | 15 +++++++++++++ xen.spec | 38 +++++++++++++-------------------- 5 files changed, 30 insertions(+), 64 deletions(-) delete mode 100644 seabios-dir-remote.tar.bz2 delete mode 100644 xen-c99-fix.patch delete mode 100644 xen.build-compare.seabios.patch diff --git a/seabios-dir-remote.tar.bz2 b/seabios-dir-remote.tar.bz2 deleted file mode 100644 index 9183e1e..0000000 --- a/seabios-dir-remote.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cac2c7e38b87f2944ab6833a3e79540480456229ab9a187f16ea8231a4918c6 -size 446291 diff --git a/xen-c99-fix.patch b/xen-c99-fix.patch deleted file mode 100644 index 69a00cc..0000000 --- a/xen-c99-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- xen-4.5.0-testing/tools/firmware/seabios-dir-remote/src/hw/usb-hid.h.orig 2015-03-12 10:49:39.606373644 +0000 -+++ xen-4.5.0-testing/tools/firmware/seabios-dir-remote/src/hw/usb-hid.h 2015-03-12 10:49:55.481555672 +0000 -@@ -4,10 +4,10 @@ - // usb-hid.c - struct usbdevice_s; - int usb_hid_setup(struct usbdevice_s *usbdev); --inline int usb_kbd_active(void); --inline int usb_kbd_command(int command, u8 *param); --inline int usb_mouse_active(void); --inline int usb_mouse_command(int command, u8 *param); -+int usb_kbd_active(void); -+int usb_kbd_command(int command, u8 *param); -+int usb_mouse_active(void); -+int usb_mouse_command(int command, u8 *param); - void usb_check_event(void); diff --git a/xen.build-compare.seabios.patch b/xen.build-compare.seabios.patch deleted file mode 100644 index 5505526..0000000 --- a/xen.build-compare.seabios.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use stable strings to reduce build-compare noise. ---- - tools/firmware/seabios-dir-remote/tools/buildversion.sh | 5 +++++ - 1 file changed, 5 insertions(+) - -Index: xen-4.6.0-testing/tools/firmware/seabios-dir-remote/scripts/buildversion.sh -=================================================================== ---- xen-4.6.0-testing.orig/tools/firmware/seabios-dir-remote/scripts/buildversion.sh -+++ xen-4.6.0-testing/tools/firmware/seabios-dir-remote/scripts/buildversion.sh -@@ -12,7 +12,12 @@ if [ -z "$BUILD_VERSION" ]; then - else - VERSION="?" - fi -- VERSION="${VERSION}-`date +"%Y%m%d_%H%M%S"`-`hostname`" -+ if test -n "${SEABIOS_DATE}" -+ then -+ VERSION="${SEABIOS_DATE}" -+ else -+ VERSION="${VERSION}-`date +"%Y%m%d_%H%M%S"`-`hostname`" -+ fi - else - VERSION="$BUILD_VERSION" - fi diff --git a/xen.changes b/xen.changes index eab8d68..1de2b01 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Mar 22 21:48:06 UTC 2016 - jfehlig@suse.com + +- Use system SeaBIOS instead of building/installing another one + FATE#320638 + Dropped files: + seabios-dir-remote.tar.bz2 + xen-c99-fix.patch + xen.build-compare.seabios.patch + +------------------------------------------------------------------- +Wed Mar 16 23:33:01 UTC 2016 - jfehlig@suse.com + +- spec: drop BuildRequires that were only needed for qemu-xen + ------------------------------------------------------------------- Fri Mar 4 16:11:02 MST 2016 - carnold@suse.com diff --git a/xen.spec b/xen.spec index b2954ec..9219256 100644 --- a/xen.spec +++ b/xen.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # needssslcertforbuild Name: xen @@ -99,13 +100,10 @@ BuildRequires: libpixman-1-0-devel BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: libyajl-devel -%ifarch x86_64 -%if 0%{?suse_version} > 1230 -BuildRequires: libspice-server-devel -BuildRequires: spice-protocol-devel -BuildRequires: usbredir-devel -%endif -%endif +# JWF: Temporary until we move to Xen 4.7 and Anthony' series to load +# firmwares from toolstack +# http://lists.xenproject.org/archives/html/xen-devel/2016-03/msg01626.html +BuildRequires: qemu-seabios %if %{?with_qemu_traditional}0 BuildRequires: SDL-devel BuildRequires: pciutils-devel @@ -162,7 +160,7 @@ BuildRequires: xorg-x11-util-devel %endif %endif -Version: 4.6.1_01 +Version: 4.6.1_02 Release: 0 Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) License: GPL-2.0 @@ -170,7 +168,6 @@ Group: System/Kernel Source0: xen-4.6.1-testing-src.tar.bz2 Source1: stubdom.tar.bz2 Source2: qemu-xen-traditional-dir-remote.tar.bz2 -Source4: seabios-dir-remote.tar.bz2 Source5: ipxe.tar.bz2 Source6: mini-os.tar.bz2 Source9: xen.changes @@ -273,9 +270,8 @@ Patch403: xl-conf-default-bridge.patch # Needs to go upstream Patch420: suspend_evtchn_lock.patch Patch421: xenpaging.doc.patch -Patch422: xen-c99-fix.patch -Patch423: stubdom-have-iovec.patch -Patch424: hotplug-Linux-block-performance-fix.patch +Patch422: stubdom-have-iovec.patch +Patch423: hotplug-Linux-block-performance-fix.patch # Other bug fixes or features Patch451: xenconsole-no-multiple-connections.patch Patch452: hibernate.patch @@ -298,11 +294,10 @@ Patch520: xen_pvonhvm.xen_emul_unplug.patch Patch521: supported_module.patch Patch522: magic_ioport_compat.patch Patch601: xen.build-compare.doc_html.patch -Patch602: xen.build-compare.seabios.patch -Patch603: xen.build-compare.man.patch -Patch604: ipxe-no-error-logical-not-parentheses.patch -Patch605: ipxe-use-rpm-opt-flags.patch -Patch606: gcc6-warnings-as-errors.patch +Patch602: xen.build-compare.man.patch +Patch603: ipxe-no-error-logical-not-parentheses.patch +Patch604: ipxe-use-rpm-opt-flags.patch +Patch605: gcc6-warnings-as-errors.patch # Build patches Patch99996: xen.stubdom.newlib.patch Patch99998: tmp_build.patch @@ -398,6 +393,7 @@ Requires: qemu-x86 %ifarch %arm aarch64 Requires: qemu-arm %endif +Requires: qemu-seabios Requires: multipath-tools Requires: python Requires: python-curses @@ -511,7 +507,7 @@ Authors: %endif %prep -%setup -q -n %xen_build_dir -a 1 -a 2 -a 4 -a 5 -a 6 -a 57 +%setup -q -n %xen_build_dir -a 1 -a 2 -a 5 -a 6 -a 57 # Upstream patches %patch1 -p1 %patch2 -p1 @@ -587,7 +583,6 @@ Authors: %patch421 -p1 %patch422 -p1 %patch423 -p1 -%patch424 -p1 # Other bug fixes or features %patch451 -p1 %patch452 -p1 @@ -614,7 +609,6 @@ Authors: %patch603 -p1 %patch604 -p1 %patch605 -p1 -%patch606 -p1 # Build patches %patch99996 -p1 %patch99998 -p1 @@ -637,14 +631,12 @@ XEN_BUILD_DATE="`date -u -d '1970-01-01'`" XEN_BUILD_TIME="`date -u -d '1970-01-01' +%%T`" SMBIOS_DATE="`date -u -d '1970-01-01' +%%m/%%d/%%Y`" RELDATE="`date -u -d '1970-01-01' '+%%d %%b %%Y'`" -SEABIOS_DATE="`date -u -d '1970-01-01' '+?-%%Y%%m%%d_%%H%%M%%S-buildhost'`" if test -r %{S:9} then XEN_BUILD_DATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" `" XEN_BUILD_TIME="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" +%%T`" SMBIOS_DATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" +%%m/%%d/%%Y`" RELDATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" '+%%d %%b %%Y'`" - SEABIOS_DATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" '+?-%%Y%%m%%d_%%H%%M%%S-buildhost'`" fi cat > .our_xenversion <<_EOV_ export WGET=$(type -P false) @@ -654,7 +646,6 @@ export EXTRA_CFLAGS_XEN_TOOLS="$RPM_OPT_FLAGS" export EXTRA_CFLAGS_QEMU_TRADITIONAL="$RPM_OPT_FLAGS" export SMBIOS_DATE="$SMBIOS_DATE" export RELDATE="$RELDATE" -export SEABIOS_DATE="$SEABIOS_DATE" XEN_VERSION=$XEN_VERSION XEN_SUBVERSION=$XEN_SUBVERSION XEN_EXTRAVERSION=$XEN_EXTRAVERSION @@ -713,6 +704,7 @@ configure_flags="${configure_flags} --disable-qemu-traditional" %else --disable-systemd \ %endif + --with-system-seabios=%{_datadir}/qemu/bios-256k.bin \ --with-system-qemu=%{_bindir}/qemu-system-%{_arch} \ ${configure_flags} make -C tools/include/xen-foreign %{?_smp_mflags}