X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=777ea6f074361b7d5a2f5c5a33a1445b70866bcb;hb=a6931e7e37047c6202c032479b3c7e01b7c7466e;hp=2487b94abca78f60bf20a5cf5b0bb851b3bc6786;hpb=7d3af7f772cc9ef6b5a83a3c0856567b935f051e;p=ipfire-2.x.git diff --git a/make.sh b/make.sh index 2487b94abc..777ea6f074 100755 --- a/make.sh +++ b/make.sh @@ -17,23 +17,23 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2006 IPFire-Team . # +# Copyright (C) 2007 IPFire-Team . # # # ############################################################################ # -NAME="IPFire" # Software name -SNAME="ipfire" # Short name -VERSION="2.0t4" # Version number -SLOGAN="www.ipfire.org" # Software slogan -CONFIG_ROOT=/var/ipfire # Configuration rootdir -NICE=10 # Nice level -MAX_RETRIES=1 # prefetch/check loop +NAME="IPFire" # Software name +SNAME="ipfire" # Short name +VERSION="2.0t5" # Version number +SLOGAN="www.ipfire.org" # Software slogan +CONFIG_ROOT=/var/ipfire # Configuration rootdir +NICE=10 # Nice level +MAX_RETRIES=1 # prefetch/check loop KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` SVN_REVISION=`svn info | grep Revision | cut -c 11-` -IPFVER="full" # Which versions should be compiled? (full|light|devel) +IPFVER="full" # Which versions should be compiled? (full|devel) # Set an information about the build number if [ -e ./.svn ]; then @@ -82,11 +82,11 @@ prepareenv() { # # ############################################################################ if [ ! "$BASH" ]; then - exiterror "BASH environment variable is not set. You're probably running the wrong shell." + exiterror "BASH environment variable is not set. You're probably running the wrong shell." fi if [ -z "${BASH_VERSION}" ]; then - exiterror "Not running BASH shell." + exiterror "Not running BASH shell." fi @@ -106,10 +106,10 @@ prepareenv() { echo -ne "Resetting our nice level to $NICE" | tee -a $LOGFILE renice $NICE $$ > /dev/null if [ `nice` != "$NICE" ]; then - beautify message FAIL - exiterror "Failed to set correct nice level" + beautify message FAIL + exiterror "Failed to set correct nice level" else - beautify message DONE + beautify message DONE fi @@ -120,10 +120,10 @@ prepareenv() { ############################################################################ echo -ne "Checking if we're running as root user" | tee -a $LOGFILE if [ `id -u` != 0 ]; then - beautify message FAIL - exiterror "Not building as root" + beautify message FAIL + exiterror "Not building as root" else - beautify message DONE + beautify message DONE fi @@ -136,13 +136,13 @@ prepareenv() { BASE_DEV=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $1 }'` BASE_ASPACE=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $4 }'` if (( 2048000 > $BASE_ASPACE )); then - BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'` - if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then - beautify message FAIL - exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV" - fi + BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'` + if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then + beautify message FAIL + exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV" + fi else - beautify message DONE + beautify message DONE fi ############################################################################ @@ -161,10 +161,10 @@ prepareenv() { rm -f /tools fi if [ ! -a /tools ]; then - ln -s $BASEDIR/build/tools / + ln -s $BASEDIR/build/tools / fi if [ ! -h /tools ]; then - exiterror "Could not create /tools symbolic link." + exiterror "Could not create /tools symbolic link." fi # Setup environment @@ -333,10 +333,9 @@ buildipfire() { ipfiremake fcdslsl SMP=1 ipfiremake fcdslusb SMP=1 ipfiremake fcdslslusb SMP=1 -# ipfiremake promise-sata-300-tx SMP=1 + ipfiremake r8169 SMP=1 ipfiremake zaptel SMP=1 ipfiremake fuse SMP=1 - #ipfiremake linux XEN=1 ipfiremake linux ipfiremake ipp2p ipfiremake fcdsl @@ -344,7 +343,7 @@ buildipfire() { ipfiremake fcdslsl ipfiremake fcdslusb ipfiremake fcdslslusb -# ipfiremake promise-sata-300-tx + ipfiremake r8169 ipfiremake zaptel ipfiremake fuse ipfiremake pkg-config @@ -357,6 +356,7 @@ buildipfire() { ipfiremake gmp ipfiremake pam ipfiremake openssl + ipfiremake curl ipfiremake python ipfiremake libnet ipfiremake libjpeg @@ -371,6 +371,7 @@ buildipfire() { ipfiremake newt ipfiremake libcap ipfiremake pciutils + ipfiremake usbutils ipfiremake libxml2 ipfiremake libxslt ipfiremake BerkeleyDB @@ -387,14 +388,14 @@ buildipfire() { ipfiremake cdrtools ipfiremake dnsmasq ipfiremake dosfstools - ipfiremake reiserfsprogs ipfiremake squashfstools + ipfiremake reiserfsprogs ipfiremake sysfsutils ipfiremake ntfs-3g ipfiremake ethtool ipfiremake ez-ipupdate ipfiremake fcron - ipfiremake GD + ipfiremake perl-GD ipfiremake GD-Graph ipfiremake GD-TextUtil ipfiremake gnupg @@ -412,8 +413,8 @@ buildipfire() { ipfiremake iptstate ipfiremake iputils ipfiremake l7-protocols - ipfiremake isdn4k-utils ipfiremake mISDN + ipfiremake isdn4k-utils ipfiremake hwdata ipfiremake kudzu ipfiremake logrotate @@ -445,6 +446,8 @@ buildipfire() { ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country ipfiremake XML-Parser + ipfiremake MP3-Info + ipfiremake MP3-Tag ipfiremake glib ipfiremake GeoIP ipfiremake fwhits @@ -468,7 +471,6 @@ buildipfire() { ipfiremake vlan ipfiremake wireless ipfiremake libsafe - ipfiremake 3c5x9setup ipfiremake pakfire ipfiremake java ipfiremake spandsp @@ -494,21 +496,31 @@ buildipfire() { ipfiremake clamav ipfiremake spamassassin ipfiremake amavisd - ipfiremake stund - ipfiremake libpri -# ipfiremake bristuff - ipfiremake asterisk + ipfiremake alsa ipfiremake mpg123 + ipfiremake mpfire + ipfiremake guardian ipfiremake libmad ipfiremake libogg ipfiremake libvorbis ipfiremake lame ipfiremake sox + ipfiremake libshout + ipfiremake icecast + ipfiremake ices + ipfiremake mp3blaster + ipfiremake libpri + ipfiremake stund + ipfiremake asterisk + ipfiremake backup ipfiremake gnump3d - ipfiremake ctorrent + ipfiremake libsigc++ ipfiremake applejuice ipfiremake ocaml ipfiremake mldonkey + ipfiremake libtorrent + ipfiremake rtorrent + ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper ipfiremake portmap @@ -525,8 +537,8 @@ buildipfire() { ipfiremake tripwire ipfiremake sysstat ipfiremake vsftpd - ipfiremake alsa - ipfiremake mp3blaster + ipfiremake which + ipfiremake lsof } buildinstaller() { @@ -553,7 +565,6 @@ buildinstaller() { installmake popt installmake sysvinit installmake misc-progs - installmake e2fsprogs installmake libaal installmake reiser4progs installmake reiserfsprogs @@ -627,31 +638,9 @@ buildpackages() { } ipfirepackages() { - ipfiredist alsa -# ipfiredist amavisd -# ipfiredist applejuice -# ipfiredist asterisk - ipfiredist clamav - ipfiredist cups - ipfiredist cyrus-sasl -# ipfiredist fetchmail -# ipfiredist gnump3d -# ipfiredist java - ipfiredist libogg - ipfiredist libvorbis -# ipfiredist mailx -# ipfiredist mldonkey - ipfiredist mp3blaster - ipfiredist mpg123 -# ipfiredist nfs - ipfiredist openldap -# ipfiredist postfix - ipfiredist samba -# ipfiredist sox -# ipfiredist spamassassin - ipfiredist tripwire - ipfiredist vsftpd -# ipfiredist webcyradm + for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do + [ -e $BASEDIR/lfs/$i ] && ipfiredist $i + done test -d $BASEDIR/packages || mkdir $BASEDIR/packages mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1 rm -rf $BASEDIR/build/install/packages/* @@ -954,45 +943,41 @@ uploadsrc) exit 0 ;; upload) - case "$2" in - iso) - echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION." - cat < .ftp-commands + FTP_ISO_PORT=`echo "$FTP_ISO_URL" | awk -F: '{ print $2 }'` + FTP_ISO_URL=`echo "$FTP_ISO_URL" | awk -F: '{ print $1 }'` + if [ -z $FTP_ISO_PORT ]; then + FTP_ISO_PORT=21 + fi + cat < .ftp-commands mkdir -p $FTP_ISO_PATH$SVN_REVISION -ls -lah +mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks quit EOF - ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands - rm -f .ftp-commands + ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL < .ftp-commands + rm -f .ftp-commands + + case "$2" in + iso) + echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION." + md5sum ipfire-$VERSION.$MACHINE-full.iso > ipfire-$VERSION.$MACHINE-full.iso.md5 - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-full.iso - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-full.iso.md5 - if [ -e ipfire-$VERSION.$MACHINE-devel.iso ]; then - md5sum ipfire-$VERSION.$MACHINE-devel.iso > ipfire-$VERSION.$MACHINE-devel.iso.md5 - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-devel.iso - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-devel.iso.md5 - fi - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-source-r$SVN_REVISION.tar.gz - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ svn_status - if [ "$?" -eq "0" ]; then - echo -e "The iso of Revision $SVN_REVISION was successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/." - else - echo -e "There was an error while uploading the iso to the ftp server." - exit 1 - fi + for i in svn_status ipfire-source-r$SVN_REVISION.tar.gz ipfire-$VERSION.$MACHINE-full.iso ipfire-$VERSION.$MACHINE-full.iso.md5 ipfire-$VERSION.$MACHINE-devel.iso ipfire-$VERSION.$MACHINE-devel.iso.md5; do + if [ -e "$i" ]; then + ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ $i + if [ "$?" -eq "0" ]; then + echo "The file with name $i was successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/." + else + echo "There was an error while uploading the file $i to the ftp server." + exit 1 + fi + fi + done if [ "$3" = "--with-sources-cd" ]; then - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso + ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso fi ;; paks) - cat < .ftp-commands -mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks -ls -lah -quit -EOF - ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands - rm -f .ftp-commands - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/* + ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/* if [ "$?" -eq "0" ]; then echo -e "The packages were successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/." else