[IPCop-cvs] ipcop make.sh,1.129.2.108,1.129.2.109

[Franck B. <fra...@us...>]

Update of /cvsroot/ipcop/ipcop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5613

Modified Files:
      Tag: IPCOP_v1_4_0
	make.sh 
Log Message:
Package the 1.4.6=>1.4.7 patch in four smaller patches
Bug: updates.cgi need to reload $general::version variable while running...
Tested ok on a fresh 1.4.6 (without gpg signing)
Add http link in information using page wiki sid=22 on ipcop.org
Old files no more needed (information,ROOTFILES,setup)


Index: make.sh
===================================================================
RCS file: /cvsroot/ipcop/ipcop/make.sh,v
retrieving revision 1.129.2.108
retrieving revision 1.129.2.109
diff -C2 -d -r1.129.2.108 -r1.129.2.109
*** make.sh	28 Jul 2005 07:01:09 -0000	1.129.2.108
--- make.sh	30 Jul 2005 00:48:20 -0000	1.129.2.109
***************
*** 826,835 ****
  
    # Create update for this version
    echo "`date -u '+%b %e %T'`: Building update $VERSION tgz" | tee -a $LOGFILE
!   tar -cz -C $BASEDIR/build --files-from=$BASEDIR/updates/$VERSION/ROOTFILES.$MACHINE-$VERSION -f $BASEDIR/updates/$VERSION/patch.tar.gz --exclude='#*'; 
!   chmod 755 $BASEDIR/updates/$VERSION/setup
!   tar -cz -C $BASEDIR/updates/$VERSION -f $LFS/install/images/update-$VERSION.tgz patch.tar.gz setup information
!   rm -f $LFS/var/run/{need-depmod-$KVER,need-depmod-$KVER-smp}
  
    # Generating list of packages used
    echo "`date -u '+%b %e %T'`: Generating packages list from logs" | tee -a $LOGFILE
--- 826,851 ----
  
    # Create update for this version
+   # Update can be spread on 10 smaller 'patch' is composed from the four files 
+   # ROOTFILES.alpha-1.4.7-x
+   # ROOTFILES.i386-1.4.7-x
+   # information-x
+   # setup-x               where x is 0..9  ROOTFILE* can be empty if the patch do only action
    echo "`date -u '+%b %e %T'`: Building update $VERSION tgz" | tee -a $LOGFILE
!   rm -f $LFS/install/images/update-$VERSION*.tgz
!   for i in `seq 0 9`; do
!     if [ -f $BASEDIR/updates/$VERSION/setup-$i ]; then
! 	touch $BASEDIR/updates/$VERSION/ROOTFILES.$MACHINE-$VERSION-$i  #patch may action only, no files to replace
! 	tar -cz -C $BASEDIR/build --files-from=$BASEDIR/updates/$VERSION/ROOTFILES.$MACHINE-$VERSION-$i -f $BASEDIR/updates/$VERSION/patch.tar.gz --exclude='#*';
! 	cp -f $BASEDIR/updates/$VERSION/setup-$i $BASEDIR/updates/$VERSION/setup #installpackage use allways basic filenames!
! 	cp -f $BASEDIR/updates/$VERSION/information-$i $BASEDIR/updates/$VERSION/information
! 	chmod 755 $BASEDIR/updates/$VERSION/setup
! 	tar -cz -C $BASEDIR/updates/$VERSION -f $LFS/install/images/update-$VERSION-$i.tgz patch.tar.gz setup information
! 	rm $BASEDIR/updates/$VERSION/patch.tar.gz
!         rm $BASEDIR/updates/$VERSION/setup
!         rm $BASEDIR/updates/$VERSION/information
!     fi
!   done
  
+   rm -f $LFS/var/run/{need-depmod-$KVER,need-depmod-$KVER-smp}
    # Generating list of packages used
    echo "`date -u '+%b %e %T'`: Generating packages list from logs" | tee -a $LOGFILE
***************
*** 840,849 ****
  	fi
    done
-   mv $BASEDIR/doc/packages-list $BASEDIR/doc/packages-list.old
-   grep -v '^configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipcop$\|^setup$\|^stage2$\|smp$\|tools$\|tools1$\|tools2$' \
- 	$BASEDIR/doc/packages-list.old | sort > $BASEDIR/doc/packages-list
    echo "!!! List of softwares used to build $NAME Version:$VERSION" > $BASEDIR/doc/packages-list.txt
!   cat $BASEDIR/doc/packages-list >> $BASEDIR/doc/packages-list.txt
!   rm -f $BASEDIR/doc/packages-list $BASEDIR/doc/packages-list.old
    # packages-list.txt is ready to be displayed for wiki page IPCopSoftwares
  
--- 856,863 ----
  	fi
    done
    echo "!!! List of softwares used to build $NAME Version:$VERSION" > $BASEDIR/doc/packages-list.txt
!   grep -v '^configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipcop$\|^setup$\|^stage2$\|smp$\|tools$\|tools1$\|tools2$' \
! 	$BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt
!   rm -f $BASEDIR/doc/packages-list
    # packages-list.txt is ready to be displayed for wiki page IPCopSoftwares