[Devil-linux-commit] build/scripts dhcpcd,1.12,1.12.2.1 eagle-usb,1.2.2.6,1.2.2.7 rp-pppoe,1.14.2.1,1.14.2.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13561/scripts

Modified Files:
      Tag: rel-1-2-patches
	dhcpcd eagle-usb rp-pppoe 
Log Message:
- updated eagle-usb to 2.3.1
- updated libxml2 to 2.6.19
- updated libxslt to 1.1.14
- updated libtool to 1.5.16
- updated binutils to 2.15.94.0.2
- updated automake to 1.9.5
- install dhcpcd,ppp and rp-pppoe into build system before build of
eagle-usb


Index: eagle-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/eagle-usb,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -d -r1.2.2.6 -r1.2.2.7
--- eagle-usb	3 May 2005 15:16:28 -0000	1.2.2.6
+++ eagle-usb	8 May 2005 16:08:03 -0000	1.2.2.7
@@ -12,7 +12,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       eagle-usb
-# Required-Start: $basebuildtools $libs linux net-tools
+# Required-Start: $basebuildtools $libs linux net-tools dhcpcd ppp rp-pppoe
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -30,30 +30,25 @@
 case $1 in
 	build )
 		if [ "$CONFIG_EAGLE_USB" = "y" ]; then
-			./autogen.sh
+			#./autogen.sh || exit 1
+			disable_et_dyn
 			./configure --prefix=/usr --with-kernel-src=$KERNELDIR --with-lang=en --with-dsp-dir=/usr/share/eagle-usb/dsp || exit 1
-			make || exit 1
+			make all|| exit 1
 		fi
 		;;
 
 	install )
-			if [ "$CONFIG_EAGLE_USB" = "y" ]; then
+		if [ "$CONFIG_EAGLE_USB" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR || exit 1
 			mkdir -p $TMPDIR/etc/eagle-usb/scripts || exit 1
 			make install DESTDIR=$TMPDIR || exit 1
 
-			mkdir -p $CDDIR/usr/share/eagle-usb/lang || exit 1
-			mv -f $TMPDIR/etc/eagle-usb/lang/* $CDDIR/usr/share/eagle-usb/lang/ || exit 1
-			rm -rf $TMPDIR/etc/eagle-usb/lang || exit 1
-
-			copy_files $TMPDIR/usr/sbin $CDDIR/usr/ || exit 1
-			copy_files $TMPDIR/lib $CDDIR || exit 1
+			copy_files $TMPDIR/usr $CDDIR/ || exit 1
+			copy_files $TMPDIR/lib $CDDIR/ || exit 1
 			copy_files $TMPDIR/etc $ETCDIR/ || exit 1
 
 			cp $MYDIR/scripts/eagle-usb $ETCDIR/etc/init.d || exit 1
-			ln -sf /usr/share/eagle-usb/dsp $ETCDIR/etc/eagle-usb || exit 1
-			ln -sf /usr/share/eagle-usb/lang $ETCDIR/etc/eagle-usb || exit 1
 			rm -rf $TMPDIR || exit 1
 
 			echo "# Initialize the Eagle USB modem?" >> $CONFIGFILE

Index: rp-pppoe
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/rp-pppoe,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- rp-pppoe	29 Jan 2005 21:16:15 -0000	1.14.2.1
+++ rp-pppoe	8 May 2005 16:08:03 -0000	1.14.2.2
@@ -39,6 +39,7 @@
 	    replace_str ../scripts/adsl-start "/usr/bin/id" "id"
 	    replace_str ../scripts/adsl-connect "/usr/bin/id" "id"
 	    strip_debug
+	    make install || exit 1
 	fi
         ;;
 

Index: dhcpcd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dhcpcd,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- dhcpcd	11 Jan 2004 14:43:04 -0000	1.12
+++ dhcpcd	8 May 2005 16:08:03 -0000	1.12.2.1
@@ -40,6 +40,7 @@
 	fi
 	./configure --prefix=/usr || exit 1
 	make $PMAKE all || exit 1
+	make install || exit 1
 	strip_debug
         ;;