X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=b2a714d135593e523e1caadb0f6e120e454b8424;hb=872a05ee8b185d64e815f46a7f04d405de4cd1fd;hp=3f89f81c1162fb1dd28a17a56d68b73a39bc9928;hpb=8a5f0f44faa76acffea5202e5fad34990b40ae5b;p=ipfire-2.x.git diff --git a/make.sh b/make.sh old mode 100644 new mode 100755 index 3f89f81c11..b2a714d135 --- 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.0b" # 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.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 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|voice|devel) +IPFVER="full" # Which versions should be compiled? (full|devel) # Set an information about the build number if [ -e ./.svn ]; then @@ -170,7 +170,7 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - MAKETUNING="-j4" + MAKETUNING="-j6" export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD @@ -298,6 +298,7 @@ buildbase() { lfsmake2 man lfsmake2 mktemp lfsmake2 modutils + lfsmake2 mtd lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc @@ -329,13 +330,12 @@ buildipfire() { ipfiremake ipp2p SMP=1 ipfiremake fcdsl SMP=1 ipfiremake fcdsl2 SMP=1 - ipfiremake fcdslsl SMP=1 + ipfiremake fcdslsl SMP=1 ipfiremake fcdslusb SMP=1 - ipfiremake fcdslslusb SMP=1 - ipfiremake fcpci SMP=1 + ipfiremake fcdslslusb SMP=1 # ipfiremake promise-sata-300-tx SMP=1 ipfiremake zaptel SMP=1 - ipfiremake fuse SMP=1 + ipfiremake fuse SMP=1 ipfiremake linux ipfiremake ipp2p ipfiremake fcdsl @@ -343,26 +343,27 @@ buildipfire() { ipfiremake fcdslsl ipfiremake fcdslusb ipfiremake fcdslslusb - ipfiremake fcpci # ipfiremake promise-sata-300-tx ipfiremake zaptel ipfiremake fuse ipfiremake pkg-config ipfiremake cpio + ipfiremake klibc + ipfiremake mkinitcpio + ipfiremake udev KLIBC=1 ipfiremake expat ipfiremake gdbm ipfiremake gmp ipfiremake pam ipfiremake openssl + ipfiremake curl ipfiremake python ipfiremake libnet ipfiremake libjpeg ipfiremake libpng ipfiremake libtiff - ipfiremake lcms - ipfiremake libmng - ipfiremake freetype ipfiremake libart + ipfiremake freetype ipfiremake gd ipfiremake popt ipfiremake pcre @@ -370,7 +371,9 @@ buildipfire() { ipfiremake newt ipfiremake libcap ipfiremake pciutils + ipfiremake usbutils ipfiremake libxml2 + ipfiremake libxslt ipfiremake BerkeleyDB ipfiremake mysql ipfiremake cyrus-sasl @@ -384,7 +387,6 @@ buildipfire() { ipfiremake capi4k-utils ipfiremake cdrtools ipfiremake dnsmasq - ipfiremake libaal ipfiremake dosfstools ipfiremake reiserfsprogs ipfiremake squashfstools @@ -395,10 +397,12 @@ buildipfire() { ipfiremake fcron ipfiremake GD ipfiremake GD-Graph + ipfiremake GD-TextUtil ipfiremake gnupg ipfiremake hdparm ipfiremake ibod ipfiremake initscripts + ipfiremake whatmask ipfiremake iptables ipfiremake libupnp ipfiremake ipp2p IPT=1 @@ -409,8 +413,8 @@ buildipfire() { ipfiremake iptstate ipfiremake iputils ipfiremake l7-protocols - ipfiremake isapnptools -# ipfiremake isdn4k-utils # What about mISDN??? + ipfiremake isdn4k-utils + ipfiremake mISDN ipfiremake hwdata ipfiremake kudzu ipfiremake logrotate @@ -418,7 +422,6 @@ buildipfire() { ipfiremake misc-progs ipfiremake mtools ipfiremake nano - ipfiremake nash ipfiremake nasm ipfiremake URI ipfiremake HTML-Tagset @@ -443,15 +446,13 @@ buildipfire() { ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country ipfiremake XML-Parser + ipfiremake MP3-Info + ipfiremake MP3-Tag ipfiremake glib - ipfiremake dbus - ipfiremake hal - ipfiremake hwinfo ipfiremake GeoIP ipfiremake fwhits ipfiremake noip_updater ipfiremake ntp - ipfiremake oinkmaster ipfiremake openssh ipfiremake openswan ipfiremake pptpclient @@ -459,9 +460,12 @@ buildipfire() { ipfiremake setserial ipfiremake setup ipfiremake snort + #ipfiremake snortsnarf + ipfiremake oinkmaster ipfiremake squid ipfiremake squid-graph ipfiremake squidguard + ipfiremake calamaris ipfiremake tcpdump ipfiremake traceroute ipfiremake vlan @@ -470,33 +474,27 @@ buildipfire() { ipfiremake 3c5x9setup ipfiremake pakfire ipfiremake java - ipfiremake bootsplash ipfiremake spandsp ipfiremake lzo ipfiremake openvpn ipfiremake pammysql - ipfiremake xinetd ipfiremake ghostscript ipfiremake cups ipfiremake samba ipfiremake sudo ipfiremake mc ipfiremake wget - ipfiremake wput ipfiremake bridge-utils ipfiremake screen ipfiremake hddtemp ipfiremake smartmontools ipfiremake htop - ipfiremake lynx ipfiremake postfix - ipfiremake procmail ipfiremake fetchmail ipfiremake cyrusimap ipfiremake webcyradm ipfiremake mailx ipfiremake clamav - ipfiremake razor ipfiremake spamassassin ipfiremake amavisd ipfiremake stund @@ -504,20 +502,21 @@ buildipfire() { # ipfiremake bristuff ipfiremake asterisk ipfiremake mpg123 + ipfiremake mpfire + ipfiremake backup ipfiremake libmad ipfiremake libogg ipfiremake libvorbis ipfiremake lame - ipfiremake xvid - ipfiremake mpeg2dec - ipfiremake ffmpeg ipfiremake sox ipfiremake gnump3d - ipfiremake videolan + ipfiremake libsigc++ ipfiremake applejuice ipfiremake ocaml ipfiremake mldonkey - ipfiremake ntop + ipfiremake libtorrent + ipfiremake rtorrent + ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper ipfiremake portmap @@ -530,8 +529,14 @@ buildipfire() { ipfiremake etherwake ipfiremake ethereal ipfiremake tftp-hpa - ipfiremake iptraf - ipfiremake nagios + ipfiremake bwm-ng + ipfiremake tripwire + ipfiremake sysstat + ipfiremake vsftpd + ipfiremake alsa + ipfiremake mp3blaster + ipfiremake which + ipfiremake lsof } buildinstaller() { @@ -539,6 +544,8 @@ buildinstaller() { LOGFILE="$BASEDIR/log/_build.installer.log" export LOGFILE ipfiremake syslinux + ipfiremake as86 + ipfiremake mbr ipfiremake memtest installmake linux-libc-header installmake binutils @@ -556,7 +563,6 @@ buildinstaller() { installmake popt installmake sysvinit installmake misc-progs - installmake e2fsprogs installmake libaal installmake reiser4progs installmake reiserfsprogs @@ -564,12 +570,9 @@ buildinstaller() { installmake util-linux installmake pciutils installmake zlib + installmake mtd installmake wget - installmake libxml2 - installmake dbus - installmake hal installmake hwdata - installmake hwinfo installmake kudzu installmake installer installmake initrd @@ -598,27 +601,26 @@ buildpackages() { beautify message DONE # Create images for install - for i in $IPFVER - do - if [ $i == "devel" ]; then - if [ ! -e ipfire-$VERSION.i586-devel.iso ]; then - ipfiremake cdrom ED=$i - fi - else - ipfiremake cdrom ED=$i + if [ "$DEVEL" == "1" ]; then + ipfiremake cdrom ED=devel fi - done + ipfiremake cdrom ED=full + + # Check if there is a loop device for building in virtual environments + if [ -e /dev/loop0 ]; then + ipfiremake usb-stick + fi ipfiremake pxe - cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1 + mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1 -# ipfirepackages + ipfirepackages # Cleanup stdumount rm -rf $BASEDIR/build/tmp/* # Generating total list of files - echo "Generating files list from logs" | tee -a $LOGFILE + echo -n "Generating files list from logs" | tee -a $LOGFILE rm -f $BASEDIR/log/FILES for i in `ls -1tr $BASEDIR/log/[^_]*`; do if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then @@ -628,54 +630,42 @@ buildpackages() { cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES fi done - cd $BASEDIR/packages; ls -w1 *.ipfire | awk -F ".ipfire" '{ print $1 }' > $BASEDIR/packages/packages_list.txt - echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt + beautify message DONE cd $PWD - } ipfirepackages() { - if [ -d "$BASEDIR/packages" ]; then - for i in `ls $BASEDIR/packages`; do - touch $BASEDIR/build/install/packages/$i.empty - done - fi + ipfiredist alsa # ipfiredist amavisd ipfiredist applejuice - ipfiredist asterisk +# ipfiredist asterisk ipfiredist clamav ipfiredist cups - ipfiredist cyrusimap - ipfiredist fetchmail - ipfiredist ffmpeg - ipfiredist gnump3d - ipfiredist iptraf + ipfiredist cyrus-sasl +# ipfiredist fetchmail +# ipfiredist gnump3d + ipfiredist ipfireseeder ipfiredist java - ipfiredist lame - ipfiredist libmad ipfiredist libogg ipfiredist libvorbis - ipfiredist mailx - ipfiredist mldonkey - ipfiredist mpeg2dec - ipfiredist nagios - ipfiredist nfs - ipfiredist nmap - ipfiredist ntop - ipfiredist portmap - ipfiredist postfix - ipfiredist procmail +# ipfiredist mailx +# ipfiredist mldonkey + ipfiredist mp3blaster + ipfiredist mpfire + ipfiredist mpg123 +# ipfiredist nfs + ipfiredist openldap +# ipfiredist postfix + ipfiredist rtorrent ipfiredist samba - ipfiredist sox - ipfiredist spamassassin - ipfiredist subversion - ipfiredist videolan - ipfiredist webcyradm - ipfiredist xvid - ipfiredist yasuc +# ipfiredist sox +# ipfiredist spamassassin + ipfiredist tripwire + ipfiredist vsftpd +# ipfiredist webcyradm test -d $BASEDIR/packages || mkdir $BASEDIR/packages - mv -f $LFS/install/packages/*.{ipfire,md5} $BASEDIR/packages >> $LOGFILE 2>&1 + mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1 rm -rf $BASEDIR/build/install/packages/* } @@ -684,6 +674,10 @@ case "$1" in build) clear BUILDMACHINE=`uname -m` + DEVEL=0 + if [ "$2" == "--devel" ]; then + DEVEL=1 + fi PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1` #only restore on a clean disk if [ ! -f log/cleanup-toolchain-2-tools ]; then @@ -913,7 +907,9 @@ svn) update_langs svn commit $0 svn up - $0 uploadsrc + if [ -n "$FTP_CACHE_URL" ]; then + $0 uploadsrc + fi ;; dist) if [ $3 ]; then @@ -940,10 +936,12 @@ svn) evaluate 1 ;; diff|di) + update_langs 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 evaluate 1 echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff" + svn status ;; esac ;; @@ -970,40 +968,45 @@ uploadsrc) upload) case "$2" in iso) - echo -e "Uploading the iso to $IPFIRE_FTP_URL_EXT." + echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION." cat < .ftp-commands -mkdir $IPFIRE_FTP_PATH_EXT +mkdir -p $FTP_ISO_PATH$SVN_REVISION ls -lah quit EOF - ncftp -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT < .ftp-commands + ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands rm -f .ftp-commands - md5sum ipfire-install-$VERSION.i386.iso > ipfire-install-$VERSION.i386.iso.md5 - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ ipfire-install-$VERSION.i386.iso - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ ipfire-install-$VERSION.i386.iso.md5 - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ ipfire-source-r$SVN_REVISION.tar.gz - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ svn_status + 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 $IPFIRE_FTP_URL_EXT$IPFIRE_FTP_PATH_EXT/." + 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 if [ "$3" = "--with-sources-cd" ]; then - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ ipfire-sources-cd-$VERSION.$MACHINE.iso + ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso fi ;; paks) cat < .ftp-commands -mkdir $IPFIRE_FTP_PATH_PAK +mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks ls -lah quit EOF - ncftp -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK < .ftp-commands + ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands rm -f .ftp-commands - ncftpput -z -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK $IPFIRE_FTP_PATH_PAK/ packages/* + ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/* if [ "$?" -eq "0" ]; then - echo -e "The packages were successfully uploaded to $IPFIRE_FTP_URL_PAK$IPFIRE_FTP_PATH_PAK/." + echo -e "The packages were successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/." else echo -e "There was an error while uploading the packages to the ftp server." exit 1 @@ -1049,6 +1052,16 @@ pxe) esac exit 0 ;; +lang) + update_langs + ;; +packages) + case "$2" in + sign) + sign_packages + ;; + esac + ;; "") clear svn info