From 451ae8400d2e5e365da89a52c166f86f80fb3a61 Mon Sep 17 00:00:00 2001
From: Mario Preksavec
Date: Thu, 8 Mar 2018 10:55:49 +0100
Subject: system/xen: Updated for version 4.10.0.

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

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

diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild
index 4214e973d1..726227650a 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, 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018  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.9.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.10.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SEABIOS=${SEABIOS:-1.10.0}
-OVMF=${OVMF:-20170321_5920a9d}
-IPXE=${IPXE:-827dd1bfee67daa683935ce65316f7e0f057fe1c}
+SEABIOS=${SEABIOS:-1.10.2}
+OVMF=${OVMF:-20170920_947f3737a}
+IPXE=${IPXE:-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -137,9 +137,6 @@ done
 # 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
-
 # Copy already present source tarballs
 cp $CWD/ipxe-git-$IPXE.tar.gz tools/firmware/etherboot/_ipxe.tar.gz
 (
@@ -161,20 +158,9 @@ cp $CWD/{lwip,zlib,newlib,pciutils,grub,gmp,tpm_emulator}-*.tar.?z* \
 # Prevent leaks during the build
 patch -p1 <$CWD/patches/stubdom_zlib_disable_man_install.diff
 
-# GCC7 support with help from Mark Pryor (PryMar56) and ArchLinux folks
-if [ $(gcc -dumpfullversion | cut -d. -f1) -eq 7 ]; then
-  # OVMF
-  patch -d tools/firmware/ovmf-dir \
-        -p1 <$CWD/patches/gcc7-fix-incorrect-comparison.patch
-  # vTPM
-  patch -p1 <$CWD/patches/gcc7-vtpmmgr-make-inline-static.patch
-  patch -p1 <$CWD/patches/gcc7-vtpm-implicit-fallthrough.patch
-  # Mini-OS
-  patch -d extras/mini-os \
-        -p1 <$CWD/patches/gcc7-minios-implement-udivmoddi4.patch
-  # IPXE
-  patch -p1 <$CWD/patches/patch-ipxe-patches-series.patch
-  cp $CWD/patches/patch-inbuild-ipxe*.patch tools/firmware/etherboot/patches/
+# Fix glibc-2.27 build
+if [ "$(ldd --version | awk '{print $NF; exit}')" = "2.27" ]; then
+  ( cd tools/qemu-xen && patch -p1 <$CWD/patches/glibc-memfd_fix_configure_test.patch )
 fi
 
 CFLAGS="$SLKCFLAGS" \
-- 
cgit v1.2.3