* svn dist ueberarbeitet.
  * svn dist und svn update koennen nun mit einer Revisionsangabe umgehen.
  * svn ad packt alle Sources in ein Archiv mit Changelog und svn_status
  * packages_list fuer Mediawiki umgemodelt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@290 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
delaco
2006-09-21 18:48:19 +00:00
parent c98e55d8f8
commit 7471f6ab0f
2 changed files with 287 additions and 277 deletions

View File

@@ -1,4 +1,4 @@
====== List of softwares used to build IPFire Version: 2.0 ======
== List of softwares used to build IPFire Version: 2.0 ==
* 3c5x9setup-1.00
* 3cp4218-2003-10-22
* Archive-Tar-1.29
@@ -102,7 +102,6 @@
* grep-2.5.1
* groff-1.19
* grub-0.97
* grub-0.97_old
* gzip-1.3.5
* hddtemp-0.3-beta14
* hdparm-6.3
@@ -114,10 +113,6 @@
* inetutils-1.4.2
* ipac-ng-1.31
* ipaddr-1.2
* ipfire-logs-2006-09-19-07:50.tgz
* ipfire-logs-2006-09-19-16:45.tgz
* ipfire-logs-2006-09-19-17:08.tgz
* ipfire-logs-2006-09-19-19:48.tgz
* iproute2-2.4.7-now-ss010824
* iptables-1.3.5
* iptraf-3.0.0

51
make.sh
View File

@@ -843,8 +843,8 @@ buildpackages() {
echo "* `basename $i`" >>$BASEDIR/doc/packages-list
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$\|ipfire$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|^ipfire-logs' \
echo "== List of softwares used to build $NAME Version: $VERSION ==" > $BASEDIR/doc/packages-list.txt
grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipfire$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$' \
$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
@@ -1181,7 +1181,11 @@ svn)
update|up)
# clear
echo "Loading the latest source files..."
if [ $3 ]; then
svn update -r $3 | tee -a $PWD/log/_build.svn.update.log
else
svn update | tee -a $PWD/log/_build.svn.update.log
fi
if [ $? -eq 0 ]; then
echo "Finished!"
else
@@ -1216,32 +1220,49 @@ svn)
$0 svn up
;;
dist)
#$0 svn up
echo -ne "Download source package from svn..."
if [ $3 ]; then
SVN_REVISION=$3
fi
if [ -f ipfire-source-r$SVN_REVISION.tar.gz ]; then
echo -ne "REV $SVN_REVISION: SKIPPED!\n"
exit 0
fi
echo -en "REV $SVN_REVISION: Downloading..."
svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force > /dev/null
svn log http://svn.ipfire.eu/svn/ipfire -r 1:$SVN_REVISION > ipfire-source/Changelog
svn info http://svn.ipfire.eu/svn/ipfire -r $SVN_REVISION > ipfire-source/svn_status
if [ "$?" -eq "0" ]; then
echo ".Done!"
echo -en "\r"
else
echo ".Fail!"
echo -en "\n"
exit 1
fi
echo -n "Compress files..."
echo -en "REV $SVN_REVISION: Compressing files..."
if [ -e ipfire-source/trunk/make.sh ]; then
chmod 755 ipfire-source/trunk/make.sh
fi
tar cfz ipfire-source-r$SVN_REVISION.tar.gz ipfire-source
if [ "$?" -eq "0" ]; then
echo ".Done!"
echo -ne "\r"
else
echo ".Fail!"
echo -ne "\n"
exit 1
fi
echo -n "Cleanup..."
echo -en "REV $SVN_REVISION: Cleaning up..."
rm ipfire-source/ -r
if [ "$?" -eq "0" ]; then
echo ".Done!"
echo -ne "\rREV $SVN_REVISION: ##### FINISHED! #####\n"
else
echo ".Fail!"
echo -ne "\n"
exit 1
fi
;;
alldist|ad)
echo -e "### THIS WILL TAKE A LONG TIME!\nDOING A FETCH FROM REV 1 TO REV $SVN_REVISION!\n"
for i in `seq 1 $SVN_REVISION`; do
$0 svn dist $i
done
;;
diff|di)
echo -ne "Make a local diff to last svn revision..."
svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff
@@ -1359,12 +1380,6 @@ sync)
fi
fi
done
# for i in `cat ftplist`; do
# ls -w1 cache/ | grep $i
# if [ "$?" -eq "1" ]; then
# echo $i | grep -v toolchain >> doc/packages-to-remove-from-ftp
# fi
# done
rm -f ftplist
;;
upload)