Menu
▾
▴
[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-SpamAssassin,1.8,1.9 alsa-driver,1.12,1.13 alsa-lib,1.8,1.9 alsa-utils,1.8,1.9 alsaplayer,1.4,1.5 apcupsd,1.6,1.7 arpwatch,1.20,1.21 bind,1.31,1.32 binutils,1.10,1.11 bridge-utils,1.14,1.15 build.sh,1.86,1.87 bzip2,1.11,1.12 camsource,1.5,1.6 cd_cleanup,1.8,1.9 cdrtools,1.8,1.9 clamav,1.12,1.13 coreutils,1.9,1.10 cpqarrayd,1.11,1.12 cron,1.20,1.21 cvs,1.7,1.8 cyrus-imapd,1.26,1.27 cyrus-sasl,1.15,1.16 dar,1.1,1.2 dhcp,1.21,1.22 diffutils,1.9,1.10 dnsmasq,1.2,1.3 dovecot,1.11,1.12 e2fsprogs,1.17,1.18 eagle-usb,1.6,1.7 ethtool,1.9,1.10 ez-ipupdate,1.9,1.10 fetchmail,1.9,1.10 file,1.4,1.5 findutils,1.10,1.11 frox,1.5,1.6 gawk,1.8,1.9 gcc,1.26,1.27 glibc,1.40,1.41 gnupg,1.13,1.14 grep,1.2,1.3 groff,1.10,1.11 grsecurity,1.22,1.23 grub,1.8,1.9 heartbeat,1.4,1.5 heimdal,1.7,1.8 httpd,1.3,1.4 iANS,1.18,1.19 inetutils,1.1,1.2 ipac-ng,1.11,1.12 iptables,1.26,1.27 isapnptools,1.2,1.3 jfsutils,1.8,1.9 jftpgw,1.16,1.17 joe,1.15,1.16 kbd,1.6,1.7 lcd4linux,1.4,1.5 lftp,1.7,1.8 linux-wlan-ng,1.13,1.14 lm_sensors,1.21,1.22 longhaul,1.2,1.3 lynx,1.11,1.12 make,1.3,1.4 man,1.8,1.9 mc,1.11,1.12 mgetty,1.8,1.9 minicom,1.5,1.6 module-init-tools,1.3,1.4 modutils,1.18,1.19 motion,1.2,1.3 mt-st,1.1,1.2 mtools,1.9,1.10 mysql,1.19,1.20 nail,1.15,1.16 nbd,1.2,1.3 ncftp,1.7,1.8 ncurses,1.8,1.9 net-snmp,1.5,1.6 net-tools,1.14,1.15 netacct-mysql,1.8,1.9 ntop,1.5,1.6 ntp,1.18,1.19 oidentd,1.15,1.16 openldap,1.20,1.21 openssh,1.28,1.29 openssl,1.23,1.24 openswan,1.3,1.4 openvpn,1.11,1.12 passwdgen,1.12,1.13 pciutils,1.11,1.12 pcmcia-cs,1.13,1.14 perl,1.35,1.36 php,1.11,1.12 poptop,1.6,1.7 portslave,1.15,1.16 postgresql,1.13,1.14 ppp,1.17,1.18 procps,1.10,1.11 psmisc,1.9,1.10 quagga,1.5,1.6 quota-tools,1.3,1.4 radvd,1.1,1.2 raidtools,1.17,1.18 razor-agents,1.3,1.4 rcs,1.9,1.10 reiserfsprogs,1.15,1.16 rp-pppoe,1.14,1.15 rpm,1.11,1.12 rrdtool,1.4,1.5 rsync,1.2,1.3 sagator,1.8,1.9 samba,1.25,1.26 screen,1.4,1.5 sed,1.2,1.3 ser,1.1,1.2 settings,1.43,1.44 sg3_utils,1.9,1.10 shadow,1.20,1.21 shfs,1.2,1.3 shorewall,1.6,1.7 smartmontools,1.6,1.7 snort,1.17,1.18 squid,1.20,1.21 squidguard,1.3,1.4 sudo,1.1,1.2 sysstat,1.10,1.11 sysvinit,1.11,1.12 telnet-bsd,1.7,1.8 thttpd,1.17,1.18 unzip,1.5,1.6 usbutils,1.10,1.11 util-linux,1.28,1.29 vim,1.8,1.9 vlan,1.9,1.10 vsftpd,1.12,1.13 vtun,1.11,1.12 watchdog,1.16,1.17 wget,1.14,1.15 which,1.8,1.9 wireless_tools,1.9,1.10 wol,1.2,1.3 yp-tools,1.3,1.4 ypbind-mt,1.4,1.5 ypserv,1.4,1.5 zip,1.4,1.5
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 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/perl,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- perl 17 Oct 2004 02:07:19 -0000 1.35 +++ perl 12 Dec 2004 21:48:08 -0000 1.36 @@ -31,19 +31,19 @@ echo >> ./hints/linux.sh echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh - ./Configure -Dprefix=/usr -Dinstallprefix=$WORKDIR/tmp -Dusethreads -d -e || exit 1 + ./Configure -Dprefix=/usr -Dinstallprefix=$TMPDIR -Dusethreads -d -e || exit 1 make $PMAKE || exit 1 #strip_debug - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 make install || exit 1 rm -f /usr/share/man/man1/s2p.1 /usr/share/man/man1/psed.1 /usr/share/man/man1/c2ph.1 /usr/share/man/man1/pstruct.1 rm -f /usr/bin/perl* rm -f /usr/bin/s2p /usr/bin/psed rm -f /usr/bin/pstruct /usr/bin/c2ph - cp -vfdpR $WORKDIR/tmp/* /usr || exit 1 + cp -vfdpR $TMPDIR/* /usr || exit 1 # delete the old perl version test -d /usr/lib/perl5/5.8.0 && rm -rf /usr/lib/perl5/5.8.0 @@ -80,25 +80,25 @@ install ) if [ "$CONFIG_PERL" = "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 || exit 1 - copy_docs $WORKDIR/tmp - rm $WORKDIR/tmp/bin/c2ph || exit 1 - ln -s pstruct $WORKDIR/tmp/bin/c2ph || exit 1 - rm $WORKDIR/tmp/bin/perl || exit 1 + copy_docs $TMPDIR + rm $TMPDIR/bin/c2ph || exit 1 + ln -s pstruct $TMPDIR/bin/c2ph || exit 1 + rm $TMPDIR/bin/perl || exit 1 # check here if install fails, you probably upgraded to a new perl release PERLBIN=perl5.8.5 - if [ ! -e $WORKDIR/tmp/bin/$PERLBIN ]; then + if [ ! -e $TMPDIR/bin/$PERLBIN ]; then echo "You need to edit the perl install script" echo "every time you update to a new release" exit 1 fi - ln -sf $PERLBIN $WORKDIR/tmp/bin/perl || exit 1 + ln -sf $PERLBIN $TMPDIR/bin/perl || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/usr/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/* $CDDIR/usr/ || exit 1 + rm -rf $TMPDIR || exit 1 # now let's take care of all the perl extension cd $WORKDIR/perl-ext || exit 1 Index: frox =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/frox,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- frox 26 Nov 2004 17:11:08 -0000 1.5 +++ frox 12 Dec 2004 21:48:08 -0000 1.6 @@ -40,19 +40,19 @@ install ) if [ "$CONFIG_FROX" = "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/doc/frox - cp doc/FAQ doc/SECURITY doc/ccp* $WORKDIR/tmp/usr/share/doc/frox - mkdir -p $WORKDIR/tmp/usr/share/man/man8 || exit 1 - gzip -c -9 < doc/frox.man > $WORKDIR/tmp/usr/share/man/man8/frox.conf.8.gz || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/man/man5 || exit 1 - gzip -c -9 < doc/frox.conf.man > $WORKDIR/tmp/usr/share/man/man5/frox.5.gz || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/share/doc/frox + cp doc/FAQ doc/SECURITY doc/ccp* $TMPDIR/usr/share/doc/frox + mkdir -p $TMPDIR/usr/share/man/man8 || exit 1 + gzip -c -9 < doc/frox.man > $TMPDIR/usr/share/man/man8/frox.conf.8.gz || exit 1 + mkdir -p $TMPDIR/usr/share/man/man5 || exit 1 + gzip -c -9 < doc/frox.conf.man > $TMPDIR/usr/share/man/man5/frox.5.gz || exit 1 copy_files src/frox.conf $ETCDIR/etc/ || exit 1 - 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 cp $MYDIR/scripts/frox $ETCDIR/etc/init.d || exit 1 echo "# Start Frox FTP Proxy?" >> $CONFIGFILE Index: LVM2 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/LVM2,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- LVM2 10 Sep 2004 23:16:24 -0000 1.6 +++ LVM2 12 Dec 2004 21:48:08 -0000 1.7 @@ -18,6 +18,7 @@ # get the directoryname of the script MYDIR=${0%/*} +MYSCRIPT=${0##/*/} # source functions and config source $MYDIR/settings @@ -51,19 +52,18 @@ ;; install ) if [ "$CONFIG_LVM2" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 pushd `pwd` cd ../device-mapper* - make install DESTDIR=$WORKDIR/tmp || exit 1 + make install DESTDIR=$TMPDIR || exit 1 popd - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr || exit 1 - cp -dvpR $WORKDIR/tmp/etc $ETCDIR/ || exit 1 - rm -rf $WORKDIR/tmp/etc || exit 1 - cp -dvpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr || exit 1 + cp -dvpR $TMPDIR/etc $ETCDIR/ || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dvpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: poptop =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/poptop,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- poptop 25 Oct 2004 19:35:48 -0000 1.6 +++ poptop 12 Dec 2004 21:48:08 -0000 1.7 @@ -39,18 +39,18 @@ install ) if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_POPTOP" = "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 $DOCDIR/pptpd || exit 1 #cp -dp ./html/* $DOCDIR/pptpd - copy_files $WORKDIR/tmp/usr $CDDIR || exit 1 + copy_files $TMPDIR/usr $CDDIR || exit 1 #replace_str ./samples/pptpd.conf "#option /etc/ppp/options.pptpd" "option /etc/ppp/options.pptp" cp -p ./samples/pptpd.conf $ETCDIR/etc || exit 1 cp -p $MYDIR/scripts/options.pptp $ETCDIR/etc/ppp/options.pptpd || exit 1 cp $MYDIR/scripts/pptpd $ETCDIR/etc/init.d/ - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 echo "# Start $MYNAME?" >> $CONFIGFILE echo "START_PPTPD=no" >> $CONFIGFILE Index: thttpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/thttpd,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- thttpd 11 Jan 2004 14:43:05 -0000 1.17 +++ thttpd 12 Dec 2004 21:48:09 -0000 1.18 @@ -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 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- openvpn 11 Jan 2004 14:43:04 -0000 1.11 +++ openvpn 12 Dec 2004 21:48:08 -0000 1.12 @@ -39,12 +39,12 @@ 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 - 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: eagle-usb =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/eagle-usb,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- eagle-usb 26 Nov 2004 17:11:08 -0000 1.6 +++ eagle-usb 12 Dec 2004 21:48:08 -0000 1.7 @@ -38,24 +38,24 @@ install ) if [ "$CONFIG_EAGLE_USB" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/etc/eagle-usb/scripts || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + mkdir -p $TMPDIR/etc/eagle-usb/scripts || exit 1 + make install DESTDIR=$TMPDIR || exit 1 mkdir -p $CDDIR/usr/share/eagle-usb/{dsp,lang} || exit 1 - mv -f $WORKDIR/tmp/etc/eagle-usb/dsp/* $CDDIR/usr/share/eagle-usb/dsp/ || exit 1 - mv -f $WORKDIR/tmp/etc/eagle-usb/lang/* $CDDIR/usr/share/eagle-usb/lang/ || exit 1 - rm -rf $WORKDIR/tmp/etc/eagle-usb/{dsp,lang} || exit 1 + mv -f $TMPDIR/etc/eagle-usb/dsp/* $CDDIR/usr/share/eagle-usb/dsp/ || exit 1 + mv -f $TMPDIR/etc/eagle-usb/lang/* $CDDIR/usr/share/eagle-usb/lang/ || exit 1 + rm -rf $TMPDIR/etc/eagle-usb/{dsp,lang} || exit 1 - copy_files $WORKDIR/tmp/usr/sbin $CDDIR/usr/ || exit 1 - copy_files $WORKDIR/tmp/lib $CDDIR || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + copy_files $TMPDIR/usr/sbin $CDDIR/usr/ || exit 1 + copy_files $TMPDIR/lib $CDDIR || exit 1 + copy_files $TMPDIR/etc $ETCDIR/ || exit 1 cp $MYDIR/scripts/eagle-usb $ETCDIR/etc/init.d || exit 1 ln -sf /usr/share/eagle-usb/dsp $ETCDIR/etc/eagle-usb || exit 1 ln -sf /usr/share/eagle-usb/lang $ETCDIR/etc/eagle-usb || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 echo "# Initialize the Eagle USB modem?" >> $CONFIGFILE echo "START_EAGLE_USB=no" >> $CONFIGFILE Index: isapnptools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/isapnptools,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- isapnptools 11 Jan 2004 14:43:04 -0000 1.2 +++ isapnptools 12 Dec 2004 21:48:08 -0000 1.3 @@ -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.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- lm_sensors 21 Jul 2004 23:33:19 -0000 1.21 +++ lm_sensors 12 Dec 2004 21:48:08 -0000 1.22 @@ -69,26 +69,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: squid =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/squid,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- squid 10 Sep 2004 23:16:24 -0000 1.20 +++ squid 12 Dec 2004 21:48:09 -0000 1.21 @@ -53,15 +53,15 @@ install ) if [ "$CONFIG_SQUID" = "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/etc/*.default || exit 1 - 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 + copy_docs $TMPDIR + rm $TMPDIR/etc/*.default || exit 1 + cp $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/squid $ETCDIR/etc/init.d || exit 1 useradd -u 31 -g nogroup -s /bin/false squid || exit 1 Index: radvd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/radvd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- radvd 15 Mar 2004 00:49:02 -0000 1.1 +++ radvd 12 Dec 2004 21:48:09 -0000 1.2 @@ -36,16 +36,16 @@ install ) if [ "$CONFIG_RADVD" = "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 - copy_files $WORKDIR/tmp/usr $CDDIR || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + 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 + copy_files $TMPDIR/usr $CDDIR || exit 1 + copy_files $TMPDIR/etc $ETCDIR/ || exit 1 cp radvd.conf.example $ETCDIR/etc/radvd.conf.sample || exit 1 cp $MYDIR/scripts/radvd $ETCDIR/etc/init.d || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 echo "# Start RADVD?" >> $CONFIGFILE echo "START_RADVD=no" >> $CONFIGFILE Index: iptables =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iptables,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- iptables 27 Apr 2004 11:24:03 -0000 1.26 +++ iptables 12 Dec 2004 21:48:08 -0000 1.27 @@ -46,14 +46,14 @@ ;; 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 DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - copy_files $WORKDIR/tmp/usr/sbin $CDDIR/usr || exit 1 - copy_files $WORKDIR/tmp/usr/lib $CDDIR/usr || 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 DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + copy_files $TMPDIR/usr/sbin $CDDIR/usr || exit 1 + copy_files $TMPDIR/usr/lib $CDDIR/usr || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: lftp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/lftp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- lftp 11 Jan 2004 14:43:04 -0000 1.7 +++ lftp 12 Dec 2004 21:48:08 -0000 1.8 @@ -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.6 diff -u -d -r1.5 -r1.6 --- unzip 11 Jan 2004 14:43:05 -0000 1.5 +++ unzip 12 Dec 2004 21:48:09 -0000 1.6 @@ -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: ncurses =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ncurses,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ncurses 11 Jan 2004 14:43:04 -0000 1.8 +++ ncurses 12 Dec 2004 21:48:08 -0000 1.9 @@ -33,20 +33,20 @@ ;; 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 $WORKDIR/tmp/usr/include || exit 1 - rm $WORKDIR/tmp/usr/lib/*.a || exit 1 - rm $WORKDIR/tmp/usr/lib/terminfo || exit 1 - mkdir -p $WORKDIR/tmp/lib || exit 1 - mv $WORKDIR/tmp/usr/lib/* $WORKDIR/tmp/lib || exit 1 - chmod 755 $WORKDIR/tmp/lib/* || 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/* $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 + rm -rf $TMPDIR/usr/include || exit 1 + 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 + chmod 755 $TMPDIR/lib/* || exit 1 + cp -dpR $TMPDIR/usr/share/* $CDDIR/usr/share || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: clamav =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/clamav,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- clamav 12 Nov 2004 01:23:57 -0000 1.12 +++ clamav 12 Dec 2004 21:48:08 -0000 1.13 @@ -36,11 +36,11 @@ install ) if [ "$CONFIG_CLAMAV" = "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 $DOCDIR/clamav || exit 1 cp -dpR docs/html $DOCDIR/clamav || exit 1 @@ -48,13 +48,13 @@ useradd -u 45 -s /bin/false -g vscan clamav || 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 $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/lib/*a || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 mkdir -p $CDDIR/var/lib/clamav || exit 1 chmod -R 700 $CDDIR/var/lib/clamav || exit 1 chown -R clamav $CDDIR/var/lib/clamav || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 cp -dp $MYDIR/scripts/clamav $ETCDIR/etc/init.d/ || exit 1 echo "# Start ClamAV daemon?" >> $CONFIGFILE Index: squidguard =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/squidguard,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- squidguard 6 Sep 2004 20:31:33 -0000 1.3 +++ squidguard 12 Dec 2004 21:48:09 -0000 1.4 @@ -40,15 +40,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 @@ -57,8 +57,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: quagga =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/quagga,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- quagga 12 Nov 2004 01:23:57 -0000 1.5 +++ quagga 12 Dec 2004 21:48:09 -0000 1.6 @@ -42,19 +42,19 @@ install ) if [ "$CONFIG_QUAGGA" = "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 - copy_files $WORKDIR/tmp/usr $CDDIR || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + copy_files $TMPDIR/usr $CDDIR || exit 1 + copy_files $TMPDIR/etc $ETCDIR/ || exit 1 cp $MYDIR/scripts/quagga $ETCDIR/etc/init.d || exit 1 cp $MYDIR/scripts/bgpd $ETCDIR/etc/init.d || exit 1 cp $MYDIR/scripts/ospf6d $ETCDIR/etc/init.d || exit 1 cp $MYDIR/scripts/ospfd $ETCDIR/etc/init.d || exit 1 cp $MYDIR/scripts/ripd $ETCDIR/etc/init.d || exit 1 cp $MYDIR/scripts/ripngd $ETCDIR/etc/init.d || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 groupadd -g 62 quagga || exit 1 useradd -u 62 -g quagga -s /bin/false quagga || exit 1 Index: dar =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- dar 24 Aug 2004 01:04:40 -0000 1.1 +++ dar 12 Dec 2004 21:48:08 -0000 1.2 @@ -37,17 +37,17 @@ install ) if [ "$CONFIG_DAR" = "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 - rm -rf $WORKDIR/tmp/usr/{man,info} || exit 1 - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -f $WORKDIR/tmp/usr/lib/*a || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/{man,info} || exit 1 + rm -rf $TMPDIR/usr/include || exit 1 + rm -f $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 cp ./doc/samples/darrc_sample $ETCDIR/etc/ || exit 1 #cp $MYDIR/scripts/dar $ETCDIR/etc/init.d/ || exit 1 Index: dovecot =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dovecot,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- dovecot 11 Jan 2004 14:43:04 -0000 1.11 +++ dovecot 12 Dec 2004 21:48:08 -0000 1.12 @@ -35,16 +35,16 @@ install ) if [ "$CONFIG_DOVECOT" = "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/share || exit 1 - cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1 - cp $WORKDIR/tmp/etc/* $ETCDIR/etc || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + cp -dpR $TMPDIR/usr $CDDIR/ || exit 1 + cp $TMPDIR/etc/* $ETCDIR/etc || exit 1 + rm -rf $TMPDIR || exit 1 mkdir -p $CDDIR/var/run/dovecot/login || exit 1 chgrp nogroup $CDDIR/var/run/dovecot/login || exit 1 Index: cyrus-imapd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/cyrus-imapd,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- cyrus-imapd 10 Sep 2004 23:16:24 -0000 1.26 +++ cyrus-imapd 12 Dec 2004 21:48:08 -0000 1.27 @@ -40,7 +40,7 @@ --with-auth=unix --enable-listext --enable-annotatemore --enable-fulldirhash --enable-sieve || exit 1 make depend # parallel build fails, do not use $PMAKE - make all DESTDIR=$WORKDIR/tmp || exit 1 + make all DESTDIR=$TMPDIR || exit 1 strip_debug #install it, we need it later @@ -50,26 +50,26 @@ install ) if [ "$CONFIG_CYRUS_IMAPD" = "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 all install DESTDIR=$WORKDIR/tmp || exit 1 + make all install DESTDIR=$TMPDIR || exit 1 - rm -rf $WORKDIR/tmp/usr/include || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/lib/*.a || exit 1 - ln -sf imtest $WORKDIR/tmp/usr/bin/pop3test - ln -sf imtest $WORKDIR/tmp/usr/bin/lmtptest - ln -sf imtest $WORKDIR/tmp/usr/bin/smtptest - ln -sf imtest $WORKDIR/tmp/usr/bin/mupdatetest - ln -sf imtest $WORKDIR/tmp/usr/bin/sivtest - ln -sf imtest $WORKDIR/tmp/usr/bin/nntptest - ln -sf pop3d $WORKDIR/tmp/usr/lib/cyrus/bin/pop3proxyd + rm -rf $TMPDIR/usr/include || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/lib/*.a || exit 1 + ln -sf imtest $TMPDIR/usr/bin/pop3test + ln -sf imtest $TMPDIR/usr/bin/lmtptest + ln -sf imtest $TMPDIR/usr/bin/smtptest + ln -sf imtest $TMPDIR/usr/bin/mupdatetest + ln -sf imtest $TMPDIR/usr/bin/sivtest + ln -sf imtest $TMPDIR/usr/bin/nntptest + ln -sf pop3d $TMPDIR/usr/lib/cyrus/bin/pop3proxyd mkdir -p $CDDIR/usr/lib/cyrus/bin/ - copy_files $WORKDIR/tmp/usr $CDDIR || exit 1 + copy_files $TMPDIR/usr $CDDIR || exit 1 cp -p ./tools/* $CDDIR/usr/lib/cyrus/bin/ - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 useradd -u 96 -s /bin/false -g mail cyrus || exit 1 Index: shadow =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/shadow,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- shadow 12 Nov 2004 01:23:57 -0000 1.20 +++ shadow 12 Dec 2004 21:48:09 -0000 1.21 @@ -39,23 +39,23 @@ groupadd -g 15 wheel fi - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make DESTDIR=$WORKDIR/tmp install || exit 1 - chmod 700 $WORKDIR/tmp/bin/login || exit 1 - chmod 4550 $WORKDIR/tmp/bin/su || exit 1 - chgrp wheel $WORKDIR/tmp/bin/su || exit 1 - chmod -c go-rx $WORKDIR/tmp/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,mkpasswd,newusers,pw[cu]*,user*} || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make DESTDIR=$TMPDIR install || exit 1 + chmod 700 $TMPDIR/bin/login || exit 1 + chmod 4550 $TMPDIR/bin/su || exit 1 + chgrp wheel $TMPDIR/bin/su || exit 1 + chmod -c go-rx $TMPDIR/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,mkpasswd,newusers,pw[cu]*,user*} || exit 1 copy_man ./man - rm -rf $WORKDIR/tmp/usr/share - rm -rf $WORKDIR/tmp/lib/*.a - rm -rf $WORKDIR/tmp/lib/*.la + rm -rf $TMPDIR/usr/share + rm -rf $TMPDIR/lib/*.a + rm -rf $TMPDIR/lib/*.la cp -dpR etc/{limits,login.access,login.def*,useradd} $ETCDIR/etc/ || exit 1 sed 's%^#MD5_CRYPT_ENAB.*no%MD5_CRYPT_ENAB yes%' etc/login.defs.linux > $ETCDIR/etc/login.defs && - rm -rf $WORKDIR/tmp/usr/share || exit 1 - rm -rf $WORKDIR/tmp/lib || 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/lib || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: util-linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- util-linux 12 Nov 2004 01:23:57 -0000 1.28 +++ util-linux 12 Dec 2004 21:48:09 -0000 1.29 @@ -48,15 +48,15 @@ ;; install ) - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WOR... [truncated message content] |
