Menu
▾
▴
[Devil-linux-commit] build/scripts LVM, 1.16, 1.16.2.1 MOSIX, 1.8, 1.8.2.1 Mail-SpamAssassin, 1.8.2.1, 1.8.2.2 alsa-driver, 1.12, 1.12.2.1 alsa-lib, 1.8, 1.8.2.1 alsa-utils, 1.8, 1.8.2.1 alsaplayer, 1.4, 1.4.2.1 apcupsd, 1.6, 1.6.2.1 arpwatch, 1.20, 1.20.2.1 bind, 1.30.2.1, 1.30.2.2 bridge-utils, 1.14, 1.14.2.1 bzip2, 1.11.2.1, 1.11.2.2 camsource, 1.5, 1.5.2.1 cd_cleanup, 1.8.2.2, 1.8.2.3 cdrtools, 1.8.2.1, 1.8.2.2 cron, 1.19.2.2, 1.19.2.3 cvs, 1.7, 1.7.2.1 dhcp, 1.21, 1.21.2.1 diffutils, 1.9, 1.9.2.1 dnsmasq, 1.1, 1.1.2.1 dovecot, 1.11.2.1, 1.11.2.2 ethtool, 1.9, 1.9.2.1 ez-ipupdate, 1.9, 1.9.2.1 fetchmail, 1.9, 1.9.2.1 file, 1.4, 1.4.2.1 findutils, 1.10, 1.10.2.1 frox, 1.2.2.2, 1.2.2.3 gcc, 1.22.2.1, 1.22.2.2 glibc, 1.31.2.5, 1.31.2.6 grep, 1.2, 1.2.2.1 groff, 1.10, 1.10.2.1 grsecurity, 1.20.2.10, 1.20.2.11 iANS, 1.16, 1.16.2.1 ipac-ng, 1.11, 1.11.2.1 isapnptools, 1.2, 1.2.2.1 jfsutils, 1.8, 1.8.2.1 jftpgw, 1.16, 1.16.2.1 kbd, 1.6, 1.6.2.1 lcd4linux, 1.3.2.1, 1.3.2.2 lftp, 1.7, 1.7.2.1 linux-wlan-ng, 1.13, 1.13.2.1 lm_sensors, 1.19, 1.19.2.1 longhaul, 1.1, 1.1.2.1 lynx, 1.11, 1.11.2.1 make, 1.3, 1.3.2.1 man, 1.8, 1.8.2.1 mc, 1.11, 1.11.2.1 mgetty, 1.8, 1.8.2.1 minicom, 1.5.2.1, 1.5.2.2 module-init-tools, 1.2.2.1, 1.2.2.2 modutils, 1.16.2.2, 1.16.2.3 motion, 1.1.2.1, 1.1.2.2 mt-st, 1.1, 1.1.2.1 mtools, 1.7, 1.7.2.1 nail, 1.13, 1.13.2.1 ncftp, 1.7, 1.7.2.1 net-snmp, 1.4.2.2, 1.4.2.3 net-tools, 1.14.2.1, 1.14.2.2 netacct-mysql, 1.8.2.1, 1.8.2.2 nss_ldap, 1.1.2.1, 1.1.2.2 ntp, 1.18.2.2, 1.18.2.3 oidentd, 1.15, 1.15.2.1 openssl, 1.21, 1.21.2.1 openvpn, 1.11.2.1, 1.11.2.2 passwdgen, 1.12, 1.12.2.1 pcmcia-cs, 1.13.2.1, 1.13.2.2 php, 1.9.2.4, 1.9.2.5 procps, 1.10, 1.10.2.1 psmisc, 1.9, 1.9.2.1 quota-tools, 1.3.2.2, 1.3.2.3 radvd, 1.1, 1.1.2.1 raidtools, 1.14, 1.14.2.1 razor-agents, 1.2.2.1, 1.2.2.2 rcs, 1.9, 1.9.2.1 reiserfsprogs, 1.14.2.1, 1.14.2.2 rpm, 1.11, 1.11.2.1 rsync, 1.2.2.1, 1.2.2.2 samba, 1.24.2.4, 1.24.2.5 screen, 1.4, 1.4.2.1 sed, 1.2, 1.2.2.1 ser, 1.1, 1.1.2.1 shfs, 1.1, 1.1.2.1 smartmontools, 1.6, 1.6.2.1 squidguard, 1.2.2.2, 1.2.2.3 sudo, 1.1.2.1, 1.1.2.2 sysstat, 1.10.2.1, 1.10.2.2 telnet-bsd, 1.7, 1.7.2.1 tftp-hpa, 1.1.2.3, 1.1.2.4 thttpd, 1.17, 1.17.2.1 unionfs, 1.1.2.2, 1.1.2.3 unzip, 1.5, 1.5.2.1 usbutils, 1.10.2.1, 1.10.2.2 util-linux, 1.22.2.2, 1.22.2.3 vim, 1.8, 1.8.2.1 vlan, 1.9, 1.9.2.1 vsftpd, 1.11.2.1, 1.11.2.2 vtun, 1.11, 1.11.2.1 watchdog, 1.16, 1.16.2.1 wget, 1.14, 1.14.2.1 wireless_tools, 1.9, 1.9.2.1 wol, 1.2, 1.2.2.1 xmbmon, 1.1.2.1, 1.1.2.2 yp-tools, 1.3, 1.3.2.1 ypbind-mt, 1.4, 1.4.2.1 ypserv, 1.4, 1.4.2.1 zip, 1.4.2.1, 1.4.2.2
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv13622 Modified Files: Tag: rel-1-2-patches LVM MOSIX Mail-SpamAssassin alsa-driver alsa-lib alsa-utils alsaplayer apcupsd arpwatch bind bridge-utils bzip2 camsource cd_cleanup cdrtools cron cvs dhcp diffutils dnsmasq dovecot ethtool ez-ipupdate fetchmail file findutils frox gcc glibc grep groff grsecurity iANS ipac-ng isapnptools jfsutils jftpgw kbd lcd4linux lftp linux-wlan-ng lm_sensors longhaul lynx make man mc mgetty minicom module-init-tools modutils motion mt-st mtools nail ncftp net-snmp net-tools netacct-mysql nss_ldap ntp oidentd openssl openvpn passwdgen pcmcia-cs php procps psmisc quota-tools radvd raidtools razor-agents rcs reiserfsprogs rpm rsync samba screen sed ser shfs smartmontools squidguard sudo sysstat telnet-bsd tftp-hpa thttpd unionfs unzip usbutils util-linux vim vlan vsftpd vtun watchdog wget wireless_tools wol xmbmon yp-tools ypbind-mt ypserv zip Log Message: make sure we don't screw up 1.3 sources again if we copy scripts between the releases. we need to use $TMPDIR instead of $WORKDIR/tmp Index: camsource =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/camsource,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- camsource 11 Jan 2004 14:43:04 -0000 1.5 +++ camsource 21 Feb 2008 20:34:37 -0000 1.5.2.1 @@ -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: nss_ldap =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nss_ldap,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- nss_ldap 9 Mar 2005 02:37:23 -0000 1.1.2.1 +++ nss_ldap 21 Feb 2008 20:34:37 -0000 1.1.2.2 @@ -34,18 +34,18 @@ install ) if [ "$CONFIG_NSSLDAPLIB" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/lib || exit 1 - mkdir -p $WORKDIR/tmp/etc || exit 1 - mkdir -p $WORKDIR/tmp/usr || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + mkdir -p $TMPDIR/lib || exit 1 + mkdir -p $TMPDIR/etc || exit 1 + mkdir -p $TMPDIR/usr || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + make install DESTDIR=$TMPDIR || exit 1 mkdir -p $CDDIR - copy_files_links $WORKDIR/tmp/lib $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + copy_files_links $TMPDIR/lib $CDDIR/ || exit 1 + copy_files $TMPDIR/etc $ETCDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: kbd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/kbd,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- kbd 14 Jan 2004 22:41:27 -0000 1.6 +++ kbd 21 Feb 2008 20:34:37 -0000 1.6.2.1 @@ -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=$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: vtun =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/vtun,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -d -r1.11 -r1.11.2.1 --- vtun 11 Jan 2004 14:43:05 -0000 1.11 +++ vtun 21 Feb 2008 20:34:38 -0000 1.11.2.1 @@ -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: vsftpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/vsftpd,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -d -r1.11.2.1 -r1.11.2.2 --- vsftpd 2 Dec 2005 13:08:24 -0000 1.11.2.1 +++ vsftpd 21 Feb 2008 20:34:38 -0000 1.11.2.2 @@ -62,7 +62,7 @@ mkdir -p $DOCDIR/vsftpd || exit 1 cp -dpR EXAMPLE $DOCDIR/vsftpd || exit 1 cp -dpR xinetd.d $DOCDIR/vsftpd || exit 1 - #copy_docs $WORKDIR/tmp + #copy_docs $TMPDIR cp vsftpd $CDDIR/usr/sbin || exit 1 cp $MYDIR/scripts/vsftpd $ETCDIR/etc/init.d || exit 1 Index: findutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/findutils,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -d -r1.10 -r1.10.2.1 --- findutils 11 Jan 2004 14:43:04 -0000 1.10 +++ findutils 21 Feb 2008 20:34:37 -0000 1.10.2.1 @@ -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: telnet-bsd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/telnet-bsd,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- telnet-bsd 11 Jan 2004 14:43:05 -0000 1.7 +++ telnet-bsd 21 Feb 2008 20:34:38 -0000 1.7.2.1 @@ -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.24.2.4 retrieving revision 1.24.2.5 diff -u -d -r1.24.2.4 -r1.24.2.5 --- samba 1 Oct 2005 14:54:32 -0000 1.24.2.4 +++ samba 21 Feb 2008 20:34:38 -0000 1.24.2.5 @@ -43,23 +43,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 mkdir -p $CDDIR/var/log/samba || exit 1 Index: thttpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/thttpd,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -d -r1.17 -r1.17.2.1 --- thttpd 11 Jan 2004 14:43:05 -0000 1.17 +++ thttpd 21 Feb 2008 20:34:38 -0000 1.17.2.1 @@ -38,16 +38,16 @@ install ) if [ "$CONFIG_THTTPD" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/{sbin,man,www} || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/{sbin,man,www} || exit 1 # install it into build system, because we need it later - make install DESTDIR=$WORKDIR/tmp || exit 1 - rm -rf $WORKDIR/tmp/usr/www || exit 1 - copy_docs $WORKDIR/tmp - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + rm -rf $TMPDIR/usr/www || exit 1 + copy_docs $TMPDIR + copy_files $TMPDIR/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/thttpd $ETCDIR/etc/init.d || exit 1 cp $MYDIR/scripts/thttpd.conf $ETCDIR/etc/ || exit 1 Index: openvpn =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openvpn,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -d -r1.11.2.1 -r1.11.2.2 --- openvpn 5 May 2006 13:57:13 -0000 1.11.2.1 +++ openvpn 21 Feb 2008 20:34:37 -0000 1.11.2.2 @@ -39,14 +39,14 @@ install ) if [ "$CONFIG_OPENVPN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - make install-strip DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp + rm -rf $TMPDIR || exit 1 + make install-strip DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR mkdir -p $DOCDIR/openvpn || exit 1 cp -dpR easy-rsa sample-* management plugin contrib debug $DOCDIR/openvpn || exit 1 - copy_files $WORKDIR/tmp/usr/sbin/ $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + copy_files $TMPDIR/usr/sbin/ $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/openvpn $ETCDIR/etc/init.d || exit 1 echo "# Start openvpn?" >> $CONFIGFILE Index: isapnptools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/isapnptools,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- isapnptools 11 Jan 2004 14:43:04 -0000 1.2 +++ isapnptools 21 Feb 2008 20:34:37 -0000 1.2.2.1 @@ -36,14 +36,14 @@ install ) if [ "$CONFIG_ISAPNPTOOLS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/ || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/ || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/usr/sbin/* $CDDIR/usr/sbin/ || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/usr/sbin/* $CDDIR/usr/sbin/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: lm_sensors =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/lm_sensors,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -d -r1.19 -r1.19.2.1 --- lm_sensors 16 Mar 2004 01:47:03 -0000 1.19 +++ lm_sensors 21 Feb 2008 20:34:37 -0000 1.19.2.1 @@ -71,26 +71,26 @@ install ) if [ "$CONFIG_LM_SENSORS" = "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 EXTRA="" if [ "$CONFIG_RRDTOOL" = "y" ];then EXTRA="PROG_EXTRA:=sensord" fi - make user_install DESTDIR=$WORKDIR/tmp PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man $EXTRA || exit 1 + make user_install DESTDIR=$TMPDIR PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man $EXTRA || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR mkdir -p $DOCDIR/lm_sensors || exit 1 cp -dpR doc/* $DOCDIR/lm_sensors || exit 1 - cp $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 + cp $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 - 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 cp $MYDIR/scripts/lm_sensors $ETCDIR/etc/init.d || exit 1 cp $MYDIR/scripts/lm_sensors.example $ETCDIR/etc/sysconfig || exit 1 Index: ethtool =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ethtool,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- ethtool 11 Jan 2004 14:43:04 -0000 1.9 +++ ethtool 21 Feb 2008 20:34:37 -0000 1.9.2.1 @@ -35,14 +35,14 @@ install ) if [ "$CONFIG_ETHTOOL" = "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 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: lftp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/lftp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- lftp 11 Jan 2004 14:43:04 -0000 1.7 +++ lftp 21 Feb 2008 20:34:37 -0000 1.7.2.1 @@ -35,18 +35,18 @@ install ) if [ "$CONFIG_LFTP" = "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 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - rm -rf $WORKDIR/tmp/usr/share || exit 1 - rm -rf $WORKDIR/tmp/usr/lib || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + rm -rf $TMPDIR/usr/lib || exit 1 mkdir -p $CDDIR - cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1 - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/usr $CDDIR/ || exit 1 + cp -dpR $TMPDIR/etc/* $ETCDIR/etc || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: unzip =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/unzip,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- unzip 11 Jan 2004 14:43:05 -0000 1.5 +++ unzip 21 Feb 2008 20:34:38 -0000 1.5.2.1 @@ -32,8 +32,8 @@ install ) if [ "$CONFIG_UNZIP" = "y" ]; then - rm -rf $WORKDIR/tmp/usr - mkdir -p $WORKDIR/tmp/usr || exit 1 + rm -rf $TMPDIR/usr + mkdir -p $TMPDIR/usr || exit 1 make -f unix/Makefile install prefix=$CDDIR/usr MANDIR=$CDDIR/usr/share/man || exit 1 fi ;; Index: squidguard =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/squidguard,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -d -r1.2.2.2 -r1.2.2.3 --- squidguard 20 Oct 2007 12:46:08 -0000 1.2.2.2 +++ squidguard 21 Feb 2008 20:34:38 -0000 1.2.2.3 @@ -42,15 +42,15 @@ install ) if [ "$CONFIG_SQUIDGUARD" = "y" ]; then - rm -rf $WORKDIR/tmp - mkdir -p $WORKDIR/tmp/usr/bin || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/doc/squidguard || exit 1 + rm -rf $TMPDIR + mkdir -p $TMPDIR/usr/bin || exit 1 + mkdir -p $TMPDIR/usr/share/doc/squidguard || exit 1 # Create the db directory - mkdir -p $WORKDIR/tmp/var/lib/squidguard/demo || exit 1 - cp src/squidGuard $WORKDIR/tmp/usr/bin/ - cp doc/* $WORKDIR/tmp/usr/share/doc/squidguard - cp -r samples $WORKDIR/tmp/usr/share/doc/squidguard - cp -r test $WORKDIR/tmp/usr/share/doc/squidguard + mkdir -p $TMPDIR/var/lib/squidguard/demo || exit 1 + cp src/squidGuard $TMPDIR/usr/bin/ + cp doc/* $TMPDIR/usr/share/doc/squidguard + cp -r samples $TMPDIR/usr/share/doc/squidguard + cp -r test $TMPDIR/usr/share/doc/squidguard echo "logdir /var/log" > $ETCDIR/etc/squidguard.conf echo "dbhome /var/lib/squidguard" >> $ETCDIR/etc/squidguard.conf echo "" >> $ETCDIR/etc/squidguard.conf @@ -59,8 +59,8 @@ echo " pass all" >> $ETCDIR/etc/squidguard.conf echo " }" >> $ETCDIR/etc/squidguard.conf echo "}" >> $ETCDIR/etc/squidguard.conf - 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: unionfs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Attic/unionfs,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- unionfs 15 Apr 2006 21:13:51 -0000 1.1.2.2 +++ unionfs 21 Feb 2008 20:34:38 -0000 1.1.2.3 @@ -41,19 +41,19 @@ install ) if [ "$CONFIG_UNIONFS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/sbin - mkdir -p $WORKDIR/tmp/usr/share/man/man{4,8} || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/sbin + mkdir -p $TMPDIR/usr/share/man/man{4,8} || exit 1 - cp union{ctl,dbg,imap} $WORKDIR/tmp/usr/sbin + cp union{ctl,dbg,imap} $TMPDIR/usr/sbin mkdir $CDDIR/lib/modules/`uname -r`/kernel/fs/unionfs cp unionfs.o $CDDIR/lib/modules/`uname -r`/kernel/fs/unionfs/ - cp man/union{ctl,dbg,imap}.8 $WORKDIR/tmp/usr/share/man/man8 - cp man/unionfs.4 $WORKDIR/tmp/usr/share/man/man4 - copy_docs $WORKDIR/tmp || exit 1 - copy_files $WORKDIR/tmp/usr/sbin $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp man/union{ctl,dbg,imap}.8 $TMPDIR/usr/share/man/man8 + cp man/unionfs.4 $TMPDIR/usr/share/man/man4 + copy_docs $TMPDIR || exit 1 + copy_files $TMPDIR/usr/sbin $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: reiserfsprogs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/reiserfsprogs,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -d -r1.14.2.1 -r1.14.2.2 --- reiserfsprogs 31 Jul 2007 07:22:23 -0000 1.14.2.1 +++ reiserfsprogs 21 Feb 2008 20:34:37 -0000 1.14.2.2 @@ -34,17 +34,17 @@ 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 ln -sf debugreiserfs $CDDIR/sbin/debugfs.reiserfs || exit 1 ln -sf reiserfstune $CDDIR/sbin/tunefs.reiserfs || exit 1 ln -sf resize_reiserfs $CDDIR/sbin/resizefs.reiserfs || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: ncftp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ncftp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- ncftp 11 Jan 2004 14:43:04 -0000 1.7 +++ ncftp 21 Feb 2008 20:34:37 -0000 1.7.2.1 @@ -39,16 +39,16 @@ install ) if [ "$CONFIG_NCFTP" = "y" ]; then make install || exit 1 - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/man/man1 || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/share/man/man1 || exit 1 make install SYSCONFDIR=/etc \ - BINDIR=$WORKDIR/tmp/usr/bin \ - mandir=$WORKDIR/tmp/usr/share/man \ + BINDIR=$TMPDIR/usr/bin \ + mandir=$TMPDIR/usr/share/man \ || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR mkdir -p $CDDIR/usr/bin - cp -p $WORKDIR/tmp/usr/bin/* $CDDIR/usr/bin/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -p $TMPDIR/usr/bin/* $CDDIR/usr/bin/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: passwdgen =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/passwdgen,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -d -r1.12 -r1.12.2.1 --- passwdgen 11 Jan 2004 14:43:04 -0000 1.12 +++ passwdgen 21 Feb 2008 20:34:37 -0000 1.12.2.1 @@ -40,17 +40,17 @@ install ) if [ "$CONFIG_PASSWDGEN" = "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 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1 + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/lib/*a || 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 fi ;; Index: minicom =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/minicom,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- minicom 20 Oct 2007 12:46:08 -0000 1.5.2.1 +++ minicom 21 Feb 2008 20:34:37 -0000 1.5.2.2 @@ -36,11 +36,11 @@ install ) if [ "$CONFIG_MINICOM" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/man || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/share/man || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: mgetty =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mgetty,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- mgetty 20 Mar 2004 15:39:10 -0000 1.8 +++ mgetty 21 Feb 2008 20:34:37 -0000 1.8.2.1 @@ -41,22 +41,22 @@ useradd -u 33 -g uucp -s /bin/false fax || exit 1 useradd -u 10 -g uucp -s /bin/false uucp || exit 1 - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/sbin || exit 1 - make install CONFDIR=$WORKDIR/tmp/etc/mgetty+sendfax prefix=$WORKDIR/tmp/usr || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/sbin || exit 1 + make install CONFDIR=$TMPDIR/etc/mgetty+sendfax prefix=$TMPDIR/usr || exit 1 pushd callback > /dev/null - make install BINDIR=$WORKDIR/tmp/usr/bin \ - SBINDIR=$WORKDIR/tmp/usr/sbin \ + make install BINDIR=$TMPDIR/usr/bin \ + SBINDIR=$TMPDIR/usr/sbin \ INSTALL="install -c -o bin -g bin" || exit 1 popd > /dev/null - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc || exit + cp -dpR $TMPDIR/etc/* $ETCDIR/etc || exit - 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: psmisc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/psmisc,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- psmisc 11 Jan 2004 14:43:05 -0000 1.9 +++ psmisc 21 Feb 2008 20:34:37 -0000 1.9.2.1 @@ -31,12 +31,12 @@ ;; install ) - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/ || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - cp -dpR $WORKDIR/tmp/bin/* $CDDIR/bin || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/ || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + cp -dpR $TMPDIR/bin/* $CDDIR/bin || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR || exit 1 ;; * ) Index: apcupsd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/apcupsd,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- apcupsd 4 May 2004 01:04:57 -0000 1.6 +++ apcupsd 21 Feb 2008 20:34:37 -0000 1.6.2.1 @@ -54,20 +54,20 @@ install ) if [ "$CONFIG_APCUPSD" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/apcupsd/{css,cgi} || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + mkdir -p $TMPDIR/usr/share/apcupsd/{css,cgi} || exit 1 + make install DESTDIR=$TMPDIR || exit 1 mkdir -p $ETCDIR/etc/apcupsd || exit 1 - cp -dp $WORKDIR/tmp/etc/apcupsd/* $ETCDIR/etc/apcupsd/ || exit 1 + cp -dp $TMPDIR/etc/apcupsd/* $ETCDIR/etc/apcupsd/ || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + copy_files $TMPDIR/sbin $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 cp -dp $MYDIR/scripts/apcupsd $ETCDIR/etc/init.d/ || exit 1 cp -dp $MYDIR/scripts/apcupsd_apache2.config $ETCDIR/etc/apcupsd/ || exit 1 Index: dnsmasq =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dnsmasq,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- dnsmasq 22 Apr 2004 15:11:01 -0000 1.1 +++ dnsmasq 21 Feb 2008 20:34:37 -0000 1.1.2.1 @@ -35,15 +35,15 @@ install ) if [ "$CONFIG_DNSMASQ" = "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 PREFIX=/usr DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/{man,info} || exit 1 + make install PREFIX=/usr DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/{man,info} || 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 cp dnsmasq.conf.example $ETCDIR/etc/ || exit 1 cp $MYDIR/scripts/dnsmasq $ETCDIR/etc/init.d/ || exit 1 Index: net-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-tools,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -d -r1.14.2.1 -r1.14.2.2 --- net-tools 13 Oct 2004 02:34:47 -0000 1.14.2.1 +++ net-tools 21 Feb 2008 20:34:37 -0000 1.14.2.2 @@ -36,13 +36,13 @@ ;; install ) - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install BASEDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - #cp -dpR $WORKDIR/tmp/* $RAMDISKDIR/ || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install BASEDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + #cp -dpR $TMPDIR/* $RAMDISKDIR/ || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: Mail-SpamAssassin =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -d -r1.8.2.1 -r1.8.2.2 --- Mail-SpamAssassin 21 Oct 2006 14:33:17 -0000 1.8.2.1 +++ Mail-SpamAssassin 21 Feb 2008 20:34:37 -0000 1.8.2.2 @@ -27,8 +27,8 @@ case $1 in build ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then - perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$WORKDIR/tmp ENABLE_SSL=yes < /dev/null || exit 1 - # now override the PREFIX setting to not use $WORKDIR/tmp%. MakeMaker + perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$TMPDIR ENABLE_SSL=yes < /dev/null || exit 1 + # now override the PREFIX setting to not use $TMPDIR%. MakeMaker # does not have a better way to do this, it seems... make $PMAKE PREFIX=/usr || exit 1 make $PMAKE spamd/libspamc.so || exit 1 @@ -39,20 +39,20 @@ install ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 make install || exit 1 - install -m 0755 spamd/libspamc.so $WORKDIR/tmp/usr/lib || exit 1 + install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1 - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 + cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/usr/share/spamassassin $CDDIR/usr/share/ || exit 1 - rm -rf $WORKDIR/tmp/usr/share/ || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/usr/share/spamassassin $CDDIR/usr/share/ || exit 1 + rm -rf $TMPDIR/usr/share/ || 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 cp $MYDIR/scripts/spamd $ETCDIR/etc/init.d || exit 1 Index: ser =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ser,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- ser 20 Mar 2004 16:18:00 -0000 1.1 +++ ser 21 Feb 2008 20:34:38 -0000 1.1.2.1 @@ -25,7 +25,7 @@ MYNAME=SER -MAKEOPT="prefix=/usr cfg-target=/etc/ser/ cfg-prefix=$WORKDIR/tmp 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 @@ -50,13 +50,13 @@ install ) if [ "$CONFIG_SER" = "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 $MAKEOPT exclude_modules="$EXCLUDEMODULES" install || exit 1 - gzip -9 $WORKDIR/tmp/usr/share/man/man[58]/* || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR || exit 1 - copy_files $WORKDIR/tmp/usr $CDDIR || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + gzip -9 $TMPDIR/usr/share/man/man[58]/* || exit 1 + copy_files $TMPDIR/etc $ETCDIR || exit 1 + copy_files $TMPDIR/usr $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/ser $ETCDIR/etc/init.d || exit 1 echo "# Start SIP Express Router (ser)?" >> $CONFIGFILE Index: fetchmail =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/fetchmail,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- fetchmail 11 Jan 2004 14:43:04 -0000 1.9 +++ fetchmail 21 Feb 2008 20:34:37 -0000 1.9.2.1 @@ -36,11 +36,11 @@ install ) if [ "$CONFIG_FETCHMAIL" = "y" ]; then - rm -rf $WORKDIR/tmp - make install DESTDIR=$WORKDIR/tmp - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR + make install DESTDIR=$TMPDIR + copy_docs $TMPDIR + cp -dpR $TMPDIR/* $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: alsaplayer =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/alsaplayer,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- alsaplayer 11 Jan 2004 14:43:04 -0000 1.4 +++ alsaplayer 21 Feb 2008 20:34:37 -0000 1.4.2.1 @@ -38,12 +38,12 @@ install ) if [ "$CONFIG_ALSA_PLAYER" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - make install-strip DESTDIR=$WORKDIR/tmp || exit 1 - copy_files $WORKDIR/tmp/usr/bin $CDDIR/usr/ || exit 1 - copy_files $WORKDIR/tmp/usr/lib $CDDIR/usr/ || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + make install-strip DESTDIR=$TMPDIR || exit 1 + copy_files $TMPDIR/usr/bin $CDDIR/usr/ || exit 1 + copy_files $TMPDIR/usr/lib $CDDIR/usr/ || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR || exit 1 echo "HELP_$MYNAME=\"$MYNAME is a generic pcm player\"" >> $SOFTWAREHELP fi ;; Index: nail =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nail,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -d -r1.13 -r1.13.2.1 --- nail 11 Jan 2004 14:43:04 -0000 1.13 +++ nail 21 Feb 2008 20:34:37 -0000 1.13.2.1 @@ -36,18 +36,18 @@ install ) if [ "$CONFIG_NAIL" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/etc || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - ln -sf nail $WORKDIR/tmp/usr/bin/mail - ln -sf nail $WORKDIR/tmp/usr/bin/mailx + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + mkdir -p $TMPDIR/etc || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + ln -sf nail $TMPDIR/usr/bin/mail + ln -sf nail $TMPDIR/usr/bin/mailx mkdir -p $CDDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + copy_files $TMPDIR/etc $ETCDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: sed =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sed,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- sed 11 Jan 2004 14:43:05 -0000 1.2 +++ sed 21 Feb 2008 20:34:38 -0000 1.2.2.1 @@ -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 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr || exit 1 + make install DESTDIR=$TMPDIR || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - cp -dpR $WORKDIR/tmp/bin/* $CDDIR/bin/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/bin/* $CDDIR/bin/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: rsync =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/rsync,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- rsync 15 Apr 2006 01:23:09 -0000 1.2.2.1 +++ rsync 21 Feb 2008 20:34:38 -0000 1.2.2.2 @@ -39,12 +39,12 @@ install ) if [ "$CONFIG_RSYNC" = "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 - cp -dpR $WORKDIR/tmp/usr $CDDIR || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/usr $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: alsa-driver =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/alsa-driver,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -d -r1.12 -r1.12.2.1 --- alsa-driver 1 Feb 2004 15:04:23 -0000 1.12 +++ alsa-driver 21 Feb 2008 20:34:37 -0000 1.12.2.1 @@ -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: quota-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/quota-tools,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -d -r1.3.2.2 -r1.3.2.3 --- quota-tools 22 Dec 2005 08:23:15 -0000 1.3.2.2 +++ quota-tools 21 Feb 2008 20:34:37 -0000 1.3.2.3 @@ -35,16 +35,16 @@ install ) if [ "$CONFIG_QUOTA_TOOLS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install ROOTDIR=$WORKDIR/tmp || exit 1 - rm -rf $WORKDIR/tmp/share || exit 1 - rm -rf $WORKDIR/tmp/include || exit 1 - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 - rm -rf $WORKDIR/tmp/etc || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install ROOTDIR=$TMPDIR || exit 1 + rm -rf $TMPDIR/share || exit 1 + rm -rf $TMPDIR/include || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: glibc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/glibc,v retrieving revision 1.31.2.5 retrieving revision 1.31.2.6 diff -u -d -r1.31.2.5 -r1.31.2.6 --- glibc 22 Oct 2007 19:35:01 -0000 1.31.2.5 +++ glibc 21 Feb 2008 20:34:37 -0000 1.31.2.6 @@ -75,28 +75,28 @@ install ) cd ../glibc-build || exit 1 - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/etc || exit 1 - make install install_root=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/etc || exit 1 + make install install_root=$TMPDIR || exit 1 if [ ! "$CONFIG_NO_LOCALE" = "y" ]; then - make localedata/install-locales install_root=$WORKDIR/tmp || exit 1 - cp -dpR $WORKDIR/tmp/usr/lib/locale $CDDIR/usr/lib/ || exit 1 + make localedata/install-locales install_root=$TMPDIR || exit 1 + cp -dpR $TMPDIR/usr/lib/locale $CDDIR/usr/lib/ || exit 1 else - rm -rf $WORKDIR/tmp/usr/share/i18n || exit 1 - rm -rf $WORKDIR/tmp/usr/share/locale || exit 1 + rm -rf $TMPDIR/usr/share/i18n || exit 1 + rm -rf $TMPDIR/usr/share/locale || exit 1 fi - rm -rf $WORKDIR/tmp/usr/bin/localedef - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -rf $WORKDIR/tmp/usr/info || exit 1 - rm -rf $WORKDIR/tmp/usr/lib || exit 1 - rm -rf $WORKDIR/tmp/etc || exit 1 - rm -rf $WORKDIR/tmp/sbin/sln || exit 1 - cp -dpR $WORKDIR/tmp/usr/share/* $CDDIR/usr/share || exit 1 - rm -rf $WORKDIR/tmp/usr/share || exit 1 - cp -dpR $WORKDIR/tmp/{sbin,usr} $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp/{sbin,usr} || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR/usr/bin/localedef + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/info || exit 1 + rm -rf $TMPDIR/usr/lib || exit 1 + rm -rf $TMPDIR/etc || exit 1 + rm -rf $TMPDIR/sbin/sln || exit 1 + cp -dpR $TMPDIR/usr/share/* $CDDIR/usr/share || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + cp -dpR $TMPDIR/{sbin,usr} $CDDIR/ || exit 1 + rm -rf $TMPDIR/{sbin,usr} || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: wol =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/wol,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- wol 22 Apr 2004 13:59:03 -0000 1.2 +++ wol 21 Feb 2008 20:34:38 -0000 1.2.2.1 @@ -36,16 +36,16 @@ install ) if [ "$CONFIG_WOL" = "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 - rm -f $WORKDIR/tmp/usr/info/dir - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/{man,info} || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + rm -f $TMPDIR/usr/info/dir + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/{man,info} || 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 fi ;; Index: dhcp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dhcp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -d -r1.21 -r1.21.2.1 --- dhcp 17 Jan 2004 17:35:20 -0000 1.21 +++ dhcp 21 Feb 2008 20:34:37 -0000 1.21.2.1 @@ -30,15 +30,15 @@ if [ "$CONFIG_ISC_DHCP" = "y" ]; then # correct pathnames cat > site.conf <<-EOF - USERBINDIR = $WORKDIR/tmp/usr/bin - BINDIR = $WORKDIR/tmp/usr/sbin - CLIENTBINDIR=$WORKDIR/tmp/sbin - ADMMANDIR = $WORKDIR/tmp/usr/share/man/man8 - FFMANDIR = $WORKDIR/tmp/usr/share/man/man5 - LIBMANDIR = $WORKDIR/tmp/usr/share/man/man3 - USRMANDIR = $WORKDIR/tmp/usr/share/man/man1 - LIBDIR=$WORKDIR/tmp/usr/local/lib - INCDIR=$WORKDIR/tmp/usr/local/include + USERBINDIR = $TMPDIR/usr/bin + BINDIR = $TMPDIR/usr/sbin + CLIENTBINDIR=$TMPDIR/sbin + ADMMANDIR = $TMPDIR/usr/share/man/man8 + FFMANDIR = $TMPDIR/usr/share/man/man5 + LIBMANDIR = $TMPDIR/usr/share/man/man3 + USRMANDIR = $TMPDIR/usr/share/man/man1 + LIBDIR=$TMPDIR/usr/local/lib + INCDIR=$TMPDIR/usr/local/include EOF ./configure || exit 1 @@ -49,19 +49,19 @@ install ) if [ "$CONFIG_ISC_DHCP" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/sbin || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/sbin || exit 1 make install || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/local || exit 1 - rm -rf $WORKDIR/tmp/usr/share || exit 1 - copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/local || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + copy_files $TMPDIR/sbin $CDDIR/ || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 cp client/dhclient.conf $ETCDIR/etc || exit 1 cp $MYDIR/scripts/dhcpd.conf $ETCDIR/etc/ || exit 1 cp $MYDIR/scripts/dhcrelay.conf $ETCDIR/etc/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 echo "# Start DHCP Relay Agent?" >> $CONFIGFILE echo "# configuration file: /etc/dhcrelay.conf" >> $CONFIGFILE Index: ntp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ntp,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -u -d -r1.18.2.2 -r1.18.2.3 --- ntp 2 Jul 2007 15:16:35 -0000 1.18.2.2 +++ ntp 21 Feb 2008 20:34:37 -0000 1.18.2.3 @@ -36,13 +36,13 @@ install ) if [ "$CONFIG_NTP" = "y" ]; then - rm -rf $WORKDIR/tmp - mkdir -p $WORKDIR/tmp - make install DESTDIR=$WORKDIR/tmp + rm -rf $TMPDIR + mkdir -p $TMPDIR + make install DESTDIR=$TMPDIR mkdir -p $CDDIR/var/lib/hwclock || exit 1 touch $CDDIR/var/lib/hwclock/adjtime || exit 1 - cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/usr $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 mkdir -p $DOCDIR/ntp || exit 1 cp -dpR html/* $DOCDIR/ntp || exit 1 Index: screen =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/screen,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- screen 28 Apr 2004 01:33:43 -0000 1.4 +++ screen 21 Feb 2008 20:34:38 -0000 1.4.2.1 @@ -36,19 +36,19 @@ install ) if [ "$CONFIG_SCREEN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/terminfo/s - cp terminfo/screencap -p $WORKDIR/tmp/usr/share/terminfo/s - mkdir -p $WORKDIR/tmp/etc - cp etc/etcscreenrc $WORKDIR/tmp/etc/screenrc - mkdir -p $WORKDIR/tmp/var/run/screen - copy_docs $WORKDIR/tmp - cp $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 - rm -rf $WORKDIR/tmp/etc || exit 1 - cp -dpR $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 || exit 1 + mkdir -p $TMPDIR/usr/share/terminfo/s + cp terminfo/screencap -p $TMPDIR/usr/share/terminfo/s + mkdir -p $TMPDIR/etc + cp etc/etcscreenrc $TMPDIR/etc/screenrc + mkdir -p $TMPDIR/var/run/screen + copy_docs $TMPDIR + cp $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: raidtools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Attic/raidtools,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -d -r1.14 -r1.14.2.1 --- raidtools 11 Jan 2004 14:43:05 -0000 1.14 +++ raidtools 21 Feb 2008 20:34:37 -0000 1.14.2.1 @@ -37,15 +37,15 @@ install ) if [ "$CONFIG_RAIDTOOLS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install ROOTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install ROOTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR mkdir -p $DOCDIR/raidtools || exit 1 cp -dp Software-RAID.HOWTO/*.txt $DOCDIR/raidtools || exit 1 - cp -dpR $WORKDIR/tmp/sbin $CDDIR/ || exit 1 - cp -dpR $WORKDIR/tmp/dev/* $CDDIR/dev || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/sbin $CDDIR/ || exit 1 + cp -dpR $TMPDIR/dev/* $CDDIR/dev || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: wget =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/wget,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -d -r1.14 -r1.14.2.1 --- wget 11 Jan 2004 14:43:05 -0000 1.14 +++ wget 21 Feb 2008 20:34:38 -0000 1.14.2.1 @@ -37,18 +37,18 @@ install ) if [ "$CONFIG_WGET" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/etc || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + mkdir -p $TMPDIR/etc || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/share || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/share || exit 1 mkdir -p $CDDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + copy_files $TMPDIR/etc $ETCDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: pcmcia-cs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Attic/pcmcia-cs,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -u -d -r1.13.2.1 -r1.13.2.2 --- pcmcia-cs 19 May 2007 14:35:26 -0000 1.13.2.1 +++ pcmcia-cs 21 Feb 2008 20:34:37 -0000 1.13.2.2 @@ -38,21 +38,21 @@ install ) if [ "$CONFIG_PCMCIA_CS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install PREFIX=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr || exit 1 - cp -dpR $WORKDIR/tmp/etc/pcmcia $ETCDIR/etc || exit 1 - cp -dpR $WORKDIR/tmp/etc/sysconfig $ETCDIR/etc || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install PREFIX=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr || exit 1 + cp -dpR $TMPDIR/etc/pcmcia $ETCDIR/etc || exit 1 + cp -dpR $TMPDIR/etc/sysconfig $ETCDIR/etc || exit 1 replace_str $ETCDIR/etc/sysconfig/pcmcia "PCMCIA=yes" "PCMCIA=no" rm $ETCDIR/etc/sysconfig/pcmcia.old cp $MYDIR/scripts/pcmcia $ETCDIR/etc/init.d/ || exit 1 cat etc/rc.pcmcia >> $ETCDIR/etc/init.d/pcmcia || exit 1 - rm -rf $WORKDIR/tmp/etc || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR/etc || 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.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- shfs 21 Mar 2004 17:20:30 -0000 1.1 +++ shfs 21 Feb 2008 20:34:38 -0000 1.1.2.1 @@ -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: openssl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openssl,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -d -r1.21 -r1.21.2.1 --- openssl 11 Jan 2004 14:43:04 -0000 1.21 +++ openssl 21 Feb 2008 20:34:37 -0000 1.21.2.1 @@ -40,17 +40,17 @@ install ) if [ "$CONFIG_OPENSSL_BIN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install INSTALL_PREFIX=$WORKDIR/tmp || exit 1 - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1 - copy_docs $WORKDIR/tmp/etc/ssl - rm -rf $WORKDIR/tmp/etc/ssl/lib || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install INSTALL_PREFIX=$TMPDIR || exit 1 + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/lib/*a || exit 1 + copy_docs $TMPDIR/etc/ssl + rm -rf $TMPDIR/etc/ssl/lib || exit 1 - cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1 - cp -dpR $WORKDIR/tmp/etc $ETCDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/usr $CDDIR/ || exit 1 + cp -dpR $TMPDIR/etc $ETCDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: sysstat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sysstat,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -u -d -r1.10.2.1 -r1.10.2.2 --- sysstat 11 May 2007 14:46:58 -0000 1.10.2.1 +++ sysstat 21 Feb 2008 20:34:38 -0000 1.10.2.2 @@ -36,14 +36,14 @@ install ) if [ "$CONFIG_SYSSTAT" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || 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: jftpgw =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/jftpgw,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -d -r1.16 -r1.16.2.1 --- jftpgw 27 Mar 2004 17:30:19 -0000 1.16 +++ jftpgw 21 Feb 2008 20:34:37 -0000 1.16.2.1 @@ -36,14 +36,14 @@ install ) if [ "$CONFIG_JFTPGW" = "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 $WORKDIR/tmp/usr/etc - copy_files $WORKDIR/tmp/usr $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/etc + copy_files $TMPDIR/usr $CDDIR || exit 1 cp ./jftpgw.conf.sample $ETCDIR/etc || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/jftpgw $ETCDIR/etc/init.d || exit 1 echo "# Start $MYNAME?" >> $CONFIGFILE Index: jfsutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/jfsutils,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- jfsutils 11 Jan 2004 14:43:04 -0000 1.8 +++ jfsutils 21 Feb 2008 20:34:37 -0000 1.8.2.1 @@ -34,18 +34,18 @@ install ) if [ "$CONFIG_JFS" = "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 $WORKDIR/tmp/sbin/fsck.jfs - ln -sf jfs_fsck $WORKDIR/tmp/sbin/fsck.jfs - rm $WORKDIR/tmp/sbin/mkfs.jfs - ln -sf jfs_mkfs $WORKDIR/tmp/sbin/mkfs.jfs - rm -rf $WORKDIR/tmp/usr || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm $TMPDIR/sbin/fsck.jfs + ln -sf jfs_fsck $TMPDIR/sbin/fsck.jfs + rm $TMPDIR/sbin/mkfs.jfs + ln -sf jfs_mkfs $TMPDIR/sbin/mkfs.jfs + rm -rf $TMPDIR/usr || exit 1 - cp -dfpR $WORKDIR/tmp/* $CDDIR || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dfpR $TMPDIR/* $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: mt-st =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mt-st,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- mt-st 24 Apr 2004 01:17:59 -0000 1.1 +++ mt-st 21 Feb 2008 20:34:37 -0000 1.1.2.1 @@ -33,14 +33,14 @@ install ) if [ "$CONFIG_MT_ST" = "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 mkdir -p $CDDIR/usr/bin cp -p mt $CDDIR/usr/sbin cp -p stinit $CDDIR/usr/sbin - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: netacct-mysql =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/netacct-mysql,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -d -r1.8.2.1 -r1.8.2.2 --- netacct-mysql 30 Jul 2007 21:16:54 -0000 1.8.2.1 +++ netacct-mysql 21 Feb 2008 20:34:37 -0000 1.8.2.2 @@ -38,13 +38,13 @@ install ) if [ "$CONFIG_NETACCT" = "y" ]; then if [ "$CONFIG_MYSQL_CLIENT" ="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 @@ -52,7 +52,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 fi ;; Index: modutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Attic/modutils,v retrieving revision 1.16.2.2 retrieving revision 1.16.2.3 diff -u -d -r1.16.2.2 -r1.16.2.3 --- modutils 24 Sep 2004 13:11:10 -0000 1.16.2.2 +++ modutils 21 Feb 2008 20:34:37 -0000 1.16.2.3 @@ -36,13 +36,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=$TMPDIR mandir=$TMPDIR/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.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- MOSIX 11 Jan 2004 14:43:04 -0000 1.8 +++ MOSIX 21 Feb 2008 20:34:37 -0000 1.8.2.1 @@ -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.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- alsa-utils 11 Jan 2004 14:43:04 -0000 1.8 +++ alsa-utils 21 Feb 2008 20:34:37 -0000 1.8.2.1 @@ -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: tftp-hpa =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/tftp-hpa,v retrieving revision 1.1.2.3 ret... [truncated message content] |
