]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - make.sh
Add MACHINE_TYPE variable to be able to support multiple versions of one platform.
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index 500fff0a99fc0e05284129f863fca054aea63511..e08f731d704e5b7f0849a007e8e47fc4b025634a 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
     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
         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
     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
         lfsmake2 linux HEADERS=1
     else
         lfsmake2 linux-libc-header
@@ -354,7 +354,7 @@ buildbase() {
     lfsmake2 vim
 
     # ARM cannot use grub.
     lfsmake2 vim
 
     # ARM cannot use grub.
-    if [ "${MACHINE}" != "arm" ]; then
+    if [ "${MACHINE_TYPE}" != "arm" ]; then
       lfsmake2 grub
     fi
 }
       lfsmake2 grub
     fi
 }
@@ -377,7 +377,7 @@ buildipfire() {
   ipfiremake zd1211-firmware
 
   # The xen and PAE kernels are only available for x86
   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
     ipfiremake linux                   XEN=1
     ipfiremake kqemu                   XEN=1
     ipfiremake v4l-dvb                 XEN=1
@@ -414,7 +414,7 @@ buildipfire() {
   ipfiremake linux
   ipfiremake v4l-dvb
 
   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
     # Virtualization helpers are only available for x86.
     ipfiremake kqemu
     ipfiremake kvm-kmod
@@ -669,7 +669,7 @@ buildipfire() {
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
-  if [ "${MACHINE:0:3}" != "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake syslinux
   fi
   ipfiremake tftpd
     ipfiremake syslinux
   fi
   ipfiremake tftpd
@@ -696,7 +696,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  if [ "${MACHINE:0:3}" != "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake openvmtools
   fi
   ipfiremake nagiosql
     ipfiremake openvmtools
   fi
   ipfiremake nagiosql
@@ -754,7 +754,7 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   # 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
     ipfiremake as86
     ipfiremake mbr
     ipfiremake memtest