Menu
▾
▴
devil-linux-commit — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(202) |
Nov
(201) |
Dec
(280) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(493) |
Feb
(106) |
Mar
(215) |
Apr
(163) |
May
(79) |
Jun
(193) |
Jul
(47) |
Aug
(71) |
Sep
(127) |
Oct
(41) |
Nov
(49) |
Dec
(120) |
| 2005 |
Jan
(147) |
Feb
(45) |
Mar
(26) |
Apr
(71) |
May
(52) |
Jun
(28) |
Jul
(92) |
Aug
(50) |
Sep
(35) |
Oct
(193) |
Nov
(106) |
Dec
(52) |
| 2006 |
Jan
(51) |
Feb
(38) |
Mar
(33) |
Apr
(79) |
May
(107) |
Jun
(67) |
Jul
(21) |
Aug
(65) |
Sep
(44) |
Oct
(87) |
Nov
(12) |
Dec
(56) |
| 2007 |
Jan
(48) |
Feb
(58) |
Mar
(63) |
Apr
(31) |
May
(25) |
Jun
(20) |
Jul
(72) |
Aug
(54) |
Sep
(30) |
Oct
(76) |
Nov
(74) |
Dec
(25) |
| 2008 |
Jan
(39) |
Feb
(39) |
Mar
(62) |
Apr
(64) |
May
(59) |
Jun
(31) |
Jul
(25) |
Aug
(25) |
Sep
(17) |
Oct
(24) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(60) |
Feb
(39) |
Mar
(16) |
Apr
(30) |
May
(52) |
Jun
(35) |
Jul
(15) |
Aug
(15) |
Sep
(21) |
Oct
(32) |
Nov
(39) |
Dec
(52) |
| 2010 |
Jan
(42) |
Feb
(40) |
Mar
(23) |
Apr
(20) |
May
(27) |
Jun
(10) |
Jul
(30) |
Aug
(30) |
Sep
(66) |
Oct
(12) |
Nov
(35) |
Dec
(60) |
| 2011 |
Jan
(16) |
Feb
(1) |
Mar
(3) |
Apr
(28) |
May
(21) |
Jun
|
Jul
(12) |
Aug
(6) |
Sep
(10) |
Oct
(14) |
Nov
(40) |
Dec
(60) |
| 2012 |
Jan
(23) |
Feb
(17) |
Mar
(24) |
Apr
(18) |
May
(13) |
Jun
(1) |
Jul
|
Aug
(5) |
Sep
|
Oct
(5) |
Nov
(5) |
Dec
(15) |
| 2013 |
Jan
(2) |
Feb
(5) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(3) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(3) |
Nov
(1) |
Dec
(1) |
| 2014 |
Jan
(3) |
Feb
(5) |
Mar
(8) |
Apr
(3) |
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
(4) |
Oct
(10) |
Nov
|
Dec
(9) |
| 2015 |
Jan
(18) |
Feb
(17) |
Mar
(5) |
Apr
(2) |
May
|
Jun
(5) |
Jul
(1) |
Aug
(2) |
Sep
(1) |
Oct
(24) |
Nov
(20) |
Dec
(41) |
| 2016 |
Jan
(9) |
Feb
(3) |
Mar
(2) |
Apr
(7) |
May
(8) |
Jun
(1) |
Jul
(6) |
Aug
(5) |
Sep
(2) |
Oct
(6) |
Nov
(1) |
Dec
(6) |
| 2017 |
Jan
(6) |
Feb
(1) |
Mar
|
Apr
(4) |
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Heiko Z. <smi...@us...> - 2004-12-16 01:35:23
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29093/scripts Modified Files: perl Log Message: extensions didn't get installed after last changes Index: perl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/perl,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- perl 13 Dec 2004 22:12:29 -0000 1.39 +++ perl 16 Dec 2004 01:35:13 -0000 1.40 @@ -61,7 +61,7 @@ echo "******** compiling perl extension $EXT ********" yes "" | perl Makefile.PL PREFIX=/usr|| exit 1 strip_debug - make install DESTDIR=$TMPDIR || exit 1 + make install || exit 1 popd done @@ -96,9 +96,7 @@ for EXT in $(ls -d *) do - pushd $EXT - make install DESTDIR=$CDDIR - popd + make -C $EXT install DESTDIR=$CDDIR || exit 1 done fi |
|
From: Heiko Z. <smi...@us...> - 2004-12-14 03:13:23
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10334 Modified Files: coreutils Log Message: remove debugging stuff Index: coreutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/coreutils,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- coreutils 14 Dec 2004 02:28:38 -0000 1.11 +++ coreutils 14 Dec 2004 03:13:14 -0000 1.12 @@ -43,14 +43,13 @@ mkdir -p $TMPDIR/bin || exit 1 mkdir -p $TMPDIR/usr/bin || exit 1 make DESTDIR=$TMPDIR install || exit 1 - 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 + rm -rf $TMPDIR || exit 1 ;; * ) |
|
From: Heiko Z. <smi...@us...> - 2004-12-14 02:28:54
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3031/scripts Modified Files: coreutils net-tools Log Message: get our hostname back Index: coreutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/coreutils,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- coreutils 12 Dec 2004 21:48:08 -0000 1.10 +++ coreutils 14 Dec 2004 02:28:38 -0000 1.11 @@ -43,6 +43,7 @@ mkdir -p $TMPDIR/bin || exit 1 mkdir -p $TMPDIR/usr/bin || exit 1 make DESTDIR=$TMPDIR install || exit 1 + exit 1 rm $TMPDIR/bin/su #rm $TMPDIR/bin/hostname copy_docs $TMPDIR Index: net-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-tools,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- net-tools 12 Dec 2004 21:48:08 -0000 1.15 +++ net-tools 14 Dec 2004 02:28:38 -0000 1.16 @@ -31,6 +31,10 @@ fi cp $MYDIR/config/config_net-tools.h ./config.h cp $MYDIR/config/config_net-tools.make ./config.make + + # get hostname back, this one is much more powefull then the one from coreutils + replace_str Makefile "# hostname" "hostname" + # parallel build fails - do not use $PMAKE make all || exit 1 ;; |
|
From: Heiko Z. <smi...@us...> - 2004-12-13 23:59:01
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2465/scripts Modified Files: build.sh devildoc linux-wlan-ng Log Message: more bugfixes for being threa safe Index: linux-wlan-ng =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/linux-wlan-ng,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- linux-wlan-ng 12 Dec 2004 21:48:08 -0000 1.14 +++ linux-wlan-ng 13 Dec 2004 23:58:52 -0000 1.15 @@ -39,6 +39,8 @@ echo "INSTALL_DEPMOD=n" >> default.config echo "WLAN_TARGET_ARCH=i386" >> default.config echo "TARGET_ROOT_ON_HOST=$TMPDIR" >> default.config + + echo $TMPDIR > DL.TMPDIR make default_config || exit 1 @@ -51,6 +53,7 @@ install ) if [ "$CONFIG_LINUX_WLAN_NG" = "y" ]; then + TMPDIR=$(cat DL.TMPDIR) rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 make install || exit 1 Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- build.sh 13 Dec 2004 16:41:11 -0000 1.88 +++ build.sh 13 Dec 2004 23:58:51 -0000 1.89 @@ -140,7 +140,7 @@ echo "$THISNO =$THISGROUP" >> $WORKDIR/Makefile.inc1.$CMD fi echo ".PHONY: all " >> $WORKDIR/Makefile.inc2.$CMD - echo "all : $ALLGROUPS" >> $WORKDIR/Makefile.inc2.$CMD + echo "all : $ALLGROUPS \$($LASTNO)" >> $WORKDIR/Makefile.inc2.$CMD make -j $CONFIG_PARALLEL_JOBS -C $WORKDIR -f Makefile.$CMD || exit 1 done Index: devildoc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/devildoc,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- devildoc 11 Jan 2004 14:43:04 -0000 1.12 +++ devildoc 13 Dec 2004 23:58:52 -0000 1.13 @@ -12,7 +12,7 @@ # Provides: devildoc # Required-Start: $basebuildtools $libs $installmain # Required-Stop: -# Default-Start: 1 2 +# Default-Start: 2 # Default-Stop: # Description: description ### END INIT INFO @@ -24,15 +24,10 @@ source $MYDIR/settings case $1 in - build ) - echo copying saxon to java directory - cp -dpR $DL_DIR/docs/documentation/java/* $WORKDIR/j2re*/lib/ext || exit 1 - ;; - install ) cp -dp $DL_DIR/docs/* $CDDOCDIR/ pushd $CDDOCDIR/ || exit 1 - $WORKDIR/j2re*/bin/java com.icl.saxon.StyleSheet $DL_DIR/docs/documentation/documentation.xml $DL_DIR/docs/documentation/stylesheets/html.xsl || exit 1 + $WORKDIR/j2re*/bin/java -cp $DL_DIR/docs/documentation/java/saxon.jar com.icl.saxon.StyleSheet $DL_DIR/docs/documentation/documentation.xml $DL_DIR/docs/documentation/stylesheets/html.xsl || exit 1 mkdir -p output.html/images/ || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2004-12-13 22:12:53
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9390/scripts Modified Files: Mail-SpamAssassin perl razor-agents Log Message: more fixes to get the thread safe compile working Index: Mail-SpamAssassin =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Mail-SpamAssassin 12 Dec 2004 21:48:08 -0000 1.9 +++ Mail-SpamAssassin 13 Dec 2004 22:12:29 -0000 1.10 @@ -27,7 +27,7 @@ case $1 in build ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then - perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$TMPDIR ENABLE_SSL=yes < /dev/null || exit 1 + perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc 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 @@ -41,7 +41,7 @@ if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then rm -rf $TMPDIR || exit 1 - make install || exit 1 + make DESTDIR=$TMPDIR install || exit 1 install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1 Index: perl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/perl,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- perl 13 Dec 2004 18:45:23 -0000 1.38 +++ perl 13 Dec 2004 22:12:29 -0000 1.39 @@ -28,8 +28,6 @@ case $1 in build ) if [ "$CONFIG_PERL" = "y" ]; then - echo $TMPDIR > DL.TMPDIR - echo >> ./hints/linux.sh echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh @@ -40,18 +38,7 @@ #strip_debug # I don't know why, but we loose the variable... - rm -rf $TMPDIR || exit 1 - mkdir -p $TMPDIR || exit 1 - make install DESTDIR=$TMPDIR || 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 $TMPDIR/usr/* /usr || exit 1 - - # delete the old perl version - test -d /usr/lib/perl5/5.8.0 && rm -rf /usr/lib/perl5/5.8.0 - test -d /usr/lib/perl5/site_perl/5.8.0 && rm -rf /usr/lib/perl5/site_perl/5.8.0 + make install || exit 1 # now let's take care of all the perl extension rm -rf $WORKDIR/perl-ext @@ -72,9 +59,9 @@ do pushd $EXT echo "******** compiling perl extension $EXT ********" - yes "" | perl Makefile.PL PREFIX=/usr DESTDIR=$TMPDIR || exit 1 + yes "" | perl Makefile.PL PREFIX=/usr|| exit 1 strip_debug - make install || exit 1 + make install DESTDIR=$TMPDIR || exit 1 popd done @@ -84,10 +71,9 @@ install ) if [ "$CONFIG_PERL" = "y" ]; then - TMPDIR=$(cat DL.TMPDIR) rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR|| exit 1 - make install || exit 1 + make install DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR rm $TMPDIR/usr/bin/c2ph || exit 1 ln -s pstruct $TMPDIR/usr/bin/c2ph || exit 1 Index: razor-agents =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/razor-agents,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- razor-agents 12 Dec 2004 21:48:09 -0000 1.4 +++ razor-agents 13 Dec 2004 22:12:29 -0000 1.5 @@ -25,7 +25,7 @@ case $1 in build ) if [ "$CONFIG_RAZOR_AGENTS" = "y" ]; then - perl Makefile.PL PREFIX=/usr DESTDIR=$TMPDIR < /dev/null || exit 1 + perl Makefile.PL PREFIX=/usr < /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... @@ -33,7 +33,7 @@ strip_debug # we need to install it, otherwise it will fail later - make install DESTDIR= || exit 1 + make install || exit 1 fi ;; @@ -41,7 +41,7 @@ if [ "$CONFIG_RAZOR_AGENTS" = "y" ]; then rm -rf $TMPDIR || exit 1 - make install || exit 1 + make DESTDIR=$TMPDIR install || exit 1 copy_docs $TMPDIR copy_files $TMPDIR/usr $CDDIR/ || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2004-12-13 19:06:41
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28382 Modified Files: settings Log Message: syntax of date command changed Index: settings =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/settings,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- settings 13 Dec 2004 02:03:49 -0000 1.45 +++ settings 13 Dec 2004 19:06:31 -0000 1.46 @@ -56,7 +56,7 @@ if [ "$DL_IS_OFFICIAL_RELEASE" = "y" ]; then DL_VERSION="$(cat $SCRCONFIG/VERSION)" else - DL_VERSION="$(cat $SCRCONFIG/VERSION)-$(date -u -I)" + DL_VERSION="$(cat $SCRCONFIG/VERSION)-$(date -u --iso-8601)" fi DL_VERSION_FULL="$DL_VERSION-i$CONFIG_CPU" [ "$CONFIG_LINUX_SMP" = "y" ] && DL_VERSION_FULL="${DL_VERSION_FULL}-SMP" |
|
From: Heiko Z. <smi...@us...> - 2004-12-13 18:45:38
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23124/scripts Modified Files: perl Log Message: use DESTDIR, to get TMPDIR stuff working Index: perl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/perl,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- perl 13 Dec 2004 17:31:11 -0000 1.37 +++ perl 13 Dec 2004 18:45:23 -0000 1.38 @@ -33,19 +33,21 @@ echo >> ./hints/linux.sh echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh - ./Configure -Dprefix=/usr -Dinstallprefix=$TMPDIR -Dusethreads -d -e || exit 1 + #./Configure -Dprefix=/usr -Dinstallprefix=$TMPDIR -Dusethreads -d -e || exit 1 + ./Configure -Dprefix=/usr -Dusethreads -d -e || exit 1 make $PMAKE || exit 1 #strip_debug + # I don't know why, but we loose the variable... rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 - make install || exit 1 + make install DESTDIR=$TMPDIR || 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 $TMPDIR/* /usr || exit 1 + cp -vfdpR $TMPDIR/usr/* /usr || exit 1 # delete the old perl version test -d /usr/lib/perl5/5.8.0 && rm -rf /usr/lib/perl5/5.8.0 @@ -70,7 +72,7 @@ do pushd $EXT echo "******** compiling perl extension $EXT ********" - yes "" | perl Makefile.PL PREFIX=/usr || exit 1 + yes "" | perl Makefile.PL PREFIX=/usr DESTDIR=$TMPDIR || exit 1 strip_debug make install || exit 1 popd @@ -87,20 +89,20 @@ mkdir -p $TMPDIR|| exit 1 make install || 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 + rm $TMPDIR/usr/bin/c2ph || exit 1 + ln -s pstruct $TMPDIR/usr/bin/c2ph || exit 1 + rm $TMPDIR/usr/bin/perl || exit 1 # check here if install fails, you probably upgraded to a new perl release PERLBIN=perl5.8.5 - if [ ! -e $TMPDIR/bin/$PERLBIN ]; then + if [ ! -e $TMPDIR/usr/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 $TMPDIR/bin/perl || exit 1 + ln -sf $PERLBIN $TMPDIR/usr/bin/perl || exit 1 - cp -dpR $TMPDIR/* $CDDIR/usr/ || exit 1 + cp -dpR $TMPDIR/usr/* $CDDIR/usr/ || exit 1 rm -rf $TMPDIR || exit 1 # now let's take care of all the perl extension |
|
From: Heiko Z. <smi...@us...> - 2004-12-13 17:31:20
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4104/scripts Modified Files: motion perl Log Message: we need to keep the name of the TMPDIR Index: motion =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/motion,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- motion 13 Dec 2004 16:41:11 -0000 1.4 +++ motion 13 Dec 2004 17:31:11 -0000 1.5 @@ -41,12 +41,14 @@ /bin/sh configure --prefix=$TMPDIR/usr --bindir=$TMPDIR/usr/sbin \ --sysconfdir=$TMPDIR/etc --mandir=$TMPDIR/usr/share/man $OPT_FLAGS || exit 1 make $PMAKE all || exit 1 + echo $TMPDIR > DL.TMPDIR strip_debug fi ;; install ) if [ "$CONFIG_MOTION" = "y" ]; then + TMPDIR=$(cat DL.TMPDIR) rm -rf $TMPDIR || exit 1 make install || exit 1 Index: perl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/perl,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- perl 12 Dec 2004 21:48:08 -0000 1.36 +++ perl 13 Dec 2004 17:31:11 -0000 1.37 @@ -28,6 +28,8 @@ case $1 in build ) if [ "$CONFIG_PERL" = "y" ]; then + echo $TMPDIR > DL.TMPDIR + echo >> ./hints/linux.sh echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh @@ -73,13 +75,14 @@ make install || exit 1 popd done - + exit 0 fi ;; install ) if [ "$CONFIG_PERL" = "y" ]; then + TMPDIR=$(cat DL.TMPDIR) rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR|| exit 1 make install || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2004-12-13 17:11:51
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30148/scripts Modified Files: dhcp Log Message: we need to keep the name of the build TMP directory Index: dhcp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dhcp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- dhcp 12 Dec 2004 21:48:08 -0000 1.22 +++ dhcp 13 Dec 2004 17:11:43 -0000 1.23 @@ -40,6 +40,8 @@ LIBDIR=$TMPDIR/usr/local/lib INCDIR=$TMPDIR/usr/local/include EOF + + echo $TMPDIR > DL.TMPDIR ./configure || exit 1 make $PMAKE all || exit 1 @@ -49,6 +51,7 @@ install ) if [ "$CONFIG_ISC_DHCP" = "y" ]; then + TMPDIR=$(cat DL.TMPDIR) rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR/sbin || exit 1 make install || exit 1 |
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22768/scripts Modified Files: binutils build.sh devfsd kbd mgetty minicom modutils motion ncurses net-snmp ntop ppp ser Log Message: some files still used $WORKDIR/tmp Index: mgetty =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mgetty,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- mgetty 12 Dec 2004 21:48:08 -0000 1.9 +++ mgetty 13 Dec 2004 16:41:11 -0000 1.10 @@ -43,7 +43,7 @@ rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR/usr/sbin || exit 1 - make install CONFDIR=$TMPDIR/etc/mgetty+sendfax prefix=$WORKDIR/tmp/usr || exit 1 + make install CONFDIR=$TMPDIR/etc/mgetty+sendfax prefix=$TMPDIR/usr || exit 1 pushd callback > /dev/null make install BINDIR=$TMPDIR/usr/bin \ Index: modutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/modutils,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- modutils 12 Dec 2004 21:48:08 -0000 1.19 +++ modutils 13 Dec 2004 16:41:11 -0000 1.20 @@ -43,7 +43,7 @@ rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR/sbin || exit 1 mkdir -p $TMPDIR/usr/share/man/man{1,2,5,8} || exit 1 - make install prefix=$TMPDIR/usr exec_prefix=$WORKDIR/tmp mandir=$WORKDIR/tmp/usr/share/man || exit 1 + make install prefix=$TMPDIR/usr exec_prefix=$TMPDIR mandir=$TMPDIR/usr/share/man || exit 1 copy_docs $TMPDIR copy_files $TMPDIR/sbin $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 Index: ser =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ser,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ser 12 Dec 2004 21:48:09 -0000 1.2 +++ ser 13 Dec 2004 16:41:11 -0000 1.3 @@ -25,7 +25,7 @@ MYNAME=SER -MAKEOPT="prefix=/usr cfg-target=/etc/ser/ cfg-prefix=$TMPDIR BASEDIR=$WORKDIR/tmp" +MAKEOPT="prefix=/usr cfg-target=/etc/ser/ cfg-prefix=$TMPDIR BASEDIR=$TMPDIR" MAKEOPT="$MAKEOPT USER_TLS=1" EXCLUDEMODULES="cpl cpl-c ext extcmd postgres snmp im radius_acc radius_auth jabber auth_radius group_radius uri_radius" if [ "$CONFIG_MYSQL_CLIENT" != "y" ]; then Index: net-snmp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- net-snmp 12 Dec 2004 21:48:08 -0000 1.6 +++ net-snmp 13 Dec 2004 16:41:11 -0000 1.7 @@ -42,7 +42,7 @@ if [ "$CONFIG_NET_SNMP" = "y" ]; then rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 - make install prefix=$TMPDIR/usr exec_prefix=$WORKDIR/tmp/usr sysconfdir=$WORKDIR/tmp/etc persistentdir=$WORKDIR/tmp/var/net-snmp || exit 1 + make install prefix=$TMPDIR/usr exec_prefix=$TMPDIR/usr sysconfdir=$TMPDIR/etc persistentdir=$TMPDIR/var/net-snmp || exit 1 copy_docs $TMPDIR rm -rf $TMPDIR/usr/include || exit 1 cp -dpR $TMPDIR/usr/share $CDDIR/usr/ || exit 1 Index: ncurses =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ncurses,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ncurses 12 Dec 2004 21:48:08 -0000 1.9 +++ ncurses 13 Dec 2004 16:41:11 -0000 1.10 @@ -41,7 +41,7 @@ rm $TMPDIR/usr/lib/*.a || exit 1 rm $TMPDIR/usr/lib/terminfo || exit 1 mkdir -p $TMPDIR/lib || exit 1 - mv $TMPDIR/usr/lib/* $WORKDIR/tmp/lib || exit 1 + mv $TMPDIR/usr/lib/* $TMPDIR/lib || exit 1 chmod 755 $TMPDIR/lib/* || exit 1 cp -dpR $TMPDIR/usr/share/* $CDDIR/usr/share || exit 1 rm -rf $TMPDIR/usr/share || exit 1 Index: ntop =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ntop,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ntop 12 Dec 2004 21:48:08 -0000 1.6 +++ ntop 13 Dec 2004 16:41:11 -0000 1.7 @@ -50,7 +50,7 @@ mkdir -p $TMPDIR/usr/share/ntop || exit 1 chmod -x $TMPDIR/etc/ntop/*.gz - mv -f $TMPDIR/etc/ntop/*.gz $WORKDIR/tmp/usr/share/ntop/ || exit 1 + mv -f $TMPDIR/etc/ntop/*.gz $TMPDIR/usr/share/ntop/ || exit 1 ln -sf /usr/share/ntop/etter.passive.os.fp.gz $TMPDIR/etc/ntop/etter.passive.os.fp.gz || exit 1 ln -sf /usr/share/ntop/oui.txt.gz $TMPDIR/etc/ntop/oui.txt.gz || exit 1 ln -sf /usr/share/ntop/p2c.opt.table.gz $TMPDIR/etc/ntop/p2c.opt.table.gz || exit 1 Index: kbd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/kbd,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- kbd 12 Dec 2004 21:48:08 -0000 1.7 +++ kbd 13 Dec 2004 16:41:11 -0000 1.8 @@ -33,7 +33,7 @@ install ) rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 - make install DESTDIR=$TMPDIR DATADIR=$WORKDIR/tmp/usr/share/kbd MANDIR=$WORKDIR/tmp/usr/share/man || exit 1 + make install DESTDIR=$TMPDIR DATADIR=$TMPDIR/usr/share/kbd MANDIR=$TMPDIR/usr/share/man || exit 1 copy_docs $TMPDIR cp -dfpR $TMPDIR/* $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 Index: motion =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/motion,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- motion 12 Dec 2004 21:48:08 -0000 1.3 +++ motion 13 Dec 2004 16:41:11 -0000 1.4 @@ -38,8 +38,8 @@ else OPT_FLAGS="$OPT_FLAGS --with-pgsql=/usr/include" fi - /bin/sh configure --prefix=$TMPDIR/usr --bindir=$WORKDIR/tmp/usr/sbin \ - --sysconfdir=$TMPDIR/etc --mandir=$WORKDIR/tmp/usr/share/man $OPT_FLAGS || exit 1 + /bin/sh configure --prefix=$TMPDIR/usr --bindir=$TMPDIR/usr/sbin \ + --sysconfdir=$TMPDIR/etc --mandir=$TMPDIR/usr/share/man $OPT_FLAGS || exit 1 make $PMAKE all || exit 1 strip_debug fi Index: devfsd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/devfsd,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- devfsd 11 Jan 2004 14:43:04 -0000 1.4 +++ devfsd 13 Dec 2004 16:41:11 -0000 1.5 @@ -25,11 +25,15 @@ case $1 in build ) + # being replaced by udev + exit 0 make $PMAKE || exit 1 strip_debug ;; install ) + # being replaced by udev + exit 0 cp devfsd $CDDIR/sbin || exit 1 cp devfsd.conf $ETCDIR/etc || exit 1 cp modules.devfs $ETCDIR/etc || exit 1 Index: ppp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ppp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ppp 12 Dec 2004 21:48:08 -0000 1.18 +++ ppp 13 Dec 2004 16:41:11 -0000 1.19 @@ -48,7 +48,7 @@ rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 make install DESTDIR=$TMPDIR/usr || exit 1 - make install-etcppp ETCDIR=$TMPDIR/etc/ppp DESTDIR=$WORKDIR/tmp/usr || exit 1 + make install-etcppp ETCDIR=$TMPDIR/etc/ppp DESTDIR=$TMPDIR/usr || exit 1 rm -rf $TMPDIR/usr/include || exit 1 copy_docs $TMPDIR || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 Index: minicom =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/minicom,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- minicom 12 Dec 2004 21:48:08 -0000 1.6 +++ minicom 13 Dec 2004 16:41:11 -0000 1.7 @@ -40,7 +40,7 @@ mkdir -p $TMPDIR || exit 1 make install DESTDIR=$TMPDIR || exit 1 mkdir -p $TMPDIR/usr/share/man || exit 1 - mv $TMPDIR/usr/man/* $WORKDIR/tmp/usr/share/man/ || exit 1 + mv $TMPDIR/usr/man/* $TMPDIR/usr/share/man/ || exit 1 copy_files $TMPDIR/usr $CDDIR || exit 1 rm -rf $TMPDIR || exit 1 fi Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- build.sh 12 Dec 2004 21:48:08 -0000 1.87 +++ build.sh 13 Dec 2004 16:41:11 -0000 1.88 @@ -114,7 +114,8 @@ fi if [ "$BEFORENO" != "" ] ; then - REQ="\$($BEFORENO)" + #REQ="\$($BEFORENO)" + REQ=" | \$($BEFORENO)" else REQ="" fi @@ -128,7 +129,8 @@ echo " mkdir -p $WORKDIR/LOGS/$CMD" >> $WORKDIR/Makefile.$CMD LOG="&> $WORKDIR/LOGS/$CMD/$SCRIPT" fi - echo " ( test -f $DONEFILE || ( source $MYDIR/settings ; reset_kernel_includes ; enable_et_dyn ; cd $SOURCEDIR ; ( $NICE $MYDIR/$SCRIPT $CMD $LOG ) ) )" >> $WORKDIR/Makefile.$CMD + #echo " ( test -f $DONEFILE || ( source $MYDIR/settings ; reset_kernel_includes ; enable_et_dyn ; cd $SOURCEDIR ; ( $NICE $MYDIR/$SCRIPT $CMD $LOG ) ) )" >> $WORKDIR/Makefile.$CMD + echo " ( source $MYDIR/settings ; reset_kernel_includes ; enable_et_dyn ; cd $SOURCEDIR ; ( $NICE $MYDIR/$SCRIPT $CMD $LOG ) )" >> $WORKDIR/Makefile.$CMD echo " touch $DONEFILE" >> $WORKDIR/Makefile.$CMD echo >> $WORKDIR/Makefile.$CMD Index: binutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/binutils,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- binutils 12 Dec 2004 21:48:08 -0000 1.11 +++ binutils 13 Dec 2004 16:41:11 -0000 1.12 @@ -57,7 +57,7 @@ cd $WORKDIR/binutils-build || exit 1 rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR/usr/bin || exit 1 - make tooldir=$TMPDIR/usr prefix=$WORKDIR/tmp/usr install || exit 1 + make tooldir=$TMPDIR/usr prefix=$TMPDIR/usr install || exit 1 rm -rf $TMPDIR/usr/share || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2004-12-13 02:03:59
|
Update of /cvsroot/devil-linux/build/scripts/configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12237/scripts/configuration Modified Files: prepare.config Log Message: make doesn't like parallel builds within parallel builds ;-) Index: prepare.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/prepare.config,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- prepare.config 12 Dec 2004 21:48:09 -0000 1.16 +++ prepare.config 13 Dec 2004 02:03:50 -0000 1.17 @@ -17,8 +17,8 @@ menu_add "Build Configuration|Processor and Memory" bool "Highmem Support" CONFIG_HIGHMEM test "$CONFIG_KERNEL_CPU" = "VIAC3_2" && menu_add "Build Configuration|Processor and Memory" bool "Longhaul fix (EXPERIMENTAL)" CONFIG_LONGHAUL -test -z "$CONFIG_PMAKE" && CONFIG_PMAKE=1 -menu_add "Build Configuration" list "Parallel Compile Jobs" CONFIG_PMAKE 1 2 +#test -z "$CONFIG_PMAKE" && CONFIG_PMAKE=1 +#menu_add "Build Configuration" list "Parallel Compile Jobs" CONFIG_PMAKE 1 2 test -z "$CONFIG_PARALLEL_JOBS" && CONFIG_PARALLEL_JOBS=1 menu_add "Build Configuration" list "Parallel Jobs" CONFIG_PARALLEL_JOBS 1 2 3 4 5 6 7 8 9 10 |
|
From: Heiko Z. <smi...@us...> - 2004-12-13 02:03:58
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12237/scripts Modified Files: settings Log Message: make doesn't like parallel builds within parallel builds ;-) Index: settings =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/settings,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- settings 12 Dec 2004 21:48:09 -0000 1.44 +++ settings 13 Dec 2004 02:03:49 -0000 1.45 @@ -43,7 +43,8 @@ fi PMAKE="" -test -n "$CONFIG_PMAKE" && PMAKE="-j$CONFIG_PMAKE" +#test -n "$CONFIG_PMAKE" && PMAKE="-j$CONFIG_PMAKE" +test -n "$CONFIG_PARALLEL_JOBS" || CONFIG_PARALLEL_JOBS=1 CONF_HOST="i$CONFIG_CPU-pc-linux-gnu" |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 22:28:27
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31215 Modified Files: LPRng Log Message: removed some debugging messages Index: LPRng =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/LPRng,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- LPRng 12 Dec 2004 21:48:07 -0000 1.2 +++ LPRng 12 Dec 2004 22:28:17 -0000 1.3 @@ -25,10 +25,6 @@ MYNAME=LPRNG -echo $TMPDIR -echo $MYSCRIPT -exit 1 - case $1 in build ) if [ "$CONFIG_LPRNG" = "y" ]; then |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 21:53:00
|
Update of /cvsroot/devil-linux/build/docs/documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23486 Modified Files: documentation.xml Log Message: make sure documentation writes about new TMPDIR variable Index: documentation.xml =================================================================== RCS file: /cvsroot/devil-linux/build/docs/documentation/documentation.xml,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- documentation.xml 10 Oct 2004 19:44:04 -0000 1.66 +++ documentation.xml 12 Dec 2004 21:52:50 -0000 1.67 @@ -1221,6 +1221,11 @@ <entry>/data/build/tmp</entry> </row> <row> + <entry>TMPDIR</entry> + <entry>name of a unique temporary directory. this is thread-safe!</entry> + <entry>/data/build/tmp/tmp.somescript.2381</entry> + </row> + <row> <entry>SRCDIR</entry> <entry>location of the packed sources</entry> <entry>/data/build/src</entry> |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 21:53:00
|
Update of /cvsroot/devil-linux/build/docs/documentation/sample In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23486/sample Modified Files: ez-ipupdate Log Message: make sure documentation writes about new TMPDIR variable Index: ez-ipupdate =================================================================== RCS file: /cvsroot/devil-linux/build/docs/documentation/sample/ez-ipupdate,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ez-ipupdate 15 Apr 2004 23:58:35 -0000 1.16 +++ ez-ipupdate 12 Dec 2004 21:52:51 -0000 1.17 @@ -35,15 +35,15 @@ install ) if [ "$CONFIG_EZ_IPUPDATE" = "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_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 mkdir -p $ETCDIR/etc/ez-ipupdate || exit 1 cp -dpR example*.conf $ETCDIR/etc/ez-ipupdate || exit 1 chmod 600 $ETCDIR/etc/ez-ipupdate/* || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/ez-ipupdate $ETCDIR/etc/init.d || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 21:48:47
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22571 Modified Files: CHANGES replace 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: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.871 retrieving revision 1.872 diff -u -d -r1.871 -r1.872 --- CHANGES 4 Dec 2004 23:23:39 -0000 1.871 +++ CHANGES 12 Dec 2004 21:48:07 -0000 1.872 @@ -22,6 +22,8 @@ # 1.3.2 +- build system: allow parallel execution of build scripts to speed up compile +- build system: made all install scripts thread safe - higher vesa display resolutions now work - updated ppp to v2.4.3 - don't load IPv6 per default Index: replace =================================================================== RCS file: /cvsroot/devil-linux/build/replace,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- replace 11 Jan 2004 14:43:04 -0000 1.2 +++ replace 12 Dec 2004 21:48:07 -0000 1.3 @@ -1,18 +1,18 @@ #!/bin/bash -SEARCH="source \$MYDIR/functions" -REPLACE="\$DOCDIR" +SEARCH="\$WORKDIR/tmp" +REPLACE="\$TMPDIR" -#echo "press any key to replace '$SEARCH' with '$REPLACE'" -echo "press any key to remove all lines with '$SEARCH'" +echo "press any key to replace '$SEARCH' with '$REPLACE'" +#echo "press any key to remove all lines with '$SEARCH'" read -n 1 -rs ANS for FILE in $(grep -l "$SEARCH" scripts/*) do echo $FILE cp $FILE $FILE.old - #sed -e s%"$SEARCH"%"$REPLACE"% $FILE.old > $FILE - grep -v "$SEARCH" $FILE.old > $FILE + sed -e s%"$SEARCH"%"$REPLACE"% $FILE.old > $FILE + #grep -v "$SEARCH" $FILE.old > $FILE rm $FILE.old done |
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] |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 21:48:22
|
Update of /cvsroot/devil-linux/build/scripts/configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22571/scripts/configuration Modified Files: prepare.config 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: prepare.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/prepare.config,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- prepare.config 23 Sep 2004 21:50:02 -0000 1.15 +++ prepare.config 12 Dec 2004 21:48:09 -0000 1.16 @@ -18,7 +18,10 @@ test "$CONFIG_KERNEL_CPU" = "VIAC3_2" && menu_add "Build Configuration|Processor and Memory" bool "Longhaul fix (EXPERIMENTAL)" CONFIG_LONGHAUL test -z "$CONFIG_PMAKE" && CONFIG_PMAKE=1 -menu_add "Build Configuration" list "Parallel Build Jobs" CONFIG_PMAKE 1 2 3 4 5 6 7 8 9 10 +menu_add "Build Configuration" list "Parallel Compile Jobs" CONFIG_PMAKE 1 2 + +test -z "$CONFIG_PARALLEL_JOBS" && CONFIG_PARALLEL_JOBS=1 +menu_add "Build Configuration" list "Parallel Jobs" CONFIG_PARALLEL_JOBS 1 2 3 4 5 6 7 8 9 10 test -z "$CONFIG_NICE" && CONFIG_NICE=y menu_add "Build Configuration" bool "Run build with nice" CONFIG_NICE |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 05:39:22
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18696/scripts Modified Files: build.sh Log Message: all is a PHONY target Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- build.sh 12 Dec 2004 05:04:01 -0000 1.85 +++ build.sh 12 Dec 2004 05:39:11 -0000 1.86 @@ -134,6 +134,7 @@ if [ "$THISGROUP" != "" ] ; then echo "$THISNO =$THISGROUP" >> $WORKDIR/Makefile.inc1.$CMD fi + echo ".PHONY: all " >> $WORKDIR/Makefile.inc2.$CMD echo "all : $ALLGROUPS" >> $WORKDIR/Makefile.inc2.$CMD make -j 3 -C $WORKDIR -f Makefile.$CMD || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 05:24:35
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16931 Modified Files: functions Log Message: we can't use this when we run in parallel Index: functions =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/functions,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- functions 12 Dec 2004 04:54:32 -0000 1.59 +++ functions 12 Dec 2004 05:24:25 -0000 1.60 @@ -419,6 +419,7 @@ } function reset_kernel_includes () { + test "$CONFIG_LINUX_VERSION" = "2.6" && return 0 rm /usr/include/{linux,asm,asm-generic} ln -nsf $KERNELDIR/include/linux /usr/include/linux || exit 1 ln -nsf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 05:18:45
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16205 Modified Files: md5sum.lst Log Message: updated pci and usb id db Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.153 retrieving revision 1.154 diff -u -d -r1.153 -r1.154 --- md5sum.lst 28 Nov 2004 18:09:11 -0000 1.153 +++ md5sum.lst 12 Dec 2004 05:18:25 -0000 1.154 @@ -287,7 +287,7 @@ 097cf193d1b040cf0d135945714faa83 src/passwdgen-2.2.tar.gz f348557068a0109596c09c5aa9bf98dc src/patch-o-matic-ng-20041019.tar.bz2 d85064bb89183288e56ede3d2c311e56 src/pax-linux-2.6.6-200405182000.patch.bz2 -8df9924da7a90fc89ca9efd1df14a8c8 src/pci.ids.bz2 +6357c6487f17f5094980ee2d804644ef src/pci.ids.bz2 1d40f90aaae69594790bdb8ff90b4a41 src/pciutils-2.1.11.tar.gz 0d6d65be8896eff081aee996049afaa5 src/pcmcia-cs-3.2.8.tar.gz c51bd34197008b128046f0799d2242e4 src/pcre-4.5.tar.bz2 @@ -378,7 +378,7 @@ 7a481dc017f1fbfa7f937a97e66eb99f src/unarj_2.43.orig.tar.gz 1afca3128e21994042f34bcb91b4ea48 src/unrarsrc-3.2.3.tar.gz 8a25712aac642430d87d21491f7c6bd1 src/unzip551.tar.gz -99b9c46bc8f1577f8ea8516f531e9dc4 src/usb.ids.bz2 +ff9002fdc1b99a9c4d1ebc52605297f0 src/usb.ids.bz2 05157bed61af65749f02713c10b8ef26 src/usbutils-0.11.tar.gz e59e1e20e78d8d50ba26c43e1d887a19 src/util-linux-2.12i.tar.bz2 821fda8f14d674346b87e3ef9cb96389 src/vim-6.3.tar.bz2 |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 05:04:09
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14348/scripts Modified Files: build.sh Log Message: added support for log files Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- build.sh 12 Dec 2004 04:54:31 -0000 1.84 +++ build.sh 12 Dec 2004 05:04:01 -0000 1.85 @@ -119,7 +119,13 @@ SOURCEDIR=$(find_src_dir $SCRIPT) echo "$DONEFILE: $REQ" >> $WORKDIR/Makefile.$CMD - echo " ( test -f $DONEFILE || ( source $MYDIR/settings ; reset_kernel_includes ; enable_et_dyn ; cd $SOURCEDIR ; $MYDIR/$SCRIPT $CMD ) )" >> $WORKDIR/Makefile.$CMD + if [ "$CONFIG_DISABLELOGGING" = "y" ]; then + LOG="" + else + echo " mkdir -p $WORKDIR/LOGS/$CMD" >> $WORKDIR/Makefile.$CMD + LOG="&> $WORKDIR/LOGS/$CMD/$SCRIPT" + fi + echo " ( test -f $DONEFILE || ( source $MYDIR/settings ; reset_kernel_includes ; enable_et_dyn ; cd $SOURCEDIR ; ( $NICE $MYDIR/$SCRIPT $CMD $LOG ) ) )" >> $WORKDIR/Makefile.$CMD echo " touch $DONEFILE" >> $WORKDIR/Makefile.$CMD echo >> $WORKDIR/Makefile.$CMD |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 04:55:10
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12781/scripts Modified Files: build.sh functions settings Log Message: initial version of support for parallel execution of build scripts Index: functions =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/functions,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- functions 10 Sep 2004 23:16:24 -0000 1.58 +++ functions 12 Dec 2004 04:54:32 -0000 1.59 @@ -419,8 +419,7 @@ } function reset_kernel_includes () { - test "$CONFIG_LINUX_VERSION" = "2.6" && return 0 - rm /usr/include/{linux,asm,asm-generic} || exit 1 + rm /usr/include/{linux,asm,asm-generic} ln -nsf $KERNELDIR/include/linux /usr/include/linux || exit 1 ln -nsf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1 ln -nsf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1 Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- build.sh 6 Sep 2004 14:13:04 -0000 1.83 +++ build.sh 12 Dec 2004 04:54:31 -0000 1.84 @@ -38,6 +38,102 @@ test -n "$RUN_ONLY_CMD" && shift case $CMD in + makefile) + CMD="build" + # set the correct "runlevel" + if [ "$CMD" = "build" ]; then + LEVEL=1 + elif [ "$CMD" = "install" ]; then + LEVEL=2 + elif [ "$CMD" = "iso" ]; then + LEVEL=3 + else + echo "Someone messed up this script :(" + exit 1 + fi + + # fake uname to display another platform we want to compile the kernel for + # also make sure our kernel version is displayed + if [ -n "$KERNELVERSION" ]; then + test -f /bin/uname.old || cp /bin/uname /bin/uname.old || exit 1 + rm /bin/uname || exit 1 + REALKERNEL=$(/bin/uname.old -r) + echo "/bin/uname.old \$* | sed -e 's/i.86/i$CONFIG_CPU/' | sed -e 's/x86_64/i$CONFIG_CPU/' | sed -e 's/$REALKERNEL/$KERNELVERSION/'" > /bin/uname || exit 1 + chmod +x /bin/uname || exit 1 + test -f /bin/arch.old || cp /bin/arch /bin/arch.old || exit 1 + echo "/bin/uname -m" > /bin/arch || exit 1 + fi + + LASTNO="" + THISGROUP="" + ALLGROUPS="" + BEFORENO="" + + rm $WORKDIR/Makefile.$CMD &> /dev/null + rm $WORKDIR/Makefile.inc*.$CMD &> /dev/null + + echo "include Makefile.inc1.$CMD" >> $WORKDIR/Makefile.$CMD + echo "include Makefile.inc2.$CMD" >> $WORKDIR/Makefile.$CMD + echo >> $WORKDIR/Makefile.$CMD + + for LINK in $( ls -v $DL_DIR/scripts/.buildorder/rc$LEVEL.d/S* 2> /dev/null) + do + + LINK=${LINK##/*/} + SCRIPT=${LINK#S[0-9][0-9]} + THISNO=${LINK:0:3} + + if [ "$THISNO" != "$LASTNO" ]; then + if [ "$THISGROUP" != "" ] ; then + echo "$LASTNO =$THISGROUP" >> $WORKDIR/Makefile.inc1.$CMD + fi + THISGROUP="" + if [ "$LASTNO" != "" ] ; then + ALLGROUPS="$ALLGROUPS \$($LASTNO)" + fi + fi + + DONEFILE="${DONE}_${CMD}_${SCRIPT}" + DONEFILE="${DONEFILE##/*/}" + + THISGROUP="$THISGROUP $DONEFILE" + + if [ ! -f "$MYDIR/$SCRIPT" ]; then + echo "ERROR" + echo "$MYDIR/$SCRIPT not found" + echo "(LINK=${LINK} - SCRIPT=${SCRIPT}" + errorbeep + exit 1 + fi + + if [ "$THISNO" != "$LASTNO" ]; then + BEFORENO=$LASTNO + fi + + if [ "$BEFORENO" != "" ] ; then + REQ="\$($BEFORENO)" + else + REQ="" + fi + + SOURCEDIR=$(find_src_dir $SCRIPT) + + echo "$DONEFILE: $REQ" >> $WORKDIR/Makefile.$CMD + echo " ( test -f $DONEFILE || ( source $MYDIR/settings ; reset_kernel_includes ; enable_et_dyn ; cd $SOURCEDIR ; $MYDIR/$SCRIPT $CMD ) )" >> $WORKDIR/Makefile.$CMD + echo " touch $DONEFILE" >> $WORKDIR/Makefile.$CMD + echo >> $WORKDIR/Makefile.$CMD + + LASTNO=$THISNO + done + if [ "$THISGROUP" != "" ] ; then + echo "$THISNO =$THISGROUP" >> $WORKDIR/Makefile.inc1.$CMD + fi + echo "all : $ALLGROUPS" >> $WORKDIR/Makefile.inc2.$CMD + + make -j 3 -C $WORKDIR -f Makefile.$CMD || exit 1 + + ;; + dist ) if [ ! -f $WORKDIR/bootcd.iso ]; then echo "You should create the ISO Image first!" Index: settings =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/settings,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- settings 22 Sep 2004 14:46:03 -0000 1.42 +++ settings 12 Dec 2004 04:54:32 -0000 1.43 @@ -7,7 +7,7 @@ if [ -z $DL_DIR ] ; then echo "you must define DL_DIR" - exit + exit 1 fi source $DL_DIR/scripts/functions |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 04:54:48
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12781 Modified Files: Makefile Log Message: initial version of support for parallel execution of build scripts Index: Makefile =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 30 Dec 2003 00:41:13 -0000 1.9 +++ Makefile 12 Dec 2004 04:54:30 -0000 1.10 @@ -53,4 +53,8 @@ unpack: @$(BUILD) $@ + +makefile: + @$(BUILD) $@ + # DO NOT DELETE |
|
From: Heiko Z. <smi...@us...> - 2004-12-12 01:06:43
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10050 Modified Files: Tag: rel-1-2-patches md5sum.lst Log Message: updated pci and usb id dbs Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.102.2.37 retrieving revision 1.102.2.38 diff -u -d -r1.102.2.37 -r1.102.2.38 --- md5sum.lst 4 Dec 2004 05:12:40 -0000 1.102.2.37 +++ md5sum.lst 12 Dec 2004 01:06:33 -0000 1.102.2.38 @@ -266,7 +266,7 @@ 2ad89f842d1560b55c35b8290724b82d src/patch-o-matic-ng-20040823.tar.bz2 38a43b5a59d06f39f014262b69583ad8 src/pax-linux-2.4.26-200406252135.patch.bz2 d85064bb89183288e56ede3d2c311e56 src/pax-linux-2.6.6-200405182000.patch.bz2 -8df9924da7a90fc89ca9efd1df14a8c8 src/pci.ids.bz2 +6357c6487f17f5094980ee2d804644ef src/pci.ids.bz2 1d40f90aaae69594790bdb8ff90b4a41 src/pciutils-2.1.11.tar.gz 0d6d65be8896eff081aee996049afaa5 src/pcmcia-cs-3.2.8.tar.gz c51bd34197008b128046f0799d2242e4 src/pcre-4.5.tar.bz2 @@ -358,7 +358,7 @@ 7a481dc017f1fbfa7f937a97e66eb99f src/unarj_2.43.orig.tar.gz 1afca3128e21994042f34bcb91b4ea48 src/unrarsrc-3.2.3.tar.gz 8a25712aac642430d87d21491f7c6bd1 src/unzip551.tar.gz -99b9c46bc8f1577f8ea8516f531e9dc4 src/usb.ids.bz2 +ff9002fdc1b99a9c4d1ebc52605297f0 src/usb.ids.bz2 2e8d4e13ea386592109ad3f5eb7e481f src/usbat-02.20031116.tar.gz f6ceb3328c80e8e83349c458a0331991 src/usbat02-kernel-Makefile.diff.bz2 d4b0f3015d69bbba493f8faadb7b9bf6 src/usbat02-kernel-config.diff.bz2 |
2 messages has been excluded from this view by a project administrator.
