Merge commit 'origin/master' into next

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 4d4529ff446af456bb6228f8c0bab5db791aa5df..a02dadb51cd3a10040f2f5e093362a3e59509bd0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.8test"                                              # Version number
-CORE="40"                                                      # Core Level (Filename)
+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
@@ -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
@@ -355,9 +356,26 @@ buildipfire() {
   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 kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa                      KMOD=1
@@ -370,6 +388,7 @@ buildipfire() {
   ipfiremake r8101
   ipfiremake e1000
   ipfiremake e1000e
+  ipfiremake igb
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -397,6 +416,7 @@ buildipfire() {
   ipfiremake pcre
   ipfiremake slang
   ipfiremake newt
+  ipfiremake attr
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake usbutils
@@ -670,6 +690,7 @@ buildinstaller() {
   ipfiremake mbr
   ipfiremake memtest
   ipfiremake installer
+  cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
   installmake strip
   ipfiremake initrd
 }