Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into...

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

diff --git a/make.sh b/make.sh
index c9ef62a4105d70caea93f00394ffcc420f30cd30..477cd93ca5092560583c3063d7cf8a2c2a6af942 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -189,7 +189,11 @@ prepareenv() {
     set +h
     LC_ALL=POSIX
     if [ -z $MAKETUNING ]; then
-       MAKETUNING="-j6"
+        if [ "${MACHINE:0:3}" = "arm" ]; then
+            MAKETUNING="-j2"
+        else
+            MAKETUNING="-j6"
+        fi
     fi
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
@@ -251,7 +255,7 @@ buildtoolchain() {
     lfsmake1 make      PASS=1
     lfsmake1 binutils  PASS=1
     lfsmake1 gcc               PASS=1
-    if [ "${MACHINE}" = "arm" ]; then
+    if [ "${MACHINE_TYPE}" = "arm" ]; then
         lfsmake1 linux TOOLS=1 HEADERS=1
     else
         lfsmake1 linux-libc-header
@@ -290,7 +294,7 @@ buildbase() {
     LOGFILE="$BASEDIR/log/_build.base.log"
     export LOGFILE
     lfsmake2 stage2
-    if [ "${MACHINE}" = "arm" ]; then
+    if [ "${MACHINE_TYPE}" = "arm" ]; then
         lfsmake2 linux HEADERS=1
     else
         lfsmake2 linux-libc-header
@@ -350,7 +354,7 @@ buildbase() {
     lfsmake2 vim
 
     # ARM cannot use grub.
-    if [ "${MACHINE}" != "arm" ]; then
+    if [ "${MACHINE_TYPE}" != "arm" ]; then
       lfsmake2 grub
     fi
 }
@@ -372,8 +376,12 @@ buildipfire() {
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
 
+  if [ "${MACHINE_TYPE}" == "arm" ]; then
+       ipfiremake u-boot
+  fi
+
   # The xen and PAE kernels are only available for x86
-  if [ "${MACHINE}" != "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake linux                   XEN=1
     ipfiremake kqemu                   XEN=1
     ipfiremake v4l-dvb                 XEN=1
@@ -407,20 +415,23 @@ buildipfire() {
   fi
 
   # Default kernel build
-  #ipfiremake linux
+  ipfiremake linux
   ipfiremake v4l-dvb
 
-  # Virtualization helpers are only available for x86.
-  if [ "${MACHINE}" != "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
+    # Virtualization helpers are only available for x86.
     ipfiremake kqemu
     ipfiremake kvm-kmod
+    #unsupported arch (armv5)
+    ipfiremake madwifi
+    #todo enable alsa driver in kernel config
+    ipfiremake alsa                    KMOD=1
+    #undefined declaration in echo canceler try to fix later
+    ipfiremake mISDN
   fi
-  #ipfiremake madwifi
-  #ipfiremake alsa                     KMOD=1
-  #ipfiremake mISDN
   ipfiremake dahdi                     KMOD=1
   ipfiremake cryptodev
-  #ipfiremake compat-wireless
+  ipfiremake compat-wireless
 #  ipfiremake r8169
 #  ipfiremake r8168
 #  ipfiremake r8101
@@ -428,11 +439,8 @@ buildipfire() {
   #ipfiremake e1000e
   #ipfiremake igb
   ipfiremake pkg-config
-  #ipfiremake linux-atm
+  ipfiremake linux-atm
   ipfiremake cpio
-
-  installmake strip
-
   ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
@@ -474,7 +482,7 @@ buildipfire() {
   ipfiremake arping
   ipfiremake beep
   ipfiremake bind
-  ipfiremake cdrtools
+  ipfiremake dvdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
@@ -630,8 +638,8 @@ buildipfire() {
   ipfiremake igmpproxy
   ipfiremake fbset
   ipfiremake sdl
-  ipfiremake qemu
-  ipfiremake qemu-kqemu
+  #ipfiremake qemu
+  #ipfiremake qemu-kqemu
   ipfiremake sane
   ipfiremake netpbm
   ipfiremake phpSANE
@@ -646,7 +654,7 @@ buildipfire() {
   ipfiremake faad2
   ipfiremake ffmpeg
   ipfiremake videolan
-  ipfiremake vdr
+  #ipfiremake vdr
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator
@@ -662,9 +670,11 @@ buildipfire() {
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
-  ipfiremake syslinux
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
+    ipfiremake syslinux
+  fi
   ipfiremake tftpd
-  ipfiremake cpufrequtils
+  #ipfiremake cpufrequtils
   ipfiremake dbus
   ipfiremake bluetooth
   ipfiremake gutenprint
@@ -687,7 +697,9 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  ipfiremake openvmtools
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
+    ipfiremake openvmtools
+  fi
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
@@ -696,8 +708,8 @@ buildipfire() {
   ipfiremake watchdog
   ipfiremake libpri
   ipfiremake dahdi
-  ipfiremake asterisk
-  ipfiremake lcr
+  #ipfiremake asterisk
+  #ipfiremake lcr
   ipfiremake usb_modeswitch
   ipfiremake usb_modeswitch_data
   ipfiremake zerofree
@@ -743,9 +755,11 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  ipfiremake as86
-  ipfiremake mbr
-  ipfiremake memtest
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
+    ipfiremake as86
+    ipfiremake mbr
+    ipfiremake memtest
+  fi
   ipfiremake installer
   cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
   installmake strip
@@ -778,11 +792,13 @@ buildpackages() {
   $0 git log
 
   # Create images for install
-       ipfiremake cdrom ED=$IPFVER
+  ipfiremake cdrom ED=$IPFVER
 
   # Check if there is a loop device for building in virtual environments
-  if [ $BUILD_IMAGES == 1 ] &&  ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
-       ipfiremake usb-stick ED=$IPFVER
+  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
+       if [ "${MACHINE_TYPE}" != "arm" ]; then
+               ipfiremake usb-stick ED=$IPFVER
+       fi
        ipfiremake flash-images ED=$IPFVER
   fi