X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=1caee37f295e93334fd0c37a9b8a3398b181c85e;hp=e383b05313cffdce84c2abc8c174bc812bce2827;hb=786f2c8a296f053a6db934993a0611f1dadb8db5;hpb=490256d5e6da75bbbb08d2c13b949e9df8bdd145 diff --git a/make.sh b/make.sh index e383b05313..1caee37f29 100644 --- a/make.sh +++ b/make.sh @@ -33,7 +33,7 @@ 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 version should be compiled? (full|light|voice) +IPFVER="full" # Which versions should be compiled? (full|light|voice|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="-j12" + MAKETUNING="-j4" export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD @@ -284,7 +284,6 @@ buildbase() { lfsmake2 file lfsmake2 findutils lfsmake2 flex - lfsmake2 grub lfsmake2 gawk lfsmake2 gettext lfsmake2 grep @@ -294,6 +293,7 @@ buildbase() { lfsmake2 iproute2 lfsmake2 kbd lfsmake2 less + lfsmake2 libaal lfsmake2 make lfsmake2 man lfsmake2 mktemp @@ -301,6 +301,7 @@ buildbase() { lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc + lfsmake2 reiser4progs lfsmake2 shadow lfsmake2 sysklogd lfsmake2 sysvinit @@ -309,6 +310,7 @@ buildbase() { lfsmake2 udev lfsmake2 util-linux lfsmake2 vim + lfsmake2 grub } buildipfire() { @@ -333,6 +335,7 @@ buildipfire() { ipfiremake fcpci SMP=1 # ipfiremake promise-sata-300-tx SMP=1 ipfiremake zaptel SMP=1 + ipfiremake fuse SMP=1 ipfiremake linux ipfiremake ipp2p ipfiremake fcdsl @@ -343,6 +346,9 @@ buildipfire() { ipfiremake fcpci # ipfiremake promise-sata-300-tx ipfiremake zaptel + ipfiremake fuse + ipfiremake pkg-config + ipfiremake cpio ipfiremake expat ipfiremake gdbm ipfiremake gmp @@ -378,13 +384,18 @@ buildipfire() { ipfiremake capi4k-utils ipfiremake cdrtools ipfiremake dnsmasq + ipfiremake libaal ipfiremake dosfstools ipfiremake reiserfsprogs ipfiremake squashfstools + ipfiremake sysfsutils + ipfiremake ntfs-3g ipfiremake ethtool ipfiremake ez-ipupdate ipfiremake fcron ipfiremake GD + ipfiremake GD-Graph + ipfiremake GD-TextUtil ipfiremake gnupg ipfiremake hdparm ipfiremake ibod @@ -392,6 +403,7 @@ buildipfire() { ipfiremake iptables ipfiremake libupnp ipfiremake ipp2p IPT=1 + ipfiremake moblock ipfiremake linux-igd ipfiremake ipac-ng ipfiremake ipaddr @@ -400,6 +412,7 @@ buildipfire() { ipfiremake l7-protocols ipfiremake isapnptools # ipfiremake isdn4k-utils # What about mISDN??? + ipfiremake hwdata ipfiremake kudzu ipfiremake logrotate ipfiremake logwatch @@ -430,6 +443,11 @@ buildipfire() { ipfiremake Archive-Zip ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country + ipfiremake XML-Parser + ipfiremake glib + ipfiremake dbus + ipfiremake hal + ipfiremake hwinfo ipfiremake GeoIP ipfiremake fwhits ipfiremake noip_updater @@ -457,8 +475,6 @@ buildipfire() { ipfiremake spandsp ipfiremake lzo ipfiremake openvpn - ipfiremake pkg-config - ipfiremake glib ipfiremake pammysql ipfiremake xinetd ipfiremake ghostscript @@ -517,7 +533,6 @@ buildipfire() { ipfiremake tftp-hpa ipfiremake iptraf ipfiremake nagios - ipfiremake yasuc } buildinstaller() { @@ -543,10 +558,19 @@ buildinstaller() { installmake sysvinit installmake misc-progs installmake e2fsprogs + installmake libaal + installmake reiser4progs installmake reiserfsprogs installmake sysfsutils installmake util-linux installmake pciutils + installmake zlib + installmake wget + installmake libxml2 + installmake dbus + installmake hal + installmake hwdata + installmake hwinfo installmake kudzu installmake installer installmake initrd @@ -575,7 +599,16 @@ buildpackages() { beautify message DONE # Create images for install - ipfiremake cdrom + 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 + fi + done ipfiremake pxe cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1 @@ -704,7 +737,7 @@ shell) ;; changelog) echo -n "Loading new Changelog from SVN: " - svn log http://svn.ipfire.eu/svn/ipfire > doc/ChangeLog + svn log http://svn.ipfire.org/svn/ipfire > doc/ChangeLog beautify message DONE ;; clean) @@ -878,9 +911,12 @@ svn) $0 changelog fi fi + update_langs svn commit $0 svn up - $0 uploadsrc + if [ -n "$FTP_CACHE_URL" ]; then + $0 uploadsrc + fi ;; dist) if [ $3 ]; then @@ -891,9 +927,9 @@ svn) exit 0 fi echo -en "REV $SVN_REVISION: Downloading..." - svn export http://svn.ipfire.eu/svn/ipfire/trunk ipfire-source/ --force > /dev/null - svn log http://svn.ipfire.eu/svn/ipfire/trunk -r 1:$SVN_REVISION > ipfire-source/Changelog - #svn info http://svn.ipfire.eu/svn/ipfire/trunk -r $SVN_REVISION > ipfire-source/svn_status + svn export http://svn.ipfire.org/svn/ipfire/trunk ipfire-source/ --force > /dev/null + svn log http://svn.ipfire.org/svn/ipfire/trunk -r 1:$SVN_REVISION > ipfire-source/Changelog + #svn info http://svn.ipfire.org/svn/ipfire/trunk -r $SVN_REVISION > ipfire-source/svn_status evaluate 1 echo -en "REV $SVN_REVISION: Compressing files..." @@ -918,21 +954,19 @@ 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/ > /var/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 /var/tmp/ftplist + grep -q $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 - if [ "$?" -eq "0" ]; then - beautify message DONE - else + if [ "$?" -ne "0" ]; then beautify message FAIL fi fi done - rm -f /var/tmp/ftplist + rm -f /tmp/ftplist cd $PWD exit 0 ;; @@ -981,7 +1015,7 @@ EOF esac ;; batch) - if [ "$2" -eq "--background" ]; then + if [ "$2" = "--background" ]; then batch_script exit $? fi