X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=2ada02880296d8196dc16fe55b7386635826ccc2;hp=a6b2647e33017a91c79c81507f64c6e1210f0a03;hb=70c11aa670816d5cba6cd8e8cb89079e52b8fd2c;hpb=fd69d6f6dc9e41d9c2484152cb976a245f27e604

diff --git a/make.sh b/make.sh
index a6b2647e33..2ada028802 100755
--- a/make.sh
+++ b/make.sh
@@ -32,12 +32,12 @@ 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
+BUILD_IMAGES=1							# Flash and Xen Downloader
 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=6
+TOOLCHAINVER=7
 
 BUILDMACHINE=$MACHINE
     if [ "$MACHINE" = "x86_64" ]; then
@@ -356,6 +356,7 @@ buildbase() {
     lfsmake2 util-linux
     lfsmake2 vim
     lfsmake2 xz
+    lfsmake2 paxctl
     lfsmake2 grub
 }
 
@@ -377,24 +378,11 @@ buildipfire() {
   ipfiremake dvb-firmwares
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
-  ipfiremake u-boot
   ipfiremake bc
+  ipfiremake u-boot
 
   if [ "${MACHINE_TYPE}" != "arm" ]; then
 
-    # x86-xen (Legacy XEN) kernel build
-    ipfiremake linux2			KCFG="-xen"
-    ipfiremake v4l-dvb			KCFG="-xen"
-    ipfiremake mISDN			KCFG="-xen"
-    ipfiremake cryptodev		KCFG="-xen"
-    ipfiremake compat-drivers		KCFG="-xen"
-    ipfiremake r8169			KCFG="-xen"
-    ipfiremake r8168			KCFG="-xen"
-    ipfiremake r8101			KCFG="-xen"
-    ipfiremake e1000			KCFG="-xen"
-    ipfiremake e1000e			KCFG="-xen"
-    ipfiremake igb			KCFG="-xen"
-
     # x86-pae (Native and new XEN) kernel build
     ipfiremake linux			KCFG="-pae"
 #    ipfiremake kvm-kmod			KCFG="-pae"
@@ -424,29 +412,26 @@ buildipfire() {
   else
     # arm-rpi (Raspberry Pi) kernel build
     ipfiremake linux			KCFG="-rpi"
-    ipfiremake v4l-dvb			KCFG="-rpi"
-    ipfiremake mISDN			KCFG="-rpi" NOPCI=1
+#    ipfiremake v4l-dvb			KCFG="-rpi"
+#    ipfiremake mISDN			KCFG="-rpi" NOPCI=1
     ipfiremake cryptodev		KCFG="-rpi"
-    ipfiremake compat-drivers		KCFG="-rpi"
+#    ipfiremake compat-drivers		KCFG="-rpi"
 
-    # arm-omap (Panda Board) kernel build
-    ipfiremake linux			KCFG="-omap"
-    ipfiremake v4l-dvb			KCFG="-omap"
-    ipfiremake mISDN			KCFG="-omap" NOPCI=1
-    ipfiremake cryptodev		KCFG="-omap"
-    ipfiremake compat-drivers		KCFG="-omap"
+    # arm multi platform (Panda, Wandboard ...) kernel build
+    ipfiremake linux			KCFG="-multi"
+    ipfiremake cryptodev		KCFG="-multi"
 
     # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
     ipfiremake linux			KCFG="-kirkwood"
-    ipfiremake v4l-dvb			KCFG="-kirkwood"
-    ipfiremake mISDN			KCFG="-kirkwood"
+#    ipfiremake v4l-dvb			KCFG="-kirkwood"
+#    ipfiremake mISDN			KCFG="-kirkwood"
     ipfiremake cryptodev		KCFG="-kirkwood"
-    ipfiremake compat-drivers		KCFG="-kirkwood"
-    ipfiremake r8169			KCFG="-kirkwood"
-    ipfiremake r8168			KCFG="-kirkwood"
-    ipfiremake r8101			KCFG="-kirkwood"
-#    ipfiremake e1000e			KCFG="-kirkwood"
-    ipfiremake igb			KCFG="-kirkwood"
+#    ipfiremake compat-drivers		KCFG="-kirkwood"
+#    ipfiremake r8169			KCFG="-kirkwood"
+#    ipfiremake r8168			KCFG="-kirkwood"
+#    ipfiremake r8101			KCFG="-kirkwood"
+#   ipfiremake e1000e			KCFG="-kirkwood"
+#    ipfiremake igb			KCFG="-kirkwood"
 
   fi
   ipfiremake pkg-config
@@ -774,7 +759,7 @@ buildipfire() {
   ipfiremake lcdproc
   ipfiremake bitstream
   ipfiremake multicat
-#  ipfiremake keepalived
+  ipfiremake keepalived
   ipfiremake ipvsadm
   ipfiremake perl-Carp-Clan
   ipfiremake perl-Date-Calc
@@ -786,6 +771,7 @@ buildipfire() {
   ipfiremake arm
   ipfiremake wavemon
   ipfiremake iptraf-ng
+  ipfiremake iotop
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -815,7 +801,6 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake as86
-  ipfiremake mbr
   ipfiremake memtest
   ipfiremake installer
   installmake strip
@@ -854,9 +839,6 @@ buildpackages() {
 
   # Check if there is a loop device for building in virtual environments
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
-	if [ "${MACHINE_TYPE}" != "arm" ]; then
-		ipfiremake usb-stick
-	fi
 	ipfiremake flash-images
   fi
 
@@ -864,16 +846,7 @@ buildpackages() {
 
   ipfirepackages
 
-  # Check if there is a loop device for building in virtual environments
-  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
-        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
-        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
-        cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/
-        cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/
-	ipfiremake xen-image
-	rm -rf $LFS/install/packages/linux-xen-*.ipfire
-	rm -rf $LFS/install/packages/meta-linux-xen
-  fi
+  ipfiremake xen-image
   mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
 
   cd $BASEDIR