X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=0d123fbc25289f6701fbd709d976feeb0ac98c01;hb=518f894b4a6967f0a22c2c966df6a64775c4a707;hp=f1be5016aeb69127f52ba395eda646200bfa65df;hpb=3489ebacce681797c9d6a83832b781c2ed3dfb91;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/make.sh b/make.sh index f1be5016a..0d123fbc2 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.0t4" # Version number +VERSION="2.1" # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level @@ -35,11 +35,6 @@ SVN_REVISION=`svn info | grep Revision | cut -c 11-` IPFVER="full" # Which versions should be compiled? (full|devel) -# Set an information about the build number -if [ -e ./.svn ]; then - FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'` -fi - # Debian specific settings if [ ! -e /etc/debian_version ]; then FULLPATH=`which $0` @@ -318,35 +313,34 @@ buildipfire() { LOGFILE="$BASEDIR/log/_build.ipfire.log" export LOGFILE ipfiremake configroot + ipfiremake backup ipfiremake dhcp 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 fcdsl SMP=1 - ipfiremake fcdsl2 SMP=1 - ipfiremake fcdslsl SMP=1 - ipfiremake fcdslusb SMP=1 - ipfiremake fcdslslusb SMP=1 -# ipfiremake promise-sata-300-tx SMP=1 ipfiremake zaptel SMP=1 - ipfiremake fuse SMP=1 + ipfiremake r8169 SMP=1 + ipfiremake r8168 SMP=1 + ipfiremake mcs7830 SMP=1 + ipfiremake atl1 SMP=1 + ipfiremake kqemu SMP=1 + ipfiremake sane KMOD=1 SMP=1 ipfiremake linux ipfiremake ipp2p - ipfiremake fcdsl - ipfiremake fcdsl2 - ipfiremake fcdslsl - ipfiremake fcdslusb - ipfiremake fcdslslusb -# ipfiremake promise-sata-300-tx ipfiremake zaptel - ipfiremake fuse + ipfiremake r8169 + ipfiremake r8168 + ipfiremake mcs7830 + ipfiremake atl1 + ipfiremake kqemu + ipfiremake sane KMOD=1 ipfiremake pkg-config + ipfiremake linux-atm ipfiremake cpio ipfiremake klibc ipfiremake mkinitcpio @@ -359,6 +353,7 @@ buildipfire() { ipfiremake curl ipfiremake python ipfiremake libnet + ipfiremake libidn ipfiremake libjpeg ipfiremake libpng ipfiremake libtiff @@ -384,13 +379,14 @@ buildipfire() { ipfiremake arping ipfiremake beep ipfiremake bind - ipfiremake capi4k-utils ipfiremake cdrtools ipfiremake dnsmasq ipfiremake dosfstools ipfiremake squashfstools ipfiremake reiserfsprogs + ipfiremake xfsprogs ipfiremake sysfsutils + ipfiremake fuse ipfiremake ntfs-3g ipfiremake ethtool ipfiremake ez-ipupdate @@ -400,13 +396,13 @@ buildipfire() { ipfiremake GD-TextUtil ipfiremake gnupg ipfiremake hdparm - ipfiremake ibod + ipfiremake sdparm + ipfiremake mtools ipfiremake initscripts ipfiremake whatmask ipfiremake iptables ipfiremake libupnp ipfiremake ipp2p IPT=1 - ipfiremake moblock ipfiremake linux-igd ipfiremake ipac-ng ipfiremake ipaddr @@ -414,13 +410,12 @@ buildipfire() { ipfiremake iputils ipfiremake l7-protocols ipfiremake mISDN - ipfiremake isdn4k-utils + ipfiremake capi4k-utils ipfiremake hwdata ipfiremake kudzu ipfiremake logrotate ipfiremake logwatch ipfiremake misc-progs - ipfiremake mtools ipfiremake nano ipfiremake nasm ipfiremake URI @@ -446,8 +441,6 @@ buildipfire() { ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country ipfiremake XML-Parser - ipfiremake MP3-Info - ipfiremake MP3-Tag ipfiremake glib ipfiremake GeoIP ipfiremake fwhits @@ -455,12 +448,10 @@ buildipfire() { ipfiremake ntp ipfiremake openssh ipfiremake openswan - ipfiremake pptpclient ipfiremake rrdtool ipfiremake setserial ipfiremake setup ipfiremake snort - ipfiremake snortsnarf ipfiremake oinkmaster ipfiremake squid ipfiremake squid-graph @@ -477,8 +468,10 @@ buildipfire() { ipfiremake lzo ipfiremake openvpn ipfiremake pammysql - ipfiremake ghostscript ipfiremake cups + ipfiremake ghostscript + ipfiremake foomatic + ipfiremake hplip ipfiremake samba ipfiremake sudo ipfiremake mc @@ -490,9 +483,8 @@ buildipfire() { ipfiremake htop ipfiremake postfix ipfiremake fetchmail - ipfiremake cyrusimap - ipfiremake webcyradm - ipfiremake mailx + ipfiremake cyrus-imapd + ipfiremake openmailadmin ipfiremake clamav ipfiremake spamassassin ipfiremake amavisd @@ -500,16 +492,22 @@ buildipfire() { ipfiremake mpg123 ipfiremake mpfire ipfiremake guardian + ipfiremake libid3tag ipfiremake libmad ipfiremake libogg ipfiremake libvorbis ipfiremake lame ipfiremake sox - ipfiremake mp3blaster + ipfiremake libshout + ipfiremake icecast + ipfiremake icegenerator + ipfiremake mpd + ipfiremake mpc + ipfiremake xvid + ipfiremake libmpeg2 + ipfiremake videolan ipfiremake libpri - ipfiremake stund ipfiremake asterisk - ipfiremake backup ipfiremake gnump3d ipfiremake libsigc++ ipfiremake applejuice @@ -524,18 +522,30 @@ buildipfire() { ipfiremake nfs ipfiremake nmap ipfiremake mbmon - ipfiremake iftop ipfiremake ncftp - ipfiremake cftp ipfiremake etherwake - ipfiremake ethereal - ipfiremake tftp-hpa ipfiremake bwm-ng ipfiremake tripwire ipfiremake sysstat ipfiremake vsftpd ipfiremake which ipfiremake lsof + ipfiremake centerim + ipfiremake br2684ctl + ipfiremake pcmciautils + ipfiremake collectd + ipfiremake lcd4linux + ipfiremake neon + ipfiremake subversion + ipfiremake tcptrack + ipfiremake teamspeak + ipfiremake elinks + ipfiremake igmpproxy + ipfiremake sdl + ipfiremake qemu + ipfiremake sane + ipfiremake netpbm + ipfiremake phpSANE } buildinstaller() { @@ -573,6 +583,7 @@ buildinstaller() { installmake wget installmake hwdata installmake kudzu + installmake pcmciautils installmake installer installmake initrd } @@ -593,23 +604,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 @@ -635,41 +642,15 @@ buildpackages() { } ipfirepackages() { - ipfiredist alsa -# ipfiredist amavisd - ipfiredist applejuice - ipfiredist asterisk - ipfiredist clamav - ipfiredist cups - ipfiredist cyrus-sasl - ipfiredist ethereal -# ipfiredist fetchmail - ipfiredist ghostscript -# ipfiredist gnump3d - ipfiredist guardian - ipfiredist ipfireseeder - ipfiredist java - ipfiredist libogg - ipfiredist libpri - ipfiredist libvorbis - ipfiredist mailx -# ipfiredist mldonkey - ipfiredist mp3blaster - ipfiredist mpfire - ipfiredist mpg123 -# ipfiredist nfs - ipfiredist nmap - ipfiredist openldap -# ipfiredist postfix - ipfiredist rsync - ipfiredist rtorrent - ipfiredist samba - ipfiredist sox -# ipfiredist spamassassin - ipfiredist tripwire - ipfiredist vsftpd -# ipfiredist webcyradm - ipfiredist zaptel + ipfiremake core-updates + for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do + 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 rm -rf $BASEDIR/build/install/packages/* @@ -680,10 +661,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 @@ -715,8 +692,8 @@ build) buildipfire # Setzen des IPFire Builds - if [ "$FIREBUILD" ]; then - echo "$FIREBUILD" > $BASEDIR/build/var/ipfire/firebuild + if [ "$SVN_REVISION" ]; then + echo "$SVN_REVISION" > $BASEDIR/build/var/ipfire/firebuild else echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild fi @@ -955,13 +932,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 @@ -1001,6 +978,7 @@ EOF fi fi done + rm -f ipfire-$VERSION.$MACHINE-full.iso.md5 if [ "$3" = "--with-sources-cd" ]; then 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 @@ -1057,13 +1035,6 @@ pxe) lang) update_langs ;; -packages) - case "$2" in - sign) - sign_packages - ;; - esac - ;; "") clear svn info