1 files changed, 25 insertions, 16 deletions
diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild
index 959ae1ec2b898..ad33633ef05a1 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, 2018, 2019, 2020  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,14 +25,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xen
-VERSION=${VERSION:-4.13.1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-4.15.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-SEABIOS=${SEABIOS:-1.12.1}
-OVMF=${OVMF:-20190606_20d2e5a125}
-IPXE=${IPXE:-1dd56dbd11082fb622c2ed21cfaced4f47d798a6}
+SEABIOS=${SEABIOS:-1.14.0}
+OVMF=${OVMF:-20200807_a3741780fe}
+IPXE=${IPXE:-988d2c13cdf0f0b4140685af35ced70ac5b3283c}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -55,11 +55,12 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+    cat << EOF
+
+  *** Xen x86/32 target no longer supported!
+
+EOF
+    exit
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
@@ -105,11 +106,6 @@ case "${USE_LIBSSH:-no}" in
     *) CONF_QEMUU+=" --disable-libssh" ;;
 esac
 
-case "${USE_BLUEZ:-no}" in
-  yes) CONF_QEMUU+=" --enable-bluez" ;;
-    *) CONF_QEMUU+=" --disable-bluez" ;;
-esac
-
 case "${USE_GTK:-no}" in
   yes) CONF_QEMUU+=" --enable-gtk" ;;
     *) CONF_QEMUU+=" --disable-gtk" ;;
@@ -179,6 +175,16 @@ 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
 
+# Fix ovmf firmware build
+( cd tools/firmware/ovmf-dir-remote && \
+  patch -p1 <$CWD/patches/0001-BaseTools-fix-ucs-2-lookup-on-python-3.9.patch
+  patch -p1 <$CWD/patches/0002-BaseTools-Work-around-array.array.tostring-removal-i.patch
+  patch -p1 <$CWD/patches/0003-BaseTools-replace-deprecated-fromstring-and-tostring.diff
+)
+
+# Fix binutils-2.36 build
+patch -p1 <$CWD/patches/qemu-xen-no-pie.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -200,6 +206,9 @@ make install-xen \
   MANDIR=/usr/man \
   DESTDIR=$PKG
 
+echo CONFIG_GOLANG=n >> xen/.config
+echo CONFIG_GOLANG=n > tools/.config
+
 make install-tools \
   docdir=/usr/doc/$PRGNAM-$VERSION \
   DOCDIR=/usr/doc/$PRGNAM-$VERSION \