diff options
Diffstat (limited to 'system/xen/xen.SlackBuild')
| -rw-r--r-- | system/xen/xen.SlackBuild | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild index 38d3ecbfdd..fc7746cb1f 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 Mario Preksavec, Zagreb, Croatia +# Copyright 2010, 2011, 2013, 2014, 2015, 2016 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xen -VERSION=${VERSION:-4.5.2} +VERSION=${VERSION:-4.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -100,7 +100,7 @@ find -L . \ for i in $CWD/patches/xsa* ; do case $i in *qemut*.patch) patch -d tools/qemu-xen-traditional -p1 <$i ;; - *qemuu*.patch) patch -d tools/qemu-xen -p1 <$i ;; + *qemu*.patch) patch -d tools/qemu-xen -p1 <$i ;; *.patch) patch -p1 <$i ;; esac done @@ -110,21 +110,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-1.8.2.tar.gz + mv seabios-1.8.2 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" \ @@ -136,6 +137,8 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-qemu-traditional \ + --disable-rombios \ --build=$ARCH-slackware-linux make install-xen \ @@ -170,22 +173,13 @@ make install-docs \ find $PKG/boot/ -type l -a -name "xen-*" -exec rm -f {} \; 2>/dev/null || true # Move from SYSV to BSD init scripts -mv $PKG/etc/rc.d/init.d/xen-watchdog $PKG/etc/rc.d/rc.xen-watchdog.new -mv $PKG/etc/rc.d/init.d/xencommons $PKG/etc/rc.d/rc.xencommons.new -mv $PKG/etc/rc.d/init.d/xendomains $PKG/etc/rc.d/rc.xendomains.new - -# 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/ +( cd $PKG/etc/rc.d/init.d && for i in * ; do mv $i ../rc.$i.new ; done ) # 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/xen/*.conf ; do mv $i $i.new ; done -mv $PKG/etc/qemu/target-x86_64.conf $PKG/etc/qemu/target-x86_64.conf.new -mv $PKG/etc/default/xencommons $PKG/etc/default/xencommons.new -mv $PKG/etc/default/xendomains $PKG/etc/default/xendomains.new +for i in $PKG/etc/{default/*,{qemu,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 |