1 files changed, 28 insertions, 19 deletions
diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild
index a7aae6fdf6..1380cd38bc 100644
--- a/system/xen/xen.SlackBuild
+++ b/system/xen/xen.SlackBuild
@@ -23,10 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xen
-VERSION=${VERSION:-4.5.3}
+VERSION=${VERSION:-4.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SEABIOS=${SEABIOS:-1.8.2}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -79,6 +81,11 @@ case "${USE_BLUEZ:-no}" in
     *) BLUEZ="dis" ;;
 esac
 
+case "${BUILD_STUBDOM:-no}" in
+  yes) STUBDOM="en" ;;
+    *) STUBDOM="dis" ;;
+esac
+
 set -e
 
 rm -rf $PKG
@@ -108,21 +115,22 @@ sed "s/@@LIBSSH2@@/$LIBSSH2/;s/@@BLUEZ@@/$BLUEZ/" \
   $CWD/patches/qemu_configure_options.diff | patch -p1
 patch -p1 <$CWD/patches/symlinks_instead_of_hardlinks.diff
 
-# Local attach support for PHY backends using scripts
-patch -p1 <$CWD/patches/local_attach_support_for_phy.patch
-
 # Let's not download stuff during the build...
 patch -p1 <$CWD/patches/use_already_present_ipxe.diff
 patch -p1 <$CWD/patches/disable_git_checkout.diff
 cp $CWD/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz \
   tools/firmware/etherboot/_ipxe.tar.gz
-tar -xf $CWD/seabios-git-rel-1.7.5.tar.gz \
-  -C tools/firmware
+(
+  cd tools/firmware
+  tar -xf $CWD/seabios-$SEABIOS.tar.gz
+  mv seabios-$SEABIOS seabios-dir-remote
+  ln -s seabios-dir-remote seabios-dir
+)
 cp $CWD/{lwip,zlib,newlib,pciutils,grub,gmp,tpm_emulator}-*.tar.?z* \
   $CWD/polarssl-*.tgz stubdom
 
-# Occasionally, parallel building fails
-patch -p1 <$CWD/patches/libcacard_fix_parallel_compile.patch
+# Fix: custom memory allocation vtable not supported
+patch -p1 <$CWD/patches/remove_malloc_tracing.diff
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -134,6 +142,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-qemu-traditional \
+  --disable-rombios \
+  --${STUBDOM}able-stubdom \
   --build=$ARCH-slackware-linux
 
 make install-xen \
@@ -150,12 +161,14 @@ make install-tools \
   MANDIR=/usr/man \
   DESTDIR=$PKG
 
-make install-stubdom \
-  docdir=/usr/doc/$PRGNAM-$VERSION \
-  DOCDIR=/usr/doc/$PRGNAM-$VERSION \
-  mandir=/usr/man \
-  MANDIR=/usr/man \
-  DESTDIR=$PKG
+if [ "$STUBDOM" = "en" ]; then
+  make install-stubdom \
+    docdir=/usr/doc/$PRGNAM-$VERSION \
+    DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    mandir=/usr/man \
+    MANDIR=/usr/man \
+    DESTDIR=$PKG
+fi
 
 make install-docs \
   docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -170,12 +183,8 @@ find $PKG/boot/ -type l -a -name "xen-*" -exec rm -f {} \; 2>/dev/null || true
 # Move from SYSV to BSD init scripts
 ( cd $PKG/etc/rc.d/init.d && for i in * ; do mv $i ../rc.$i.new ; done )
 
-# Put udev rules files in the right place
-mkdir -p $PKG/lib/udev/rules.d
-mv $PKG/etc/udev/rules.d/xen*.rules $PKG/lib/udev/rules.d/
-
 # Remove empty directories
-rmdir $PKG/etc/{rc.d/init.d,udev/rules.d,udev}
+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