X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=89c7be3a8a691a3549c907995cfd38e0bb50bcda;hp=4d92e8d50e4bf5deac63b1a3a9a87c1dae44fd46;hb=d83f547d7de9bac87258dc97c95f6bbfe97b8c70;hpb=66294b6996788dfbd4cd29d0127fdcc8cad62ebe diff --git a/make.sh b/make.sh index 4d92e8d50e..89c7be3a8a 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.0beta1" # Version number +VERSION="2.0rc1t" # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level @@ -322,19 +322,17 @@ buildipfire() { ipfiremake dhcpcd ipfiremake libusb ipfiremake libpcap - ipfiremake linux-atm ipfiremake ppp ipfiremake rp-pppoe ipfiremake unzip ipfiremake linux SMP=1 ipfiremake ipp2p SMP=1 - ipfiremake r8169 SMP=1 ipfiremake zaptel SMP=1 ipfiremake linux ipfiremake ipp2p - ipfiremake r8169 ipfiremake zaptel ipfiremake pkg-config + ipfiremake linux-atm ipfiremake cpio ipfiremake klibc ipfiremake mkinitcpio @@ -347,6 +345,7 @@ buildipfire() { ipfiremake curl ipfiremake python ipfiremake libnet + ipfiremake libidn ipfiremake libjpeg ipfiremake libpng ipfiremake libtiff @@ -388,6 +387,7 @@ buildipfire() { ipfiremake GD-TextUtil ipfiremake gnupg ipfiremake hdparm + ipfiremake sdparm ipfiremake mtools ipfiremake initscripts ipfiremake whatmask @@ -432,8 +432,6 @@ buildipfire() { ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country ipfiremake XML-Parser - ipfiremake MP3-Info - ipfiremake MP3-Tag ipfiremake glib ipfiremake GeoIP ipfiremake fwhits @@ -476,7 +474,7 @@ buildipfire() { ipfiremake postfix ipfiremake fetchmail ipfiremake cyrusimap - ipfiremake webcyradm + ipfiremake openmailadmin ipfiremake mailx ipfiremake clamav ipfiremake spamassassin @@ -485,6 +483,7 @@ buildipfire() { ipfiremake mpg123 ipfiremake mpfire ipfiremake guardian + ipfiremake libid3tag ipfiremake libmad ipfiremake libogg ipfiremake libvorbis @@ -492,8 +491,13 @@ buildipfire() { ipfiremake sox ipfiremake libshout ipfiremake icecast - ipfiremake ices - ipfiremake mp3blaster + ipfiremake icegenerator + ipfiremake mpd + ipfiremake mpc + ipfiremake xvid + ipfiremake libmpeg2 + #ipfiremake ffmpeg + ipfiremake videolan ipfiremake libpri ipfiremake stund ipfiremake asterisk @@ -524,6 +528,8 @@ buildipfire() { ipfiremake vsftpd ipfiremake which ipfiremake lsof + ipfiremake centerim + ipfiremake br2684ctl } buildinstaller() { @@ -581,23 +587,19 @@ buildpackages() { 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$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$\|-config$\|_missing_rootfile$' \ + grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$\|-config$\|_missing_rootfile$\|install1$\|install2$\|pass1$\|pass2$\|pass3$' \ $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 beautify message DONE # Create images for install - if [ "$DEVEL" == "1" ]; then - ipfiremake cdrom ED=devel - fi ipfiremake cdrom ED=full # Check if there is a loop device for building in virtual environments - if [ -e /dev/loop0 ]; then + if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then ipfiremake usb-stick fi - ipfiremake pxe mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1 ipfirepackages @@ -623,8 +625,14 @@ buildpackages() { } ipfirepackages() { + ipfiremake core-updates for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do - [ -e $BASEDIR/lfs/$i ] && ipfiredist $i + if [ -e $BASEDIR/lfs/$i ]; then + ipfiredist $i + else + echo -n $i + beautify message SKIP + fi done test -d $BASEDIR/packages || mkdir $BASEDIR/packages mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1 @@ -636,10 +644,6 @@ 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 @@ -911,13 +915,13 @@ uploadsrc) PWD=`pwd` cd $BASEDIR/cache/ echo -e "Uploading cache to ftp server:" - ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL$FTP_CACHE_PATH/ > /tmp/ftplist + ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL/$FTP_CACHE_PATH/ > /tmp/ftplist for i in *; do - if [ "$i" == "toolchains" ]; then continue; fi - grep -q $i /tmp/ftplist + if [ "$(basename $i)" == "toolchains" ]; then continue; fi + grep -q $(basename $i) /tmp/ftplist if [ "$?" -ne "0" ]; then - echo -ne "$i" - ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $i + echo -ne "$(basename $i)" + ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $(basename $i) if [ "$?" -ne "0" ]; then beautify message FAIL fi