From 2950e4fd85dfa97149c179636ae27b664d9c3157 Mon Sep 17 00:00:00 2001
From: Mario Preksavec <mario@slackware.hr>
Date: Fri, 9 Sep 2016 17:32:49 +0200
Subject: system/xen: Updated for version 4.7.0.

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

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

diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild
index 21afbcb9a9..e84c2d74e8 100644
--- a/system/xen/xen.SlackBuild
+++ b/system/xen/xen.SlackBuild
@@ -23,12 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xen
-VERSION=${VERSION:-4.6.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.7.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SEABIOS=${SEABIOS:-1.8.2}
+SEABIOS=${SEABIOS:-1.9.2}
 OVMF=${OVMF:-52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d}
+IPXE=${IPXE:-9a93db3f0947484e30e753bbd61a10b17336e20e}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -116,15 +117,21 @@ for i in $CWD/xsa/* ; do
   esac
 done
 
-# Tweak some things
+# Upstream fixes
+patch -p1 <$CWD/patches/xen-4.7-regression-when-saving-a-pv-guest.patch
+
+# 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
 
 # Let's not download stuff during the build...
 patch -p1 <$CWD/patches/use_already_present_ipxe.diff
-cp $CWD/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz \
-  tools/firmware/etherboot/_ipxe.tar.gz
+
+# Copy already present source tarballs
+cp $CWD/ipxe-git-$IPXE.tar.gz tools/firmware/etherboot/_ipxe.tar.gz
 (
   # Seabios
   cd tools/firmware
@@ -195,7 +202,7 @@ find $PKG/boot/ -type l -a -name "xen-*" -exec rm -f {} \; 2>/dev/null || true
 rmdir $PKG/etc/rc.d/init.d/
 
 # Append .new to config files
-for i in $PKG/etc/{default/*,{qemu,xen}/*.conf} ; do mv $i $i.new ; done
+for i in $PKG/etc/{default/*,xen/*.conf} ; do mv $i $i.new ; done
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-- 
cgit v1.2.3-65-gdbad