X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=d454a6cc5daa8f23b2c9b9a37549e4c718d3757e;hp=3307e9e59f38d2fa18ab379dd8ceb16fe1304dfc;hb=791b22708cdc60bf9aeb22c8718016a22dbebd55;hpb=999dc5dc3b9e9cc8fdd1e2388cee0e505cbaacd9 diff --git a/make.sh b/make.sh index 3307e9e59f..d454a6cc5d 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.3" +CORE="28" GIT_BRANCH=master:master # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -177,7 +178,9 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - MAKETUNING="-j8" + 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,39 +335,21 @@ 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 linux25 - ipfiremake atl2 KVER=2.6.25.17 - ipfiremake kqemu KVER=2.6.25.17 - ipfiremake v4l-dvb KVER=2.6.25.17 - ipfiremake madwifi KVER=2.6.25.17 - ipfiremake alsa KMOD=1 KVER=2.6.25.17 ipfiremake linux 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 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 @@ -422,7 +407,6 @@ buildipfire() { ipfiremake whatmask ipfiremake iptables ipfiremake libupnp - ipfiremake linux-igd ipfiremake ipaddr ipfiremake iptstate ipfiremake iputils @@ -520,10 +504,6 @@ buildipfire() { ipfiremake lame ipfiremake sox ipfiremake libshout - ipfiremake icecast - ipfiremake icegenerator - ipfiremake mpd - ipfiremake mpc ipfiremake xvid ipfiremake libmpeg2 ipfiremake cmake @@ -578,6 +558,10 @@ buildipfire() { ipfiremake videolan ipfiremake vdr ipfiremake w_scan + ipfiremake icecast + ipfiremake icegenerator + ipfiremake mpd + ipfiremake mpc ipfiremake git ipfiremake squidclamav ipfiremake bc @@ -588,7 +572,7 @@ buildipfire() { ipfiremake hostapd ipfiremake urlgrabber ipfiremake syslinux - ipfiremake tftp-hpa + ipfiremake tftpd ipfiremake cpufrequtils ipfiremake dbus ipfiremake bluetooth @@ -596,6 +580,19 @@ 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 miau echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -604,6 +601,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() { @@ -672,15 +670,15 @@ 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 + #ipfiremake updater mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 ipfirepackages @@ -872,7 +870,7 @@ gettoolchain) 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 @@ -905,6 +903,8 @@ othersrc) git) case "$2" in update|up) + ## REMOVES ALL UNCOMMITTED CHANGES! + [ "$3" == "--force" ] && git checkout -f git pull ;; commit|ci) @@ -938,7 +938,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 @@ -950,21 +950,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 ;;