Remove cdrtools.

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

diff --git a/make.sh b/make.sh
index 223086676e70dad9a9ce8d4ccddb31a799dec0c3..c96a53b24c260defc0b76446295a2831506a3ab7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -255,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
@@ -294,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
@@ -354,7 +354,7 @@ buildbase() {
     lfsmake2 vim
 
     # ARM cannot use grub.
-    if [ "${MACHINE}" != "arm" ]; then
+    if [ "${MACHINE_TYPE}" != "arm" ]; then
       lfsmake2 grub
     fi
 }
@@ -377,7 +377,7 @@ buildipfire() {
   ipfiremake zd1211-firmware
 
   # 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
@@ -414,7 +414,7 @@ buildipfire() {
   ipfiremake linux
   ipfiremake v4l-dvb
 
-  if [ "${MACHINE}" != "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
     # Virtualization helpers are only available for x86.
     ipfiremake kqemu
     ipfiremake kvm-kmod
@@ -437,9 +437,6 @@ buildipfire() {
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
-
-  installmake strip
-
   ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
@@ -666,10 +663,10 @@ buildipfire() {
   ipfiremake vnstat
   ipfiremake vnstati
   ipfiremake iw
-  #ipfiremake wpa_supplicant
-  #ipfiremake hostapd
+  ipfiremake wpa_supplicant
+  ipfiremake hostapd
   ipfiremake urlgrabber
-  if [ "${MACHINE:0:3}" != "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake syslinux
   fi
   ipfiremake tftpd
@@ -696,7 +693,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  if [ "${MACHINE:0:3}" != "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake openvmtools
   fi
   ipfiremake nagiosql
@@ -754,7 +751,7 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  if [ "${MACHINE:0:3}" != "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake as86
     ipfiremake mbr
     ipfiremake memtest