X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=8ba3cdbc695d22f53826a784ff09368944022cb9;hp=7f62482ece9cd6dca143fe5436e6b8354d556988;hb=f17e1488a1e0001a8ff8586d08718808e56f8d18;hpb=892c9792f857c78d60dcf4d2a242dcf3fdd3da97 diff --git a/make.sh b/make.sh index 7f62482ece..8ba3cdbc69 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.3-test" +VERSION="2.5beta2" +CORE="28" GIT_BRANCH=master:master # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -33,7 +34,7 @@ MAX_RETRIES=1 # prefetch/check loop KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) - +TOOLCHAINVER=1 IPFVER="full" # Which versions should be compiled? (full|devel) # Debian specific settings @@ -177,7 +178,9 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - MAKETUNING="-j6" + if [ -z $MAKETUNING ]; then + MAKETUNING="-j6" + fi export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD @@ -304,7 +307,7 @@ buildbase() { lfsmake2 make lfsmake2 man lfsmake2 mktemp - lfsmake2 modutils + lfsmake2 module-init-tools lfsmake2 mtd lfsmake2 net-tools lfsmake2 patch @@ -332,34 +335,33 @@ buildipfire() { ipfiremake libpcap ipfiremake ppp ipfiremake rp-pppoe + ipfiremake pptp ipfiremake unzip -# ipfiremake linux SMP=1 -# ipfiremake linux-fusion SMP=1 -# ipfiremake ipp2p SMP=1 -# ipfiremake atl2 SMP=1 -# ipfiremake kqemu SMP=1 -# ipfiremake v4l-dvb SMP=1 -# ipfiremake madwifi SMP=1 -# ipfiremake alsa KMOD=1 SMP=1 -# ipfiremake sane KMOD=1 SMP=1 -# ipfiremake openswan KMOD=1 SMP=1 + ipfiremake which + ipfiremake linux XEN=1 + ipfiremake atl2 XEN=1 + ipfiremake kqemu XEN=1 + ipfiremake v4l-dvb XEN=1 + ipfiremake madwifi XEN=1 +# ipfiremake alsa XEN=1 KMOD=1 + ipfiremake openswan XEN=1 KMOD=1 + ipfiremake mISDN XEN=1 + ipfiremake compat-wireless XEN=1 ipfiremake linux - ipfiremake linux-fusion ipfiremake atl2 - ipfiremake r8168 - ipfiremake r8169 ipfiremake kqemu ipfiremake v4l-dvb ipfiremake madwifi - ipfiremake alsa KMOD=1 - ipfiremake sane KMOD=1 - ipfiremake openswan KMOD=1 + ipfiremake alsa KMOD=1 + ipfiremake openswan KMOD=1 + ipfiremake mISDN + ipfiremake compat-wireless ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio ipfiremake klibc ipfiremake mkinitcpio - ipfiremake udev KLIBC=1 + ipfiremake udev KLIBC=1 ipfiremake expat ipfiremake gdbm ipfiremake gmp @@ -368,6 +370,7 @@ buildipfire() { ipfiremake curl ipfiremake python ipfiremake libnet + ipfiremake libnl ipfiremake libidn ipfiremake libjpeg ipfiremake libpng @@ -417,12 +420,11 @@ buildipfire() { ipfiremake whatmask ipfiremake iptables ipfiremake libupnp - ipfiremake linux-igd ipfiremake ipaddr ipfiremake iptstate ipfiremake iputils ipfiremake l7-protocols - ipfiremake mISDN + ipfiremake mISDNuser ipfiremake capi4k-utils ipfiremake hwdata ipfiremake kudzu @@ -515,10 +517,6 @@ buildipfire() { ipfiremake lame ipfiremake sox ipfiremake libshout - ipfiremake icecast - ipfiremake icegenerator - ipfiremake mpd - ipfiremake mpc ipfiremake xvid ipfiremake libmpeg2 ipfiremake cmake @@ -543,7 +541,6 @@ buildipfire() { ipfiremake tripwire ipfiremake sysstat ipfiremake vsftpd - ipfiremake which ipfiremake openswan ipfiremake lsof ipfiremake centerim @@ -573,17 +570,22 @@ buildipfire() { ipfiremake videolan ipfiremake vdr ipfiremake w_scan + ipfiremake icecast + ipfiremake icegenerator + ipfiremake mpd + ipfiremake mpc ipfiremake git ipfiremake squidclamav ipfiremake bc ipfiremake esniper ipfiremake vnstat ipfiremake vnstati + ipfiremake iw ipfiremake wpa_supplicant ipfiremake hostapd ipfiremake urlgrabber ipfiremake syslinux - ipfiremake tftp-hpa + ipfiremake tftpd ipfiremake cpufrequtils ipfiremake dbus ipfiremake bluetooth @@ -591,6 +593,26 @@ buildipfire() { ipfiremake apcupsd ipfiremake iperf ipfiremake netcat + ipfiremake 7zip + ipfiremake lynis + #ipfiremake cryptsetup + ipfiremake splix + ipfiremake streamripper + ipfiremake sshfs + ipfiremake sqlite + ipfiremake taglib +# ipfiremake mediatomb + ipfiremake sslh + ipfiremake perl-gettext + ipfiremake vdradmin + ipfiremake x11libs + ipfiremake xen + ipfiremake miau + ipfiremake net-snmp + ipfiremake perl-DBI + ipfiremake perl-DBD-mysql + ipfiremake lcr + ipfiremake cacti echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -599,6 +621,7 @@ buildipfire() { git status >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild + echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine } buildinstaller() { @@ -667,15 +690,13 @@ buildpackages() { $0 git log # Create images for install - ipfiremake cdrom ED=full + ipfiremake cdrom ED=$IPFVER # Check if there is a loop device for building in virtual environments if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then - ipfiremake usb-stick + ipfiremake usb-stick ED=$IPFVER fi - # Create updater package - ipfiremake updater mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 ipfirepackages @@ -720,7 +741,7 @@ case "$1" in build) clear BUILDMACHINE=`uname -m` - PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1` + PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1` #only restore on a clean disk if [ ! -f log/cleanup-toolchain-2-tools ]; then if [ ! -n "$PACKAGE" ]; then @@ -850,24 +871,24 @@ toolchain) BUILDMACHINE=`uname -m` echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains - cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$BUILDMACHINE.tar.gz \ + cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \ build/{bin,etc,usr/bin,usr/local} \ build/tools/{bin,etc,*-linux-gnu,include,lib,libexec,sbin,share,var} \ log >> $LOGFILE - md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$BUILDMACHINE.tar.gz \ - > cache/toolchains/$SNAME-$VERSION-toolchain-$BUILDMACHINE.md5 + md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \ + > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.md5 stdumount ;; gettoolchain) BUILDMACHINE=`uname -m` # arbitrary name to be updated in case of new toolchain package upload - PACKAGE=$SNAME-$VERSION-toolchain-$BUILDMACHINE + PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then URL_TOOLCHAIN=`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'` test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE cd $BASEDIR/cache/toolchains - wget $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null + wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null if [ $? -ne 0 ]; then echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE else @@ -900,6 +921,8 @@ othersrc) git) case "$2" in update|up) + ## REMOVES ALL UNCOMMITTED CHANGES! + [ "$3" == "--force" ] && git checkout -f git pull ;; commit|ci) @@ -933,7 +956,7 @@ git) [ -z $GIT_USER ] && exiterror "You have to setup GIT_USER first." GIT_URL="ssh://${GIT_USER}@git.ipfire.org/pub/git/ipfire-2.x" - git push ${GIT_URL} ${GIT_BRANCH} + git push ${GIT_URL} ${GIT_BRANCH} $3 ;; log) [ -z $GIT_TAG ] || LAST_TAG=$GIT_TAG @@ -945,21 +968,21 @@ git) ;; uploadsrc) PWD=`pwd` + if [ -z $IPFIRE_USER ]; then + echo -n "You have to setup IPFIRE_USER first. See .config for details." + beautify message FAIL + exit 1 + fi + URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }') + REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) + 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 - for i in *; do - if [ "$(basename $i)" == "toolchains" ]; then continue; fi - grep -q $(basename $i) /tmp/ftplist - if [ "$?" -ne "0" ]; then - 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 - fi + for file in $(ls -1); do + grep -q "$file" <<<$REMOTE_FILES && continue + NEW_FILES="$NEW_FILES $file" done - rm -f /tmp/ftplist + [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE} + cd $BASEDIR cd $PWD exit 0 ;;