diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | xen.install | 12 |
4 files changed, 38 insertions, 8 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Mar 13 06:49:29 UTC 2017 +# Tue Mar 28 06:41:08 UTC 2017 pkgbase = xen pkgdesc = Virtual Machine Hypervisor & Tools pkgver = 4.8.0 - pkgrel = 4 + pkgrel = 5 url = http://www.xenproject.org/ changelog = ChangeLog arch = x86_64 @@ -60,6 +60,8 @@ pkgbase = xen source = https://xenbits.xen.org/xsa/xsa209-qemuu/0001-display-cirrus-ignore-source-pitch-value-as-needed-i.patch source = https://xenbits.xen.org/xsa/xsa209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput.patch source = https://xenbits.xen.org/xsa/xsa210.patch + source = https://xenbits.xen.org/xsa/xsa211-qemut.patch + source = https://xenbits.xen.org/xsa/xsa211-qemuu-4.8.patch source = grub-mkconfig-helper source = efi-xen.cfg source = grub.conf @@ -81,6 +83,8 @@ pkgbase = xen sha256sums = e698b73d8de24af0fe33968a43561e5e1d094f4caf2443caa447b552677d2683 sha256sums = 50c60e45151ef2265cce4f92b204e9fd75f8bc8952f097e77ab4fe1c1446bc98 sha256sums = 10e26c017c916dcac261c6a3c92656831f0ad037f792940e6faf6905c6e23861 + sha256sums = 9d0cf413dcc9654ee95f6b04fa9c5714f36775cbc9ab0390a3041ec4a68845ab + sha256sums = bea7cf4065bd9d0085f4dfc3395e59c3ca9d4de9d786a3018c8dc7fd9f3d8b6e sha256sums = 06c9f6140f7ef4ccfc4b1a7d9732a673313e269733180f53afcd9e43bf6c26bb sha256sums = ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f sha256sums = 3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568 @@ -108,6 +112,8 @@ pkgname = xen depends = yajl optdepends = xen-docs: Official Xen Documentation optdepends = openvswitch: Optional Networking support + optdepends = seabios: Boot VMs with BIOS + optdepends = ovmf: Boot VMs with UEFI provides = xen-4.8.0 conflicts = xen-4.2 conflicts = xen-4.2-testing-hg diff --git a/ChangeLog b/ChangeLog index a9e0ccbdd03d..0c37d0d89f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-03-28 Janne Heß + * 4.8.0-5 + Split out SeaBIOS and OVMF + Disable Werror + Apply XSA patch: 211 + 2017-03-09 Janne Heß * 4.8.0-4 Merge with xen-docs @@ -49,7 +49,7 @@ fi pkgbase=xen pkgname=(xen xen-docs) pkgver="${_xen_version}" -pkgrel=4 +pkgrel=5 pkgdesc='Virtual Machine Hypervisor & Tools' url='http://www.xenproject.org/' license=('GPL2') @@ -92,7 +92,6 @@ makedepends=( spice usbredir yajl - # TODO why not use system's seabios, ovmf, qemu ) # Sources @@ -120,6 +119,8 @@ source=( 'https://xenbits.xen.org/xsa/xsa209-qemuu/0001-display-cirrus-ignore-source-pitch-value-as-needed-i.patch' 'https://xenbits.xen.org/xsa/xsa209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput.patch' 'https://xenbits.xen.org/xsa/xsa210.patch' + 'https://xenbits.xen.org/xsa/xsa211-qemut.patch' + 'https://xenbits.xen.org/xsa/xsa211-qemuu-4.8.patch' # Files 'grub-mkconfig-helper' @@ -163,6 +164,8 @@ sha256sums=( 'e698b73d8de24af0fe33968a43561e5e1d094f4caf2443caa447b552677d2683' '50c60e45151ef2265cce4f92b204e9fd75f8bc8952f097e77ab4fe1c1446bc98' '10e26c017c916dcac261c6a3c92656831f0ad037f792940e6faf6905c6e23861' + '9d0cf413dcc9654ee95f6b04fa9c5714f36775cbc9ab0390a3041ec4a68845ab' + 'bea7cf4065bd9d0085f4dfc3395e59c3ca9d4de9d786a3018c8dc7fd9f3d8b6e' # PKGBUILD files '06c9f6140f7ef4ccfc4b1a7d9732a673313e269733180f53afcd9e43bf6c26bb' 'ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f' @@ -223,12 +226,14 @@ prepare() { pushd 'tools/qemu-xen-traditional' patch -Np1 -i "${srcdir}/xsa208-qemut.patch" patch -Np1 -i "${srcdir}/xsa209-qemut.patch" + patch -Np1 -i "${srcdir}/xsa211-qemut.patch" popd # qemu-xen upstream pushd 'tools/qemu-xen' patch -Np1 -i "${srcdir}/xsa208-qemuu.patch" patch -Np1 -i "${srcdir}/0001-display-cirrus-ignore-source-pitch-value-as-needed-i.patch" patch -Np1 -i "${srcdir}/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput.patch" + patch -Np1 -i "${srcdir}/xsa211-qemuu-4.8.patch" popd # Patch EFI binary build with mingw @@ -285,12 +290,13 @@ build() { --with-initddir=/etc/init.d \ --enable-systemd \ --enable-ovmf \ + --with-system-ovmf \ + --with-system-seabios \ "${_config_stubdom:---disable-stubdom}" \ - --with-extra-qemuu-configure-args="--disable-bluez --disable-gtk --enable-spice --enable-usb-redir" \ - #--with-system-qemu --with-system-seabios --with-system-ovmf \ + --with-extra-qemuu-configure-args="--disable-bluez --disable-gtk --enable-spice --enable-usb-redir --disable-werror" msg2 'Building Xen...' - make LANG=C PYTHON=python2 dist + make LANG=C PYTHON=python2 APPEND_CFLAGS=-Wno-error dist } package_xen() { @@ -317,6 +323,8 @@ package_xen() { optdepends=( 'xen-docs: Official Xen Documentation' 'openvswitch: Optional Networking support' + 'seabios: Boot VMs with BIOS' + 'ovmf: Boot VMs with UEFI' ) backup=( etc/conf.d/xen{commons,domains} diff --git a/xen.install b/xen.install index e7582d4e0b23..31abde264c14 100644 --- a/xen.install +++ b/xen.install @@ -39,6 +39,16 @@ Feature list http://wiki.xen.org/wiki/Xen_Project_4.8_Feature_List __EOF__ + vercmp 4.8.0-4 $1 + if [ "${?}" -lt 0 ]; then + cat << __EOF__ +!!!!! +This Xen version has split out SeaBIOS and OVMF. +If you need to use VMs with BIOS or UEFI, install seabios or ovmf respectively. +!!!!! +__EOF__ + fi + } post_install() { @@ -48,7 +58,7 @@ post_install() { } post_upgrade() { - upgrade_msg + upgrade_msg $@ systemd-tmpfiles --create } |