system/kqemu: Updated for version 1.4.0pre1

4 files changed, 28 insertions, 25 deletions

diff --git a/system/kqemu/doinst.sh b/system/kqemu/doinst.sh
index a91532f67e..6834286878 100644
--- a/system/kqemu/doinst.sh
+++ b/system/kqemu/doinst.sh
@@ -1,4 +1 @@
-# Re-generate modules.dep and map files.
-if [ -x sbin/depmod ]; then
-  chroot . /sbin/depmod -ae @KERNEL@ 1> /dev/null 2> /dev/null
-fi
+/sbin/depmod -a
diff --git a/system/kqemu/kqemu.SlackBuild b/system/kqemu/kqemu.SlackBuild
index ec466278ba..4551a813b5 100644
--- a/system/kqemu/kqemu.SlackBuild
+++ b/system/kqemu/kqemu.SlackBuild
@@ -5,6 +5,8 @@
 # Copyright 2009  David Woodfall <dave@unrealize.co.uk>
 # All rights reserved.
 #
+# Thanks to Marco Pessotto for pointing out the useless depmod line
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -21,8 +23,6 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Modified by the SlackBuilds.org project
 
 PRGNAM=kqemu
 VERSION=${VERSION:-1.4.0pre1}
@@ -41,11 +41,9 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
-KERNELVERSION=${KERNELVERSION:-$(uname -r)}
-PKG_VERS=${VERSION}_$(echo $KERNELVERSION | tr - _)
-
 set -e 
 
 rm -rf $PKG
@@ -64,12 +62,12 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr \
-  --kernel-path=/lib/modules/${KERNELVERSION}/build
-
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --prefix=/usr
 make
-sed -i "s/\/lib/\$PKG\/lib/" install.sh
-PKG=$TMP/package-$PRGNAM make install
+sed -i "s#/lib#$PKG/lib#" install.sh
+sed -i "/^\/sbin\/depmod -a/d" install.sh
+make install
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp Changelog README LICENSE COPYING $PKG/usr/doc/$PRGNAM-$VERSION
@@ -77,8 +75,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-sed "s%@KERNEL@%$KERNELVERSION%" $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.tgz
-
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/kqemu/kqemu.info b/system/kqemu/kqemu.info
index d9f02e3f02..beb3a5a374 100644
--- a/system/kqemu/kqemu.info
+++ b/system/kqemu/kqemu.info
@@ -3,6 +3,8 @@ VERSION="1.4.0pre1"
 HOMEPAGE="http://www.nongnu.org/qemu"
 DOWNLOAD="http://www.nongnu.org/qemu/kqemu-1.4.0pre1.tar.gz"
 MD5SUM="d738d8ca7332211ab716ec3213d82ee1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"
 EMAIL="dave@unrealize.co.uk"
 APPROVED="dsomero"
diff --git a/system/kqemu/slack-desc b/system/kqemu/slack-desc
index 3c8fabff84..dfe7bea7c9 100644
--- a/system/kqemu/slack-desc
+++ b/system/kqemu/slack-desc
@@ -1,12 +1,19 @@
-       |-----handy-ruler------------------------------------------------------|
-kqemu: kqemu  (kermel accelerator module for qemu)
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+kqemu: kqemu (QEMU Accelerator kermel module)
 kqemu: 
-kqemu: The QEMU Accelerator (KQEMU) is a driver allowing a user application to 
-kqemu: run x86 code in a Virtual Machine (VM). The code can be either user or
-kqemu: kernel code, in 64, 32 or 16 bit protected mode. KQEMU is very similar
-kqemu: in essence to the VM86 Linux syscall call, but it adds some new concepts
-kqemu: to improve memory handling.
+kqemu: The QEMU Accelerator (KQEMU) is a driver allowing a user application 
+kqemu: to run x86 code in a Virtual Machine (VM). The code can be either 
+kqemu: user or kernel code, in 64, 32 or 16 bit protected mode. KQEMU is 
+kqemu: very similar in essence to the VM86 Linux syscall call, but it adds 
+kqemu: some new concepts to improve memory handling.
 kqemu: 
 kqemu: Homepage: http://www.nongnu.org/qemu
 kqemu: 
-kqemu: 
\ No newline at end of file
+kqemu: