From 17afea9c91729d38fb9803ea7c20c8111848c8f0 Mon Sep 17 00:00:00 2001 From: Mario Preksavec Date: Thu, 31 Mar 2016 22:38:01 +0200 Subject: system/xen: Updated for version 4.5.3. Signed-off-by: Mario Preksavec --- system/xen/doinst.sh | 9 ++++----- system/xen/dom0/kernel-xen.sh | 2 +- system/xen/xen.SlackBuild | 23 ++++++++--------------- system/xen/xen.info | 6 +++--- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/system/xen/doinst.sh b/system/xen/doinst.sh index 747b332c89..98f701f9c7 100644 --- a/system/xen/doinst.sh +++ b/system/xen/doinst.sh @@ -22,12 +22,11 @@ preserve_perms() { config $NEW } -preserve_perms etc/rc.d/rc.xen-watchdog.new -preserve_perms etc/rc.d/rc.xencommons.new -preserve_perms etc/rc.d/rc.xendomains.new +find etc/rc.d -type f -name 'rc.xen*.new' \ + | while read new ; do preserve_perms $new ; done -config etc/default/xencommons.new -config etc/default/xendomains.new +find etc/default -type f -name 'xen*.new' \ + | while read new ; do config $new ; done find etc/xen etc/qemu -type f -name '*.new' \ | while read new ; do config $new ; done diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh index 383f6d3cbe..7e13421761 100644 --- a/system/xen/dom0/kernel-xen.sh +++ b/system/xen/dom0/kernel-xen.sh @@ -6,7 +6,7 @@ # Modified by Mario Preksavec KERNEL=${KERNEL:-3.10.17} -XEN=${XEN:-4.5.2} +XEN=${XEN:-4.5.3} BOOTLOADER=${BOOTLOADER:-lilo} ROOTMOD=${ROOTMOD:-ext4} diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild index 38d3ecbfdd..a7aae6fdf6 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.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ $ARCH == "x86_64" ] && [ ! -f /usr/include/gnu/stubs-32.h ]; then +if [ "$ARCH" = "x86_64" ] && [ ! -f /usr/include/gnu/stubs-32.h ]; then cat << EOF For a 32bit guest support 32bit libs are required to build the @@ -69,14 +69,12 @@ else LIBDIRSUFFIX="" fi -USE_LIBSSH2=${USE_LIBSSH2:-no} -case "$LIBSSH2" in +case "${USE_LIBSSH2:-no}" in yes) LIBSSH2="en" ;; *) LIBSSH2="dis" ;; esac -USE_BLUEZ=${USE_BLUEZ:-no} -case "$BLUEZ" in +case "${USE_BLUEZ:-no}" in yes) BLUEZ="en" ;; *) BLUEZ="dis" ;; esac @@ -100,7 +98,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 @@ -170,9 +168,7 @@ 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 +( 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 @@ -182,10 +178,7 @@ mv $PKG/etc/udev/rules.d/xen*.rules $PKG/lib/udev/rules.d/ rmdir $PKG/etc/{rc.d/init.d,udev/rules.d,udev} # 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 diff --git a/system/xen/xen.info b/system/xen/xen.info index 188a611444..1253444631 100644 --- a/system/xen/xen.info +++ b/system/xen/xen.info @@ -1,7 +1,7 @@ PRGNAM="xen" -VERSION="4.5.2" +VERSION="4.5.3" HOMEPAGE="http://www.xenproject.org/" -DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.5.2.tar.gz \ +DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.5.3.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/lwip-1.3.0.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/zlib-1.2.3.tar.gz \ @@ -12,7 +12,7 @@ DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.5.2.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/gmp-4.3.2.tar.bz2 \ http://mirror.slackware.hr/sources/xen-extfiles/tpm_emulator-0.7.4.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/seabios-git-rel-1.7.5.tar.gz" -MD5SUM="a8cfa7bc4b27ac02885b4693fe01be82 \ +MD5SUM="a41baeb8ab0098dd2bce4249a95d1118 \ 7496268cebf47d5c9ccb0696e3b26065 \ 36cc57650cffda9a0269493be2a169bb \ debc62758716a169df9f62e6ab2bc634 \ -- cgit v1.2.3