First build of the vde2 branch (needed with qemu >= 0.8).

1 files changed, 25 insertions, 6 deletions

diff --git a/vde/build/vde.SlackBuild b/vde/build/vde.SlackBuild
index cd3fbeaf..22f9e001 100755
--- a/vde/build/vde.SlackBuild
+++ b/vde/build/vde.SlackBuild
@@ -4,7 +4,7 @@
 #
 # Slackware SlackBuild script 
 # ===========================
-# By:        Eric Hameleers
+# By:        Eric Hameleers <alien@slackware.com>
 # Created:   16dec2004
 # For:       vde
 # URL:       http://vde.sourceforge.net/
@@ -22,6 +22,13 @@
 # 1.5.9-1:   05/jul/2005 by Eric Hameleers
 #            * New release. Changed the rc.vdenetwork script so that it will
 #              run out of the box.
+# 20051213-1: 13/dec/2005 by Eric Hameleers
+#            * Snapshot release of what will become 2.0.1. I need this for the
+#              current CVS version of QEMU which changed the networking
+#              parameters. VDE now comes with 'vdeoq' and 'vdeq' for the old
+#              and the new interface respectively.
+# 2.0.1-1:   03/jan/2006 by Eric Hameleers <alien@slackware.com>
+#            * New release, adapted to qemu >= 0.8
 #
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
@@ -38,9 +45,10 @@ if [ "$TMP" = "" ]; then
 fi
 
 PRGNAM=vde
-VERSION=1.5.9
+VERSION=2.0
 ARCH=${ARCH:-i486}
 BUILD=1
+CVS=no
 
 if [ "$ARCH" = "i386" ]; then
   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
@@ -83,10 +91,16 @@ cd $TMP/tmp-$PRGNAM
 # --- TARBALL EXTRACTION,PATCH,MODIFY ---
 
 echo "Extracting the program tarball for $PRGNAM..."
-tar -xzvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+if [ -f $CWD/${PRGNAM}-${VERSION}.tar.gz ]; then
+  tar -xzvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+else
+  tar -xjvf $CWD/${PRGNAM}-${VERSION}.tar.bz2
+fi
 
 cd ${PRGNAM}-${VERSION}
-patch -p1 < $CWD/vde-DESTDIR.patch
+#patch -p1 < $CWD/vde-DESTDIR.patch
+(cd qemu && patch -p0 < $CWD/vde_vdeq.patch
+)
 
 # Get rid of the references to /usr/local in vdetap output, man page
 sed -i 's|local/lib|lib|g' vdetaplib/vdetap.c
@@ -99,6 +113,9 @@ chown -R root.root *
 
 echo Building ...
 
+# For the CVS snapshot:
+[ "$CVS" = "yes" ] && autoreconf --install
+
 ./configure --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
@@ -117,9 +134,11 @@ else
   make DESTDIR=$PKG install 2>&1 |tee $CWD/install-${PRGNAM}.log
 fi
 
-# Fix incorrect link
+# Fix incorrect links
 (cd $PKG/usr/bin &&
  rm -f vdeqemu; ln -s vdeq vdeqemu
+ rm -f vdeo; ln -s vdeq vdeo
+ rm -f vdeoqemu; ln -s vdeq vdeoqemu
 )
 
 
@@ -130,7 +149,7 @@ cp bochs/README README.bochs
 cp slirpvde/README README.slirpvde
 cp uml/README README.uml
 
-DOCS="COPYING LICENSE README* VERSION \
+DOCS="COPYING LICENSE README* VERSION qemu/qemu-vde-HOWTO \
       $CWD/rc.vdenetwork $CWD/Using_VDE_with_QEMU_HOWTO.txt"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION