From fc59ea21bafe53eb7e633d6468bfa2a75bd54976 Mon Sep 17 00:00:00 2001
From: Mario Preksavec <mario@slackware.hr>
Date: Sun, 8 Jan 2017 17:51:53 +0100
Subject: system/xen: Updated for version 4.8.0.

Signed-off-by: Mario Preksavec <mario@slackware.hr>
---
 system/xen/xen.SlackBuild | 67 +++++++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 29 deletions(-)

(limited to 'system/xen/xen.SlackBuild')

diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild
index e4eabedb97..9694420a23 100644
--- a/system/xen/xen.SlackBuild
+++ b/system/xen/xen.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xen
 
-# Copyright 2010, 2011, 2013, 2014, 2015, 2016  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xen
-VERSION=${VERSION:-4.7.1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-4.8.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SEABIOS=${SEABIOS:-1.9.2}
-OVMF=${OVMF:-52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d}
-IPXE=${IPXE:-9a93db3f0947484e30e753bbd61a10b17336e20e}
+SEABIOS=${SEABIOS:-1.10.0}
+OVMF=${OVMF:-20160905_bc54e50}
+IPXE=${IPXE:-827dd1bfee67daa683935ce65316f7e0f057fe1c}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -73,24 +73,37 @@ else
   LIBDIRSUFFIX=""
 fi
 
+CONF_XEN="--disable-qemu-traditional --disable-rombios"
+CONF_QEMUU="--sysconfdir=/etc"
+
+case "${BUILD_STUBDOM:-no}" in
+  yes) CONF_XEN+=" --enable-stubdom" ;;
+    *) CONF_XEN+=" --disable-stubdom" ;;
+esac
+
+case "${WITH_OVMF:-yes}" in
+  no) CONF_XEN+=" --disable-ovmf" ;;
+   *) CONF_XEN+=" --enable-ovmf" ;;
+esac
+
 case "${USE_LIBSSH2:-no}" in
-  yes) CONF_LIBSSH2="en" ;;
-    *) CONF_LIBSSH2="dis" ;;
+  yes) CONF_QEMUU+=" --enable-libssh2" ;;
+    *) CONF_QEMUU+=" --disable-libssh2" ;;
 esac
 
 case "${USE_BLUEZ:-no}" in
-  yes) CONF_BLUEZ="en" ;;
-    *) CONF_BLUEZ="dis" ;;
+  yes) CONF_QEMUU+=" --enable-bluez" ;;
+    *) CONF_QEMUU+=" --disable-bluez" ;;
 esac
 
-case "${BUILD_STUBDOM:-no}" in
-  yes) CONF_STUBDOM="en" ;;
-    *) CONF_STUBDOM="dis" ;;
+case "${USE_GTK:-no}" in
+  yes) CONF_QEMUU+=" --enable-gtk" ;;
+    *) CONF_QEMUU+=" --disable-gtk" ;;
 esac
 
-case "${WITH_OVMF:-yes}" in
-  no) CONF_OVMF="dis" ;;
-   *) CONF_OVMF="en" ;;
+case "${USE_SPICE:-no}" in
+  yes) CONF_QEMUU+=" --enable-spice" ;;
+    *) CONF_QEMUU+=" --disable-spice" ;;
 esac
 
 set -e
@@ -111,16 +124,12 @@ find -L . \
 # Apply Xen Security Advisory patches
 for i in $CWD/xsa/* ; do
   case $i in
-    *qemut*.patch) patch -d tools/qemu-xen-traditional -p1 <$i ;;
-     *qemu*.patch) patch -d tools/qemu-xen -p1 <$i ;;
-          *.patch) patch -p1 <$i ;;
+    *qemut*.patch) patch --verbose -d tools/qemu-xen-traditional -p1 <$i ;;
+     *qemu*.patch) patch --verbose -d tools/qemu-xen -p1 <$i ;;
+          *.patch) patch --verbose -p1 <$i ;;
   esac
 done
 
-# Don't link with libssh and bluez by default
-sed "s/@@CONF_LIBSSH2@@/$CONF_LIBSSH2/;s/@@CONF_BLUEZ@@/$CONF_BLUEZ/" \
-  $CWD/patches/qemu_configure_options.diff | patch -p1
-
 # Remove hardlinks
 patch -p1 <$CWD/patches/symlinks_instead_of_hardlinks.diff
 
@@ -137,7 +146,9 @@ cp $CWD/ipxe-git-$IPXE.tar.gz tools/firmware/etherboot/_ipxe.tar.gz
   ln -s seabios-dir-remote seabios-dir
   make -C seabios-dir defconfig
   # OVMF
-  tar -xf $CWD/ovmf-git-$OVMF.tar.gz
+  tar -xf $CWD/xen-ovmf-$OVMF.tar.bz2
+  mv xen-ovmf-$OVMF ovmf-dir-remote
+  ln -s ovmf-dir-remote ovmf-dir
   cp ovmf-makefile ovmf-dir/Makefile
 )
 cp $CWD/{lwip,zlib,newlib,pciutils,grub,gmp,tpm_emulator}-*.tar.?z* \
@@ -153,10 +164,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-qemu-traditional \
-  --disable-rombios \
-  --${CONF_STUBDOM}able-stubdom \
-  --${CONF_OVMF}able-ovmf \
+  $CONF_XEN \
+  --with-extra-qemuu-configure-args="$CONF_QEMUU" \
   --build=$ARCH-slackware-linux
 
 make install-xen \
@@ -173,7 +182,7 @@ make install-tools \
   MANDIR=/usr/man \
   DESTDIR=$PKG
 
-if [ "$CONF_STUBDOM" = "en" ]; then
+if [ "$BUILD_STUBDOM" = "yes" ]; then
   make install-stubdom \
     docdir=/usr/doc/$PRGNAM-$VERSION \
     DOCDIR=/usr/doc/$PRGNAM-$VERSION \
-- 
cgit v1.2.3-65-gdbad