Menu
▾
▴
[Devil-linux-commit] build/scripts expat,1.3,1.3.2.1 heartbeat,1.3.2.1,1.3.2.2 perl,1.29.2.3,1.29.2.4 sysvinit,1.10,1.10.2.1
|
From: Heiko Z. <smi...@us...> - 2005-10-19 02:08:37
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9028/scripts Modified Files: Tag: rel-1-2-patches expat heartbeat perl sysvinit Log Message: - updated automake to 1.9.6 - updated dhcp to 3.0.3 - updated expat to 1.95.8 - updated heartbeat to 2.0.2 - updated mdadm to 2.1 - updated perl to 5.8.7 - updated samba to 3.0.20b - updated snort to 2.4.3 - updated sysvinit to 2.86 - updated tftp-hpa to 0.41 - updated yp-tools to 2.9 Index: sysvinit =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sysvinit,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -d -r1.10 -r1.10.2.1 --- sysvinit 11 Jan 2004 14:43:05 -0000 1.10 +++ sysvinit 19 Oct 2005 02:08:28 -0000 1.10.2.1 @@ -37,10 +37,10 @@ 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 || 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 -f $WORKDIR/tmp/usr/include || 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 Index: heartbeat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/heartbeat,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -d -r1.3.2.1 -r1.3.2.2 --- heartbeat 16 Jun 2004 02:29:42 -0000 1.3.2.1 +++ heartbeat 19 Oct 2005 02:08:28 -0000 1.3.2.2 @@ -29,6 +29,7 @@ build ) if [ "$CONFIG_HEARTBEAT" = "y" ]; then ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --disable-nls || exit 1 + make $PMAKE all || exit 1 strip_debug fi @@ -45,13 +46,12 @@ rm -rf $WORKDIR/tmp/usr/include || exit 1 find $WORKDIR/tmp/usr/lib/ -name \*a | xargs rm || exit 1 copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 + copy_files $WORKDIR/tmp/var $CDDIR/ || exit 1 copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 useradd -s /bin/false -u 50 hacluster || exit 1 groupadd -g 50 haclient || exit 1 - mkdir -p $CDDIR/var/lib/heartbeat || exit 1 - rm -rf $WORKDIR/tmp || exit 1 cp -dp $MYDIR/scripts/heartbeat $ETCDIR/etc/init.d/ || exit 1 Index: expat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/expat,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- expat 11 Jan 2004 14:43:04 -0000 1.3 +++ expat 19 Oct 2005 02:08:28 -0000 1.3.2.1 @@ -25,7 +25,6 @@ case $1 in build ) - ./buildconf.sh || exit 1 ./configure --prefix=/usr --localstatedir=/var || exit 1 make $PMAKE all || exit 1 strip_debug Index: perl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/perl,v retrieving revision 1.29.2.3 retrieving revision 1.29.2.4 diff -u -d -r1.29.2.3 -r1.29.2.4 --- perl 17 Feb 2005 02:52:18 -0000 1.29.2.3 +++ perl 19 Oct 2005 02:08:28 -0000 1.29.2.4 @@ -31,27 +31,19 @@ echo >> ./hints/linux.sh echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh - ./Configure -Dprefix=/usr -Dinstallprefix=$WORKDIR/tmp -Dusedl -d -e || exit 1 + ./Configure -Dprefix=/usr -Dusedl -Dusethreads -d -e || exit 1 # parallel build fails - do not user $PMAKE make || exit 1 #make test || exit 1 #strip_debug - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || 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 - # 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 + rm -rf /usr/lib/perl5 - # now let's take care of all the perl extension + make install || exit 1 + + # now let's take care of all the perl extensions rm -rf $WORKDIR/perl-ext mkdir -p $WORKDIR/perl-ext || exit 1 cd $WORKDIR/perl-ext || exit 1 @@ -68,7 +60,7 @@ for EXT in $(cat $MYDIR/config/perl-ext) do - pushd $DL_DIR/tmp/perl-*/$EXT* + pushd $WORKDIR/perl-ext/$EXT* echo "******** compiling perl extension $EXT ********" yes "" | perl Makefile.PL PREFIX=/usr || exit 1 strip_debug @@ -82,25 +74,23 @@ install ) if [ "$CONFIG_PERL" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp|| 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 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR|| exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm $TMPDIR/usr/bin/perl || exit 1 # check here if install fails, you probably upgraded to a new perl release - PERLBIN=perl5.8.4 - if [ ! -e $WORKDIR/tmp/bin/$PERLBIN ]; then + PERLBIN=perl5.8.7 + 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 $WORKDIR/tmp/bin/perl || exit 1 + ln -sf $PERLBIN $TMPDIR/usr/bin/perl || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/usr/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 # now let's take care of all the perl extension cd $WORKDIR/perl-ext || exit 1 |
