X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=a02dadb51cd3a10040f2f5e093362a3e59509bd0;hp=ae19e414ad7ff9e8aa06df16f93b4be9e741008f;hb=38c982bb77390f53744815eedb877ebeab05ba4b;hpb=006ffcfe7157b3d980ed2486149d8fcc729e68e7 diff --git a/make.sh b/make.sh index ae19e414ad..a02dadb51c 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,9 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.6" # Version number -CORE="38" # Core Level (Filename) -PAKFIRE_CORE="38" # Core Level (PAKFIRE) +VERSION="2.8test" # Version number +CORE="41" # Core Level (Filename) +PAKFIRE_CORE="40" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=2 +TOOLCHAINVER=1 IPFVER="full" # Which versions should be compiled? (full|devel) # Debian specific settings @@ -231,7 +231,7 @@ buildtoolchain() { ORG_PATH=$PATH NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1} - lfsmake1 ccache + lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH @@ -243,6 +243,7 @@ buildtoolchain() { lfsmake1 dejagnu lfsmake1 gcc PASS=2 lfsmake1 binutils PASS=2 + lfsmake1 ccache PASS=2 lfsmake1 ncurses lfsmake1 bash lfsmake1 bzip2 @@ -337,7 +338,6 @@ buildipfire() { ipfiremake libusb ipfiremake libpcap ipfiremake ppp - ipfiremake rp-pppoe ipfiremake pptp ipfiremake unzip ipfiremake which @@ -347,24 +347,55 @@ buildipfire() { ipfiremake kqemu XEN=1 ipfiremake v4l-dvb XEN=1 ipfiremake madwifi XEN=1 + ipfiremake mISDN XEN=1 ipfiremake dahdi XEN=1 KMOD=1 ipfiremake cryptodev XEN=1 ipfiremake compat-wireless XEN=1 + ipfiremake r8169 XEN=1 + ipfiremake r8168 XEN=1 + ipfiremake r8101 XEN=1 + ipfiremake e1000 XEN=1 + ipfiremake e1000e XEN=1 + ipfiremake igb XEN=1 + ipfiremake linux PAE=1 + ipfiremake kqemu PAE=1 + ipfiremake kvm-kmod PAE=1 + ipfiremake v4l-dvb PAE=1 + ipfiremake madwifi PAE=1 + ipfiremake alsa PAE=1 KMOD=1 + ipfiremake mISDN PAE=1 + ipfiremake dahdi PAE=1 KMOD=1 + ipfiremake cryptodev PAE=1 + ipfiremake compat-wireless PAE=1 + ipfiremake r8169 PAE=1 + ipfiremake r8168 PAE=1 + ipfiremake r8101 PAE=1 + ipfiremake e1000 PAE=1 + ipfiremake e1000e PAE=1 + ipfiremake igb PAE=1 ipfiremake linux ipfiremake kqemu ipfiremake kvm-kmod ipfiremake v4l-dvb ipfiremake madwifi ipfiremake alsa KMOD=1 + ipfiremake mISDN ipfiremake dahdi KMOD=1 ipfiremake cryptodev ipfiremake compat-wireless + ipfiremake r8169 + ipfiremake r8168 + ipfiremake r8101 + ipfiremake e1000 + ipfiremake e1000e + ipfiremake igb ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio - ipfiremake klibc - ipfiremake mkinitcpio - ipfiremake udev KLIBC=1 + + installmake strip + + ipfiremake dracut ipfiremake expat ipfiremake gdbm ipfiremake gmp @@ -385,6 +416,7 @@ buildipfire() { ipfiremake pcre ipfiremake slang ipfiremake newt + ipfiremake attr ipfiremake libcap ipfiremake pciutils ipfiremake usbutils @@ -403,7 +435,6 @@ buildipfire() { ipfiremake cdrtools ipfiremake dnsmasq ipfiremake dosfstools - ipfiremake squashfstools ipfiremake reiserfsprogs ipfiremake xfsprogs ipfiremake sysfsutils @@ -533,6 +564,7 @@ buildipfire() { ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper + ipfiremake libevent ipfiremake portmap ipfiremake nfs ipfiremake nmap @@ -613,7 +645,7 @@ buildipfire() { ipfiremake perl-DBD-mysql ipfiremake cacti ipfiremake icecc - ipfiremake open-vm-tools + ipfiremake openvmtools ipfiremake nagiosql ipfiremake iftop ipfiremake motion @@ -625,10 +657,15 @@ buildipfire() { ipfiremake asterisk ipfiremake lcr ipfiremake usb_modeswitch + ipfiremake usb_modeswitch_data ipfiremake zerofree ipfiremake mdadm ipfiremake eject ipfiremake pound + ipfiremake minicom + ipfiremake ddrescue + ipfiremake tcl + ipfiremake imspector echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -652,36 +689,10 @@ buildinstaller() { ipfiremake as86 ipfiremake mbr ipfiremake memtest - installmake linux-libc-header - installmake binutils - ipfiremake uClibc PASS=1 - ipfiremake gcc INST=1 - installmake uClibc PASS=2 - installmake gcc INST=2 - installmake uClibc PASS=3 - installmake busybox - installmake udev - installmake slang - installmake newt - installmake gettext - installmake kbd - installmake popt - installmake sysvinit - installmake misc-progs - installmake libaal - installmake reiser4progs - installmake reiserfsprogs - installmake sysfsutils - installmake util-linux - installmake pciutils - installmake zlib - installmake mtd - installmake wget - installmake hwdata - installmake kudzu - installmake pcmciautils - installmake installer - installmake initrd + ipfiremake installer + cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/ + installmake strip + ipfiremake initrd } buildpackages() { @@ -689,7 +700,6 @@ buildpackages() { export LOGFILE echo "... see detailed log in _build.*.log files" >> $LOGFILE - installmake strip # Generating list of packages used echo -n "Generating packages list from logs" | tee -a $LOGFILE @@ -1005,11 +1015,12 @@ uploadsrc) 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}) + REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) cd $BASEDIR/cache/ - for file in $(ls -1); do + for file in $(ls -1 --ignore=toolchains); do grep -q "$file" <<<$REMOTE_FILES && continue NEW_FILES="$NEW_FILES $file" done