X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=166f9ecab485b9dd426f28fc375d7090fea4733a;hp=056ac56e36ca65c982dee729f99a3a4af97e0504;hb=b27961e905bdf8d7d67a6a30b51b31f1ddabdf91;hpb=1b5f497af36b3980b8ecfeb4f6ca8a6ebf807153 diff --git a/make.sh b/make.sh index 056ac56e36..166f9ecab4 100755 --- a/make.sh +++ b/make.sh @@ -24,19 +24,20 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.6" # Version number -CORE="37" # Core Level (Filename) -PAKFIRE_CORE="36" # Core Level (PAKFIRE) +VERSION="2.7" # 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 NICE=10 # Nice level MAX_RETRIES=1 # prefetch/check loop +BUILD_IMAGES=1 # Build USB, Flash and Xen Images 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=1 +TOOLCHAINVER=2 IPFVER="full" # Which versions should be compiled? (full|devel) # Debian specific settings @@ -336,31 +337,41 @@ buildipfire() { ipfiremake libusb ipfiremake libpcap ipfiremake ppp - ipfiremake rp-pppoe ipfiremake pptp ipfiremake unzip ipfiremake which ipfiremake xz -# ipfiremake linux XEN=1 -# ipfiremake kqemu XEN=1 -# #ipfiremake kvm-kmod XEN=1 -# ipfiremake v4l-dvb XEN=1 -# ipfiremake madwifi XEN=1 -# #ipfiremake alsa XEN=1 KMOD=1 -# ipfiremake dahdi XEN=1 KMOD=1 -# ipfiremake openswan XEN=1 KMOD=1 -# ipfiremake mISDN XEN=1 -# ipfiremake compat-wireless XEN=1 + ipfiremake linux-firmware + ipfiremake linux XEN=1 + 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 ipfiremake kqemu - #ipfiremake kvm-kmod + ipfiremake kvm-kmod ipfiremake v4l-dvb ipfiremake madwifi ipfiremake alsa KMOD=1 + ipfiremake mISDN ipfiremake dahdi KMOD=1 - ipfiremake openswan KMOD=1 - #ipfiremake mISDN - #ipfiremake compat-wireless + 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 @@ -535,6 +546,7 @@ buildipfire() { ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper + ipfiremake libevent ipfiremake portmap ipfiremake nfs ipfiremake nmap @@ -544,21 +556,22 @@ buildipfire() { ipfiremake tripwire ipfiremake sysstat ipfiremake vsftpd - ipfiremake openswan + ipfiremake strongswan ipfiremake lsof ipfiremake centerim ipfiremake br2684ctl ipfiremake pcmciautils ipfiremake lm_sensors + ipfiremake liboping ipfiremake collectd ipfiremake lcd4linux - ipfiremake tcptrack ipfiremake teamspeak ipfiremake elinks ipfiremake igmpproxy ipfiremake fbset ipfiremake sdl ipfiremake qemu + ipfiremake qemu-kqemu ipfiremake sane ipfiremake netpbm ipfiremake phpSANE @@ -569,7 +582,7 @@ buildipfire() { ipfiremake freefont ipfiremake directfb ipfiremake dfb++ - ipfiremake faad + ipfiremake faad2 ipfiremake ffmpeg ipfiremake videolan ipfiremake vdr @@ -582,7 +595,6 @@ buildipfire() { ipfiremake git ipfiremake squidclamav ipfiremake bc - ipfiremake esniper ipfiremake vnstat ipfiremake vnstati ipfiremake iw @@ -600,7 +612,6 @@ buildipfire() { ipfiremake netcat ipfiremake 7zip ipfiremake lynis - #ipfiremake cryptsetup ipfiremake splix ipfiremake streamripper ipfiremake sshfs @@ -610,15 +621,13 @@ buildipfire() { ipfiremake sslh ipfiremake perl-gettext ipfiremake vdradmin -# ipfiremake x11libs -# ipfiremake xen ipfiremake miau ipfiremake netsnmpd ipfiremake perl-DBI ipfiremake perl-DBD-mysql ipfiremake cacti ipfiremake icecc - ipfiremake open-vm-tools + ipfiremake openvmtools ipfiremake nagiosql ipfiremake iftop ipfiremake motion @@ -632,6 +641,11 @@ buildipfire() { ipfiremake usb_modeswitch ipfiremake zerofree ipfiremake mdadm + ipfiremake eject + ipfiremake pound + ipfiremake minicom + ipfiremake ddrescue + 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 @@ -641,7 +655,7 @@ buildipfire() { echo >> $BASEDIR/build/var/ipfire/firebuild cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine - if [ "$GIT_BRANCH" = "next" ]; then + if [ "$GIT_BRANCH" = "master" ]; then echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release else echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release @@ -671,8 +685,6 @@ buildinstaller() { installmake popt installmake sysvinit installmake misc-progs - installmake libaal - installmake reiser4progs installmake reiserfsprogs installmake sysfsutils installmake util-linux @@ -717,7 +729,7 @@ buildpackages() { 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 + if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then ipfiremake usb-stick ED=$IPFVER ipfiremake flash-images ED=$IPFVER fi @@ -726,15 +738,15 @@ buildpackages() { ipfirepackages -# # Check if there is a loop device for building in virtual environments -# if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then -# cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/ -# cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/ -# ipfiremake xen-image ED=$IPFVER -# rm -rf $LFS/install/packages/linux-xen-*.ipfire -# rm -rf $LFS/install/packages/meta-linux-xen -# fi -# mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 + # Check if there is a loop device for building in virtual environments + if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then + cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/ + cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/ + ipfiremake xen-image ED=$IPFVER + rm -rf $LFS/install/packages/linux-xen-*.ipfire + rm -rf $LFS/install/packages/meta-linux-xen + fi + mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 # Cleanup stdumount @@ -1008,11 +1020,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