[Devil-linux-commit] build/scripts binutils,1.11,1.12 build.sh,1.87,1.88 devfsd,1.4,1.5 kbd,1.7,1.8 mgetty,1.9,1.10 minicom,1.6,1.7 modutils,1.19,1.20 motion,1.3,1.4 ncurses,1.9,1.10 net-snmp,1.6,1.7 ntop,1.6,1.7 ppp,1.18,1.19 ser,1.2,1.3

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

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

Modified Files:
	binutils build.sh devfsd kbd mgetty minicom modutils motion 
	ncurses net-snmp ntop ppp ser 
Log Message:
some files still used $WORKDIR/tmp


Index: mgetty
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mgetty,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mgetty	12 Dec 2004 21:48:08 -0000	1.9
+++ mgetty	13 Dec 2004 16:41:11 -0000	1.10
@@ -43,7 +43,7 @@
 
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR/usr/sbin || exit 1
-			make install CONFDIR=$TMPDIR/etc/mgetty+sendfax prefix=$WORKDIR/tmp/usr || exit 1
+			make install CONFDIR=$TMPDIR/etc/mgetty+sendfax prefix=$TMPDIR/usr || exit 1
 
 			pushd callback > /dev/null
 			make install BINDIR=$TMPDIR/usr/bin \

Index: modutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/modutils,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- modutils	12 Dec 2004 21:48:08 -0000	1.19
+++ modutils	13 Dec 2004 16:41:11 -0000	1.20
@@ -43,7 +43,7 @@
 	rm -rf $TMPDIR || exit 1
 	mkdir -p $TMPDIR/sbin || exit 1
 	mkdir -p $TMPDIR/usr/share/man/man{1,2,5,8} || exit 1
-	make install prefix=$TMPDIR/usr exec_prefix=$WORKDIR/tmp mandir=$WORKDIR/tmp/usr/share/man || exit 1
+	make install prefix=$TMPDIR/usr exec_prefix=$TMPDIR mandir=$TMPDIR/usr/share/man || exit 1
 	copy_docs $TMPDIR
 	copy_files $TMPDIR/sbin $CDDIR/ || exit 1
 	rm -rf $TMPDIR || exit 1

Index: ser
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ser,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ser	12 Dec 2004 21:48:09 -0000	1.2
+++ ser	13 Dec 2004 16:41:11 -0000	1.3
@@ -25,7 +25,7 @@
 
 MYNAME=SER
 
-MAKEOPT="prefix=/usr cfg-target=/etc/ser/ cfg-prefix=$TMPDIR BASEDIR=$WORKDIR/tmp"
+MAKEOPT="prefix=/usr cfg-target=/etc/ser/ cfg-prefix=$TMPDIR BASEDIR=$TMPDIR"
 MAKEOPT="$MAKEOPT USER_TLS=1"
 EXCLUDEMODULES="cpl cpl-c ext extcmd postgres snmp im radius_acc radius_auth jabber auth_radius group_radius uri_radius"
 if [ "$CONFIG_MYSQL_CLIENT" != "y" ]; then

Index: net-snmp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- net-snmp	12 Dec 2004 21:48:08 -0000	1.6
+++ net-snmp	13 Dec 2004 16:41:11 -0000	1.7
@@ -42,7 +42,7 @@
 		if [ "$CONFIG_NET_SNMP" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR || exit 1
-			make install prefix=$TMPDIR/usr exec_prefix=$WORKDIR/tmp/usr sysconfdir=$WORKDIR/tmp/etc persistentdir=$WORKDIR/tmp/var/net-snmp || exit 1
+			make install prefix=$TMPDIR/usr exec_prefix=$TMPDIR/usr sysconfdir=$TMPDIR/etc persistentdir=$TMPDIR/var/net-snmp || exit 1
 			copy_docs $TMPDIR
 			rm -rf $TMPDIR/usr/include || exit 1
 			cp -dpR $TMPDIR/usr/share $CDDIR/usr/ || exit 1

Index: ncurses
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ncurses,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ncurses	12 Dec 2004 21:48:08 -0000	1.9
+++ ncurses	13 Dec 2004 16:41:11 -0000	1.10
@@ -41,7 +41,7 @@
 		rm $TMPDIR/usr/lib/*.a || exit 1
 		rm $TMPDIR/usr/lib/terminfo || exit 1
 		mkdir -p $TMPDIR/lib || exit 1
-		mv $TMPDIR/usr/lib/* $WORKDIR/tmp/lib || exit 1
+		mv $TMPDIR/usr/lib/* $TMPDIR/lib || exit 1
 		chmod 755 $TMPDIR/lib/* || exit 1
 		cp -dpR $TMPDIR/usr/share/* $CDDIR/usr/share || exit 1
 		rm -rf $TMPDIR/usr/share || exit 1

Index: ntop
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ntop,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ntop	12 Dec 2004 21:48:08 -0000	1.6
+++ ntop	13 Dec 2004 16:41:11 -0000	1.7
@@ -50,7 +50,7 @@
 
 			mkdir -p $TMPDIR/usr/share/ntop || exit 1
 			chmod -x $TMPDIR/etc/ntop/*.gz 
-			mv -f $TMPDIR/etc/ntop/*.gz $WORKDIR/tmp/usr/share/ntop/ || exit 1
+			mv -f $TMPDIR/etc/ntop/*.gz $TMPDIR/usr/share/ntop/ || exit 1
 			ln -sf /usr/share/ntop/etter.passive.os.fp.gz $TMPDIR/etc/ntop/etter.passive.os.fp.gz || exit 1
 			ln -sf /usr/share/ntop/oui.txt.gz $TMPDIR/etc/ntop/oui.txt.gz || exit 1
 			ln -sf /usr/share/ntop/p2c.opt.table.gz $TMPDIR/etc/ntop/p2c.opt.table.gz || exit 1

Index: kbd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/kbd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kbd	12 Dec 2004 21:48:08 -0000	1.7
+++ kbd	13 Dec 2004 16:41:11 -0000	1.8
@@ -33,7 +33,7 @@
     install )
 	rm -rf $TMPDIR || exit 1
 	mkdir -p $TMPDIR || exit 1
-	make install DESTDIR=$TMPDIR DATADIR=$WORKDIR/tmp/usr/share/kbd MANDIR=$WORKDIR/tmp/usr/share/man  || exit 1
+	make install DESTDIR=$TMPDIR DATADIR=$TMPDIR/usr/share/kbd MANDIR=$TMPDIR/usr/share/man  || exit 1
 	copy_docs $TMPDIR
 	cp -dfpR $TMPDIR/* $CDDIR/ || exit 1
 	rm -rf $TMPDIR || exit 1

Index: motion
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/motion,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- motion	12 Dec 2004 21:48:08 -0000	1.3
+++ motion	13 Dec 2004 16:41:11 -0000	1.4
@@ -38,8 +38,8 @@
 			else
 			    OPT_FLAGS="$OPT_FLAGS --with-pgsql=/usr/include"
 			fi
-			/bin/sh configure --prefix=$TMPDIR/usr --bindir=$WORKDIR/tmp/usr/sbin \
-			    --sysconfdir=$TMPDIR/etc --mandir=$WORKDIR/tmp/usr/share/man $OPT_FLAGS || exit 1
+			/bin/sh configure --prefix=$TMPDIR/usr --bindir=$TMPDIR/usr/sbin \
+			    --sysconfdir=$TMPDIR/etc --mandir=$TMPDIR/usr/share/man $OPT_FLAGS || exit 1
 			make $PMAKE all || exit 1
 			strip_debug
 		fi

Index: devfsd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/devfsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- devfsd	11 Jan 2004 14:43:04 -0000	1.4
+++ devfsd	13 Dec 2004 16:41:11 -0000	1.5
@@ -25,11 +25,15 @@
 
 case $1 in
 	build )
+	    # being replaced by udev
+	    exit 0
 		make $PMAKE || exit 1
 		strip_debug
 		;;
 
 	install )
+	    # being replaced by udev
+	    exit 0
 		cp devfsd $CDDIR/sbin || exit 1
 		cp devfsd.conf $ETCDIR/etc || exit 1
 		cp modules.devfs $ETCDIR/etc || exit 1

Index: ppp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ppp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ppp	12 Dec 2004 21:48:08 -0000	1.18
+++ ppp	13 Dec 2004 16:41:11 -0000	1.19
@@ -48,7 +48,7 @@
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR || exit 1
 			make install DESTDIR=$TMPDIR/usr || exit 1
-			make install-etcppp ETCDIR=$TMPDIR/etc/ppp DESTDIR=$WORKDIR/tmp/usr || exit 1
+			make install-etcppp ETCDIR=$TMPDIR/etc/ppp DESTDIR=$TMPDIR/usr || exit 1
 			rm -rf $TMPDIR/usr/include || exit 1
 			copy_docs $TMPDIR || exit 1
 			copy_files $TMPDIR/usr $CDDIR/ || exit 1

Index: minicom
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/minicom,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- minicom	12 Dec 2004 21:48:08 -0000	1.6
+++ minicom	13 Dec 2004 16:41:11 -0000	1.7
@@ -40,7 +40,7 @@
 		mkdir -p $TMPDIR || exit 1
 		make install DESTDIR=$TMPDIR || exit 1
 		mkdir -p $TMPDIR/usr/share/man || exit 1
-		mv $TMPDIR/usr/man/* $WORKDIR/tmp/usr/share/man/ || exit 1
+		mv $TMPDIR/usr/man/* $TMPDIR/usr/share/man/ || exit 1
 		copy_files $TMPDIR/usr $CDDIR || exit 1
 		rm -rf $TMPDIR || exit 1
 	fi

Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- build.sh	12 Dec 2004 21:48:08 -0000	1.87
+++ build.sh	13 Dec 2004 16:41:11 -0000	1.88
@@ -114,7 +114,8 @@
 				fi
 
 				if [ "$BEFORENO" != ""  ] ; then
-				    REQ="\$($BEFORENO)"
+				    #REQ="\$($BEFORENO)"
+				    REQ=" | \$($BEFORENO)"
 				else
 				    REQ=""
 				fi
@@ -128,7 +129,8 @@
 				    echo "		mkdir -p $WORKDIR/LOGS/$CMD" >> $WORKDIR/Makefile.$CMD
 				    LOG="&> $WORKDIR/LOGS/$CMD/$SCRIPT"
 				fi
-				echo "		( test -f $DONEFILE || ( source $MYDIR/settings ; reset_kernel_includes ; enable_et_dyn ; cd $SOURCEDIR ; ( $NICE $MYDIR/$SCRIPT $CMD $LOG ) ) )" >> $WORKDIR/Makefile.$CMD
+				#echo "		( test -f $DONEFILE || ( source $MYDIR/settings ; reset_kernel_includes ; enable_et_dyn ; cd $SOURCEDIR ; ( $NICE $MYDIR/$SCRIPT $CMD $LOG ) ) )" >> $WORKDIR/Makefile.$CMD
+				echo "		(  source $MYDIR/settings ; reset_kernel_includes ; enable_et_dyn ; cd $SOURCEDIR ; ( $NICE $MYDIR/$SCRIPT $CMD $LOG ) )" >> $WORKDIR/Makefile.$CMD
 				echo "		touch $DONEFILE" >> $WORKDIR/Makefile.$CMD
 				echo >> $WORKDIR/Makefile.$CMD
 				

Index: binutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/binutils,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- binutils	12 Dec 2004 21:48:08 -0000	1.11
+++ binutils	13 Dec 2004 16:41:11 -0000	1.12
@@ -57,7 +57,7 @@
 			cd $WORKDIR/binutils-build || exit 1
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR/usr/bin || exit 1
-			make tooldir=$TMPDIR/usr  prefix=$WORKDIR/tmp/usr install || exit 1
+			make tooldir=$TMPDIR/usr  prefix=$TMPDIR/usr install || exit 1
 			
 			rm -rf $TMPDIR/usr/share || exit 1