Add possibility to disable packages for some arches.

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

diff --git a/make.sh b/make.sh
index e08f731d704e5b7f0849a007e8e47fc4b025634a..c121249c670731a1189cb4c89325c3e354e55611 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -352,11 +352,7 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim
-
-    # ARM cannot use grub.
-    if [ "${MACHINE_TYPE}" != "arm" ]; then
-      lfsmake2 grub
-    fi
+    lfsmake2 grub
 }
 
 buildipfire() {
@@ -413,18 +409,15 @@ buildipfire() {
   # Default kernel build
   ipfiremake linux
   ipfiremake v4l-dvb
-
-  if [ "${MACHINE_TYPE}" != "arm" ]; then
-    # Virtualization helpers are only available for x86.
-    ipfiremake kqemu
-    ipfiremake kvm-kmod
-    #unsupported arch (armv5)
-    ipfiremake madwifi
+  ipfiremake kqemu
+  ipfiremake kvm-kmod
+  ipfiremake madwifi
+  if [ "${MACHINE_TYPE}" = "arm" ]; then
     #todo enable alsa driver in kernel config
     ipfiremake alsa                    KMOD=1
-    #undefined declaration in echo canceler try to fix later
-    ipfiremake mISDN
   fi
+  #undefined declaration in echo canceler try to fix later
+  ipfiremake mISDN
   ipfiremake dahdi                     KMOD=1
   ipfiremake cryptodev
   ipfiremake compat-wireless
@@ -437,9 +430,6 @@ buildipfire() {
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
-
-  installmake strip
-
   ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
@@ -481,7 +471,7 @@ buildipfire() {
   ipfiremake arping
   ipfiremake beep
   ipfiremake bind
-  ipfiremake cdrtools
+  ipfiremake dvdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
@@ -637,8 +627,8 @@ buildipfire() {
   ipfiremake igmpproxy
   ipfiremake fbset
   ipfiremake sdl
-  #ipfiremake qemu
-  #ipfiremake qemu-kqemu
+  ipfiremake qemu
+  ipfiremake qemu-kqemu
   ipfiremake sane
   ipfiremake netpbm
   ipfiremake phpSANE
@@ -653,7 +643,7 @@ buildipfire() {
   ipfiremake faad2
   ipfiremake ffmpeg
   ipfiremake videolan
-  #ipfiremake vdr
+  ipfiremake vdr
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator
@@ -669,11 +659,9 @@ buildipfire() {
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
-  if [ "${MACHINE_TYPE}" != "arm" ]; then
-    ipfiremake syslinux
-  fi
+  ipfiremake syslinux
   ipfiremake tftpd
-  #ipfiremake cpufrequtils
+  ipfiremake cpufrequtils
   ipfiremake dbus
   ipfiremake bluetooth
   ipfiremake gutenprint
@@ -696,9 +684,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  if [ "${MACHINE_TYPE}" != "arm" ]; then
-    ipfiremake openvmtools
-  fi
+  ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
@@ -707,8 +693,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
@@ -754,11 +740,9 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  if [ "${MACHINE_TYPE}" != "arm" ]; then
-    ipfiremake as86
-    ipfiremake mbr
-    ipfiremake memtest
-  fi
+  ipfiremake as86
+  ipfiremake mbr
+  ipfiremake memtest
   ipfiremake installer
   cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
   installmake strip
@@ -791,11 +775,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
 
@@ -949,7 +935,8 @@ downloadsrc)
                cd $BASEDIR/lfs
                for i in *; do
                        if [ -f "$i" -a "$i" != "Config" ]; then
-                               echo -ne "Loading $i"
+                               lfsmakecommoncheck ${i} || continue
+
                                make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \
                                        MESSAGE="$i\t ($c/$MAX_RETRIES)" download >> $LOGFILE 2>&1
                                if [ $? -ne 0 ]; then