Thread: [Devil-linux-commit] build/scripts LPRng,1.1,1.2 LVM,1.16,1.17 LVM2,1.6,1.7 MOSIX,1.8,1.9 Mail-SpamA

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	LPRng LVM LVM2 MOSIX Mail-SpamAssassin alsa-driver alsa-lib 
	alsa-utils alsaplayer apcupsd arpwatch bind binutils 
	bridge-utils build.sh bzip2 camsource cd_cleanup cdrtools 
	clamav coreutils cpqarrayd cron cvs cyrus-imapd cyrus-sasl dar 
	dhcp diffutils dnsmasq dovecot e2fsprogs eagle-usb ethtool 
	ez-ipupdate fetchmail file findutils frox gawk gcc glibc gnupg 
	grep groff grsecurity grub heartbeat heimdal httpd iANS 
	inetutils ipac-ng iptables isapnptools jfsutils jftpgw joe kbd 
	lcd4linux lftp linux-wlan-ng lm_sensors longhaul lynx make man 
	mc mgetty minicom module-init-tools modutils motion mt-st 
	mtools mysql nail nbd ncftp ncurses net-snmp net-tools 
	netacct-mysql ntop ntp oidentd openldap openssh openssl 
	openswan openvpn passwdgen pciutils pcmcia-cs perl php poptop 
	portslave postgresql ppp procps psmisc quagga quota-tools 
	radvd raidtools razor-agents rcs reiserfsprogs rp-pppoe rpm 
	rrdtool rsync sagator samba screen sed ser settings sg3_utils 
	shadow shfs shorewall smartmontools snort squid squidguard 
	sudo sysstat sysvinit telnet-bsd thttpd unzip usbutils 
	util-linux vim vlan vsftpd vtun watchdog wget which 
	wireless_tools wol yp-tools ypbind-mt ypserv zip 
Log Message:
- build system: allow parallel execution of build scripts to speed up compile
- build system: made all install scripts thread safe
- allow only 2 parallel compile jobs, most programs fail otherwise anyway


Index: netacct-mysql
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/netacct-mysql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9

--- netacct-mysql	3 May 2004 15:33:36 -0000	1.8
+++ netacct-mysql	12 Dec 2004 21:48:08 -0000	1.9
@@ -35,13 +35,13 @@
         ;;
     install )
 	if [ "$CONFIG_NETACCT" = "y" ]; then
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR/usr/sbin || exit 1
 
-		make install DESTDIR=$WORKDIR/tmp
-		copy_docs $WORKDIR/tmp
+		make install DESTDIR=$TMPDIR
+		copy_docs $TMPDIR
 		mkdir -p $ETCDIR/etc || exit 1
-		cp -dpR $WORKDIR/tmp/usr $CDDIR || exit 1
+		cp -dpR $TMPDIR/usr $CDDIR || exit 1
 		cp -p $MYDIR/scripts/nacctd $ETCDIR/etc/init.d || exit 1
 
 		echo "# Start $MYNAME?" >> $CONFIGFILE
@@ -49,7 +49,7 @@
 		echo >> $CONFIGFILE
 		echo "HELP_$MYNAME=\"$MYNAME is a daemon that logs network traffic\"" >> $SOFTWAREHELP
 
-		rm -rf $WORKDIR/tmp || exit 1
+		rm -rf $TMPDIR || exit 1
 	fi
     	;;
     

Index: reiserfsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/reiserfsprogs,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- reiserfsprogs	10 Sep 2004 23:16:24 -0000	1.15
+++ reiserfsprogs	12 Dec 2004 21:48:09 -0000	1.16
@@ -33,14 +33,14 @@
 
     install )
 		disable_et_dyn
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp || exit 1
-		make install DESTDIR=$WORKDIR/tmp || exit 1
-		copy_docs $WORKDIR/tmp
-		cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR || exit 1
+		copy_docs $TMPDIR
+		cp -dpR $TMPDIR/* $CDDIR || exit 1
 		ln -sf mkreiserfs $CDDIR/sbin/mkfs.reiserfs || exit 1
 		ln -sf reiserfsck $CDDIR/sbin/fsck.reiserfs || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		rm -rf $TMPDIR || exit 1
 		;;
 
 	* )

Index: modutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/modutils,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- modutils	18 Sep 2004 20:25:05 -0000	1.18
+++ modutils	12 Dec 2004 21:48:08 -0000	1.19
@@ -40,13 +40,13 @@
         ;;
 
     install )
-	rm -rf $WORKDIR/tmp || exit 1
-	mkdir -p $WORKDIR/tmp/sbin || exit 1
-	mkdir -p $WORKDIR/tmp/usr/share/man/man{1,2,5,8} || exit 1
-	make install prefix=$WORKDIR/tmp/usr exec_prefix=$WORKDIR/tmp mandir=$WORKDIR/tmp/usr/share/man || exit 1
-	copy_docs $WORKDIR/tmp
-	copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1
-	rm -rf $WORKDIR/tmp || exit 1
+	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
+	copy_docs $TMPDIR
+	copy_files $TMPDIR/sbin $CDDIR/ || exit 1
+	rm -rf $TMPDIR || exit 1
 	rm $ETCDIR/etc/modprobe.conf 2> /dev/null
     	;;
 

Index: MOSIX
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/MOSIX,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MOSIX	11 Jan 2004 14:43:04 -0000	1.8
+++ MOSIX	12 Dec 2004 21:48:08 -0000	1.9
@@ -36,22 +36,22 @@
 
 	install )
 		if [ "$CONFIG_MOSIX" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp/usr/bin || exit 1
-			make install ROOT=$WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR/usr/bin || exit 1
+			make install ROOT=$TMPDIR || exit 1
 
 			mkdir -p $CDDIR/usr/share/mosix || exit 1
 			cp LICENSE $CDDIR/usr/share/mosix/ || exit 1
 			cp README $CDDIR/usr/share/mosix/ || exit 1
-			copy_docs $WORKDIR/tmp
+			copy_docs $TMPDIR
 			copy_man ./man3
 			copy_man ./man7
 
-			rm -rf $WORKDIR/tmp/usr/share || exit 1
-			rm -rf $WORKDIR/tmp/usr/include || exit 1
-			rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
-			cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
-			rm -rf $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR/usr/share || exit 1
+			rm -rf $TMPDIR/usr/include || exit 1
+			rm -rf $TMPDIR/usr/lib/*a || exit 1
+			cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+			rm -rf $TMPDIR || exit 1
 			
 			#echo "#cluster    /mfs    mfs    auto,dfsa=1    0 0" >> $ETCDIR/etc/fstab || exit 1
 

Index: alsa-utils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/alsa-utils,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- alsa-utils	11 Jan 2004 14:43:04 -0000	1.8
+++ alsa-utils	12 Dec 2004 21:48:08 -0000	1.9
@@ -39,13 +39,13 @@
 
     install )
 	if [ "$CONFIG_ALSA" = "y" ]; then
-            rm -rf $WORKDIR/tmp || exit 1
-	    mkdir $WORKDIR/tmp || exit 1
-	    make install DESTDIR=$WORKDIR/tmp || exit 1
-	    copy_files $WORKDIR/tmp/usr/sbin/ $CDDIR/ || exit 1
-	    copy_files $WORKDIR/tmp/usr/bin/ $CDDIR/ || exit 1
+            rm -rf $TMPDIR || exit 1
+	    mkdir $TMPDIR || exit 1
+	    make install DESTDIR=$TMPDIR || exit 1
+	    copy_files $TMPDIR/usr/sbin/ $CDDIR/ || exit 1
+	    copy_files $TMPDIR/usr/bin/ $CDDIR/ || exit 1
 	    copy_files /usr/share/alsa/ $CDDIR/usr/share/ || exit 1
-	    rm -rf $WORKDIR/tmp || exit 1
+	    rm -rf $TMPDIR || exit 1
 #	    rm -rf /usr/include/alsa
 #	    rm -rf /usr/share/alsa
 	fi

Index: inetutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/inetutils,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inetutils	10 Sep 2004 23:16:24 -0000	1.1
+++ inetutils	12 Dec 2004 21:48:08 -0000	1.2
@@ -40,11 +40,11 @@
 		;;
 
 	install )
-		rm -rf $WORKDIR/tmp || exit 1
-		make install DESTDIR=$WORKDIR/tmp || exit 1
-		copy_docs $WORKDIR/tmp
-		cp -vdpR $WORKDIR/tmp/* $CDDIR/ || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		rm -rf $TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR || exit 1
+		copy_docs $TMPDIR
+		cp -vdpR $TMPDIR/* $CDDIR/ || exit 1
+		rm -rf $TMPDIR || exit 1
 		;;
 
 	* )

Index: camsource
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/camsource,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- camsource	11 Jan 2004 14:43:04 -0000	1.5
+++ camsource	12 Dec 2004 21:48:08 -0000	1.6
@@ -35,17 +35,17 @@
 
 	install )
 		if [ "$CONFIG_CAMSOURCE" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp/usr/bin || exit 1
-			make install DESTDIR=$WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR/usr/bin || exit 1
+			make install DESTDIR=$TMPDIR || exit 1
 
-			rm -rf $WORKDIR/tmp/usr/include || exit 1
-			rm $WORKDIR/tmp/usr/lib/camsource/*a || exit 1
+			rm -rf $TMPDIR/usr/include || exit 1
+			rm $TMPDIR/usr/lib/camsource/*a || exit 1
 
-			cp -dp $WORKDIR/tmp/etc/* $ETCDIR/etc || exit 1
+			cp -dp $TMPDIR/etc/* $ETCDIR/etc || exit 1
 
-			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-			rm -rf $WORKDIR/tmp || exit 1
+			copy_files $TMPDIR/usr $CDDIR/ || exit 1
+			rm -rf $TMPDIR || exit 1
 
 			mkdir -p $DOCDIR/camsource || exit 1
 			cp -dp README $DOCDIR/camsource || exit 1

Index: kbd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/kbd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kbd	14 Jan 2004 22:41:27 -0000	1.6
+++ kbd	12 Dec 2004 21:48:08 -0000	1.7
@@ -31,12 +31,12 @@
 	;;
 
     install )
-	rm -rf $WORKDIR/tmp || exit 1
-	mkdir -p $WORKDIR/tmp || exit 1
-	make install DESTDIR=$WORKDIR/tmp DATADIR=$WORKDIR/tmp/usr/share/kbd MANDIR=$WORKDIR/tmp/usr/share/man  || exit 1
-	copy_docs $WORKDIR/tmp
-	cp -dfpR $WORKDIR/tmp/* $CDDIR/ || exit 1
-	rm -rf $WORKDIR/tmp || exit 1
+	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
+	copy_docs $TMPDIR
+	cp -dfpR $TMPDIR/* $CDDIR/ || exit 1
+	rm -rf $TMPDIR || exit 1
 	;;
 
     * )

Index: vtun
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/vtun,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- vtun	11 Jan 2004 14:43:05 -0000	1.11
+++ vtun	12 Dec 2004 21:48:09 -0000	1.12
@@ -39,13 +39,13 @@
 
     install )
 	if [ "$CONFIG_VTUN" = "y" ]; then
-            rm -rf $WORKDIR/tmp || exit 1
-	    make install DESTDIR=$WORKDIR/tmp || exit 1
-	    copy_docs $WORKDIR/tmp
+            rm -rf $TMPDIR || exit 1
+	    make install DESTDIR=$TMPDIR || exit 1
+	    copy_docs $TMPDIR
 
-            copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-	    copy_files $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
-            rm -rf $WORKDIR/tmp || exit 1
+            copy_files $TMPDIR/usr $CDDIR/ || exit 1
+	    copy_files $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
+            rm -rf $TMPDIR || exit 1
 	    cp $MYDIR/scripts/vtun $ETCDIR/etc/init.d || exit 1
 	    
 	    echo "# Start vtund?" >> $CONFIGFILE

Index: sysvinit
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sysvinit,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sysvinit	10 Sep 2004 23:16:25 -0000	1.11
+++ sysvinit	12 Dec 2004 21:48:09 -0000	1.12
@@ -34,19 +34,19 @@
 
 	install )
 		cd src
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp/bin || exit 1
-		mkdir -p $WORKDIR/tmp/sbin || exit 1
-		mkdir -p $WORKDIR/tmp/usr/{bin,include} || exit 1
-		mkdir -p $WORKDIR/tmp/usr/share/man/man{1,5,8} || exit 1
-		make install ROOT=$WORKDIR/tmp || exit 1
-		rm -rf $WORKDIR/tmp/usr/include || exit 1
-		rm -f $WORKDIR/tmp/usr/sbin/sulogin || exit 1
-		copy_docs $WORKDIR/tmp
-		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR/bin || exit 1
+		mkdir -p $TMPDIR/sbin || exit 1
+		mkdir -p $TMPDIR/usr/{bin,include} || exit 1
+		mkdir -p $TMPDIR/usr/share/man/man{1,5,8} || exit 1
+		make install ROOT=$TMPDIR || exit 1
+		rm -rf $TMPDIR/usr/include || exit 1
+		rm -f $TMPDIR/usr/sbin/sulogin || exit 1
+		copy_docs $TMPDIR
+		cp -dpR $TMPDIR/* $CDDIR/ || exit 1
 		# busybox reboot is crap
-		#cp -dpR $WORKDIR/tmp/sbin/{halt,reboot} $INITRDDIR/sbin/ || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		#cp -dpR $TMPDIR/sbin/{halt,reboot} $INITRDDIR/sbin/ || exit 1
+		rm -rf $TMPDIR || exit 1
 		;;
 		
 	* )

Index: ppp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ppp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ppp	28 Nov 2004 18:09:12 -0000	1.17
+++ ppp	12 Dec 2004 21:48:08 -0000	1.18
@@ -45,15 +45,15 @@
 
 	install )
 		if [ "$CONFIG_PPP" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp || exit 1
-			make install DESTDIR=$WORKDIR/tmp/usr || exit 1
-			make install-etcppp ETCDIR=$WORKDIR/tmp/etc/ppp DESTDIR=$WORKDIR/tmp/usr || exit 1
-			rm -rf $WORKDIR/tmp/usr/include || exit 1
-			copy_docs $WORKDIR/tmp || exit 1
-			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-			copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1
-			rm -rf $WORKDIR/tmp || exit 1
+			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
+			rm -rf $TMPDIR/usr/include || exit 1
+			copy_docs $TMPDIR || exit 1
+			copy_files $TMPDIR/usr $CDDIR/ || exit 1
+			copy_files $TMPDIR/etc $ETCDIR/ || exit 1
+			rm -rf $TMPDIR || exit 1
 		fi
 		;;
 

Index: mtools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mtools,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mtools	10 Sep 2004 23:16:24 -0000	1.9
+++ mtools	12 Dec 2004 21:48:08 -0000	1.10
@@ -39,14 +39,14 @@
 
 	install )
 	    if [ "$CONFIG_MTOOLS" = "y" ]; then
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp/usr/bin || exit 1
-		make install prefix=$WORKDIR/tmp/usr || exit 1
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR/usr/bin || exit 1
+		make install prefix=$TMPDIR/usr || exit 1
 
-		copy_docs $WORKDIR/tmp
+		copy_docs $TMPDIR
 		mkdir -p $CDDIR
-		copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		copy_files $TMPDIR/usr $CDDIR/ || exit 1
+		rm -rf $TMPDIR || exit 1
 	    fi
 	    ;;
 

Index: findutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/findutils,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- findutils	11 Jan 2004 14:43:04 -0000	1.10
+++ findutils	12 Dec 2004 21:48:08 -0000	1.11
@@ -31,14 +31,14 @@
 		;;
 
 	install )
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp/usr || exit 1
-		make install DESTDIR=$WORKDIR/tmp/ || exit 1
-		copy_docs $WORKDIR/tmp
-		rm -rf $WORKDIR/tmp/usr/libexec || exit 1
-		rm -rf $WORKDIR/tmp/usr/info || exit 1
-		cp -dpR $WORKDIR/tmp/* $CDDIR/|| exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR/usr || exit 1
+		make install DESTDIR=$TMPDIR/ || exit 1
+		copy_docs $TMPDIR
+		rm -rf $TMPDIR/usr/libexec || exit 1
+		rm -rf $TMPDIR/usr/info || exit 1
+		cp -dpR $TMPDIR/* $CDDIR/|| exit 1
+		rm -rf $TMPDIR || exit 1
 		mkdir -p $CDDIR/var/locatedb || exit 1
 		;;
 

Index: mysql
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mysql,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mysql	12 Nov 2004 01:23:57 -0000	1.19
+++ mysql	12 Dec 2004 21:48:08 -0000	1.20
@@ -47,18 +47,18 @@
 
     install )
 	if [ "$CONFIG_MYSQL_CLIENT" = "y" ]; then
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp || exit 1
-		make install DESTDIR=$WORKDIR/tmp pkglibdir=/usr/lib || exit 1
-		rm -rf $WORKDIR/tmp/usr/include || exit 1
-		rm $WORKDIR/tmp/usr/lib/*.a || exit 1
-		rm $WORKDIR/tmp/usr/lib/*.la || exit 1
-		copy_docs $WORKDIR/tmp
-		rm -rf $WORKDIR/tmp/usr/mysql-test || exit 1
-		cp $WORKDIR/tmp/usr/share/mysql/my-small.cnf $ETCDIR/etc/my.cnf || exit 1
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR pkglibdir=/usr/lib || exit 1
+		rm -rf $TMPDIR/usr/include || exit 1
+		rm $TMPDIR/usr/lib/*.a || exit 1
+		rm $TMPDIR/usr/lib/*.la || exit 1
+		copy_docs $TMPDIR
+		rm -rf $TMPDIR/usr/mysql-test || exit 1
+		cp $TMPDIR/usr/share/mysql/my-small.cnf $ETCDIR/etc/my.cnf || exit 1
 		mkdir -p $CDDIR
-		copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		copy_files $TMPDIR/usr $CDDIR || exit 1
+		rm -rf $TMPDIR || exit 1
 
 		groupadd -g 46 mysql || exit 1
 		useradd -u 46 -g mysql -s /bin/false mysql || exit 1

Index: watchdog
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/watchdog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- watchdog	2 Mar 2004 02:44:49 -0000	1.16
+++ watchdog	12 Dec 2004 21:48:09 -0000	1.17
@@ -42,16 +42,16 @@
 	install )
 		if [ "$CONFIG_WATCHDOG" = "y" ]; then
 		    disable_et_dyn
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
-			mkdir -p $WORKDIR/tmp/etc || exit 1
-			make install DESTDIR=$WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR/usr/sbin || exit 1
+			mkdir -p $TMPDIR/etc || exit 1
+			make install DESTDIR=$TMPDIR || exit 1
 
-			copy_docs $WORKDIR/tmp
+			copy_docs $TMPDIR
 
-			copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
+			copy_files $TMPDIR/usr $CDDIR || exit 1
 			cp watchdog.conf $ETCDIR/etc || exit 1
-			rm -rf $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
 
 			cp -p $MYDIR/scripts/watchdog $ETCDIR/etc/init.d/ || exit 1
 

Index: cpqarrayd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cpqarrayd,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cpqarrayd	3 May 2004 15:33:36 -0000	1.11
+++ cpqarrayd	12 Dec 2004 21:48:08 -0000	1.12
@@ -35,15 +35,15 @@
 
 	install )
 		if [ "$CONFIG_CPQARRAYD" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR || exit 1
 
-			make install DESTDIR=$WORKDIR/tmp || exit 1
-			copy_docs $WORKDIR/tmp
+			make install DESTDIR=$TMPDIR || exit 1
+			copy_docs $TMPDIR
 			mkdir -p $CDDIR
-			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
+			copy_files $TMPDIR/usr $CDDIR/ || exit 1
            
-			rm -rf $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
 		fi
 		;;
 

Index: rcs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/rcs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rcs	11 Jan 2004 14:43:05 -0000	1.9
+++ rcs	12 Dec 2004 21:48:09 -0000	1.10
@@ -37,14 +37,14 @@
 
 	install )
 	    if [ "$CONFIG_RCS" = "y" ]; then
-		rm -rf $WORKDIR/tmp
-		mkdir -p $WORKDIR/tmp/usr || exit 1
-		make install prefix=$WORKDIR/tmp/usr
-		copy_docs $WORKDIR/tmp
+		rm -rf $TMPDIR
+		mkdir -p $TMPDIR/usr || exit 1
+		make install prefix=$TMPDIR/usr
+		copy_docs $TMPDIR
 
 		mkdir -p $CDDIR
-		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+		rm -rf $TMPDIR || exit 1
 	    fi
 	    ;;
 

Index: rpm
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/rpm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- rpm	11 Jan 2004 14:43:05 -0000	1.11
+++ rpm	12 Dec 2004 21:48:09 -0000	1.12
@@ -37,20 +37,20 @@
 
     install )
 	if [ "$CONFIG_RPM" = "y" ]; then
-		rm -rf $WORKDIR/tmp
-		mkdir -p $WORKDIR/tmp || exit 1
-		make install DESTDIR=$WORKDIR/tmp
-		copy_docs $WORKDIR/tmp
-		rm -rf  $WORKDIR/tmp/usr/man || exit 1
-		rm -rf  $WORKDIR/tmp/usr/src || exit 1
-		rm -rf  $WORKDIR/tmp/usr/include || exit 1
-		rm -rf  $WORKDIR/tmp/var || exit 1
-		rm -rf  $WORKDIR/tmp/usr/*.a || exit 1
-		rm -rf  $WORKDIR/tmp/usr/*.la || exit 1
-		mkdir -p $WORKDIR/tmp/var/lib/rpm || exit 1
+		rm -rf $TMPDIR
+		mkdir -p $TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR
+		copy_docs $TMPDIR
+		rm -rf  $TMPDIR/usr/man || exit 1
+		rm -rf  $TMPDIR/usr/src || exit 1
+		rm -rf  $TMPDIR/usr/include || exit 1
+		rm -rf  $TMPDIR/var || exit 1
+		rm -rf  $TMPDIR/usr/*.a || exit 1
+		rm -rf  $TMPDIR/usr/*.la || exit 1
+		mkdir -p $TMPDIR/var/lib/rpm || exit 1
 		mkdir -p $CDDIR
-		cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		cp -dpR $TMPDIR/* $CDDIR || exit 1
+		rm -rf $TMPDIR || exit 1
 	fi
     	;;
 

Index: shfs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shfs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- shfs	21 Aug 2004 19:17:46 -0000	1.2
+++ shfs	12 Dec 2004 21:48:09 -0000	1.3
@@ -40,7 +40,7 @@
 	if [ "$CONFIG_SHFS" = "y" ]; then
 
 	    make ROOT=${CDDIR} KERNEL_SOURCES=${KERNELDIR} MAN_PAGE_DIR=/usr/share/man utils-install module-install
-            rm -rf $WORKDIR/tmp || exit 1
+            rm -rf $TMPDIR || exit 1
 	    echo "HELP_$MYNAME=\"$MYNAME to mount remote filesystems using (secure) shell connection\"" >> $SOFTWAREHELP
 	    
 	fi

Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- httpd	11 Jan 2004 14:43:04 -0000	1.3
+++ httpd	12 Dec 2004 21:48:08 -0000	1.4
@@ -46,16 +46,16 @@
 
 	install )
 		if [ "$CONFIG_HTTPD" = "y" ]; then
-			rm -rf $WORKDIR/tmp
-			make install DESTDIR=$WORKDIR/tmp
-			rm -rf $WORKDIR/tmp/etc/apache2/build || exit 1
-			rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
-			rm -rf $WORKDIR/tmp/usr/include || exit 1
-			cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
-			rm -rf  $WORKDIR/tmp/etc
-			copy_docs $WORKDIR/tmp/
-			cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1
-			rm -rf $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR
+			make install DESTDIR=$TMPDIR
+			rm -rf $TMPDIR/etc/apache2/build || exit 1
+			rm -rf $TMPDIR/usr/lib/*a || exit 1
+			rm -rf $TMPDIR/usr/include || exit 1
+			cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
+			rm -rf  $TMPDIR/etc
+			copy_docs $TMPDIR/
+			cp -dpR $TMPDIR/* $CDDIR || exit 1
+			rm -rf $TMPDIR || exit 1
 
 			cp $MYDIR/scripts/httpd $ETCDIR/etc/init.d || exit 1
 

Index: telnet-bsd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/telnet-bsd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- telnet-bsd	11 Jan 2004 14:43:05 -0000	1.7
+++ telnet-bsd	12 Dec 2004 21:48:09 -0000	1.8
@@ -42,13 +42,13 @@
 
     install )
 	if [ "$CONFIG_TELNET_BSD" = "y" ]; then
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp || exit 1
-		make install DESTDIR=$WORKDIR/tmp SUBDIRS="intl telnet po" || exit 1
-		copy_docs $WORKDIR/tmp
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR SUBDIRS="intl telnet po" || exit 1
+		copy_docs $TMPDIR
 		mkdir -p $CDDIR/usr/bin
-		cp -p $WORKDIR/tmp/usr/bin/telnet $CDDIR/usr/bin/ || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		cp -p $TMPDIR/usr/bin/telnet $CDDIR/usr/bin/ || exit 1
+		rm -rf $TMPDIR || exit 1
 	fi
 	;;
 

Index: samba
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/samba,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- samba	6 Sep 2004 02:30:55 -0000	1.25
+++ samba	12 Dec 2004 21:48:09 -0000	1.26
@@ -42,23 +42,23 @@
     install )
 	if [ "$CONFIG_SAMBA" = "y" ]; then
 		cd source
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp/usr/{bin,sbin,lib,share} || exit 1
-		mkdir -p $WORKDIR/tmp/usr/share/samba || exit 1
-		make install DESTDIR=$WORKDIR/tmp || exit
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR/usr/{bin,sbin,lib,share} || exit 1
+		mkdir -p $TMPDIR/usr/share/samba || exit 1
+		make install DESTDIR=$TMPDIR || exit
 
-		rm -rf $WORKDIR/tmp/sbin/mount.smbfs || exit 1
-		ln -sf /usr/bin/smbmount $WORKDIR/tmp/sbin/mount.smbfs || exit 1
+		rm -rf $TMPDIR/sbin/mount.smbfs || exit 1
+		ln -sf /usr/bin/smbmount $TMPDIR/sbin/mount.smbfs || exit 1
 
-		copy_docs $WORKDIR/tmp
-		rm -rf $WORKDIR/tmp/usr/include || exit 1
-		rm -rf $WORKDIR/tmp/usr/private || exit 1
-		copy_files $WORKDIR/tmp/usr/share/samba $CDDIR/usr/share || exit 1
-		rm -rf $WORKDIR/tmp/usr/share/samba || exit 1
+		copy_docs $TMPDIR
+		rm -rf $TMPDIR/usr/include || exit 1
+		rm -rf $TMPDIR/usr/private || exit 1
+		copy_files $TMPDIR/usr/share/samba $CDDIR/usr/share || exit 1
+		rm -rf $TMPDIR/usr/share/samba || exit 1
 		mkdir -p $CDDIR/var/lock/samba || exit 1
-		copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-		copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		copy_files $TMPDIR/usr $CDDIR/ || exit 1
+		copy_files $TMPDIR/sbin $CDDIR/ || exit 1
+		rm -rf $TMPDIR || exit 1
 		mkdir -p $CDDIR/lib || exit 1
 
 		cp nsswitch/libnss_winbind.so $CDDIR/lib || exit 1

Index: yp-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/yp-tools,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- yp-tools	11 Jan 2004 14:43:05 -0000	1.3
+++ yp-tools	12 Dec 2004 21:48:09 -0000	1.4
@@ -36,14 +36,14 @@
 
     install )
 	if [ "$CONFIG_NIS" = "y" ]; then
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp || exit 1
-		make install DESTDIR=$WORKDIR/tmp || exit 1
-		copy_docs $WORKDIR/tmp
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR || exit 1
+		copy_docs $TMPDIR
 		rm -f $CDDIR/bin/domainname $CDDIR/bin/nisdomainname $CDDIR/bin/ypdomainname
-		cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1
+		cp -dpR $TMPDIR/* $CDDIR || exit 1
 		cp etc/nsswitch.conf $ETCDIR/etc/nsswitch.conf.nis || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		rm -rf $TMPDIR || exit 1
 	fi
 	;;
 

Index: zip
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/zip,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- zip	11 Jan 2004 14:43:05 -0000	1.4
+++ zip	12 Dec 2004 21:48:09 -0000	1.5
@@ -32,8 +32,8 @@
 
 	install )
 		if [ "$CONFIG_ZIP" = "y" ]; then
-			rm -rf $WORKDIR/tmp
-			mkdir -p $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR
+			mkdir -p $TMPDIR || exit 1
 			make -f unix/Makefile install prefix=$CDDIR/usr MANDIR=$CDDIR/usr/share/man/man1 || exit 1
 		fi
 		;;

Index: coreutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/coreutils,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- coreutils	23 Sep 2004 21:50:01 -0000	1.9
+++ coreutils	12 Dec 2004 21:48:08 -0000	1.10
@@ -39,17 +39,17 @@
 		;;
 
     install )
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp/bin || exit 1
-		mkdir -p $WORKDIR/tmp/usr/bin || exit 1
-		make DESTDIR=$WORKDIR/tmp install || exit 1
-		rm $WORKDIR/tmp/bin/su
-		#rm $WORKDIR/tmp/bin/hostname
-		copy_docs $WORKDIR/tmp
-		ln -sf test $WORKDIR/tmp/bin/[
-		ln -sf /bin/env $WORKDIR/tmp/usr/bin/env
-		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
-		rm -rf $WORKDIR/tmp || exit
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR/bin || exit 1
+		mkdir -p $TMPDIR/usr/bin || exit 1
+		make DESTDIR=$TMPDIR install || exit 1
+		rm $TMPDIR/bin/su
+		#rm $TMPDIR/bin/hostname
+		copy_docs $TMPDIR
+		ln -sf test $TMPDIR/bin/[
+		ln -sf /bin/env $TMPDIR/usr/bin/env
+		cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+		rm -rf $TMPDIR || exit
     	;;
 
     * )

Index: alsa-driver
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/alsa-driver,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- alsa-driver	1 Feb 2004 15:04:23 -0000	1.12
+++ alsa-driver	12 Dec 2004 21:48:08 -0000	1.13
@@ -44,7 +44,7 @@
 
     install )
 	if [ "$CONFIG_ALSA" = "y" ]; then
-            rm -rf $WORKDIR/tmp || exit 1
+            rm -rf $TMPDIR || exit 1
 	    make install || exit 1
 
 	    cp $MYDIR/scripts/alsa-driver $ETCDIR/etc/init.d || exit 1

Index: heimdal
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/heimdal,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- heimdal	31 May 2004 13:28:02 -0000	1.7
+++ heimdal	12 Dec 2004 21:48:08 -0000	1.8
@@ -36,16 +36,16 @@
 
 	install )
 		if [ "$CONFIG_HEIMDAL" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
-			make install DESTDIR=$WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR/usr/sbin || exit 1
+			make install DESTDIR=$TMPDIR || exit 1
 
-			copy_docs $WORKDIR/tmp
+			copy_docs $TMPDIR
 
-			rm -rf $WORKDIR/tmp/usr/include || exit 1
-			rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
-			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-			rm -rf $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR/usr/include || exit 1
+			rm -rf $TMPDIR/usr/lib/*a || exit 1
+			copy_files $TMPDIR/usr $CDDIR/ || exit 1
+			rm -rf $TMPDIR || exit 1
 		fi
 		;;
 

Index: grub
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grub,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- grub	11 Jan 2004 14:43:04 -0000	1.8
+++ grub	12 Dec 2004 21:48:08 -0000	1.9
@@ -51,16 +51,16 @@
 		;;
 
 	install )
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp || exit 1
-		make install DESTDIR=$WORKDIR/tmp || exit 1
-		copy_docs $WORKDIR/tmp
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR || exit 1
+		copy_docs $TMPDIR
 		mkdir -p $CDDIR/sbin
-		cp -p $WORKDIR/tmp/sbin/grub* $CDDIR/sbin/ || exit 1
+		cp -p $TMPDIR/sbin/grub* $CDDIR/sbin/ || exit 1
 		mkdir -p $CDDIR/boot/grub
-		cp -p $WORKDIR/tmp/usr/share/grub/i386-pc/* $CDDIR/boot/grub/ || exit 1
+		cp -p $TMPDIR/usr/share/grub/i386-pc/* $CDDIR/boot/grub/ || exit 1
 		cp -p $DL_DIR/other/devil-linux.xpm.gz $CDDIR/boot/grub/ || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		rm -rf $TMPDIR || exit 1
 		;;
 
 	* )

Index: perl
===============================...
 
[truncated message content]

Thread: [Devil-linux-commit] build/scripts LPRng,1.1,1.2 LVM,1.16,1.17 LVM2,1.6,1.7 MOSIX,1.8,1.9 Mail-SpamA

devil-linux-commit