From cc72d5cbcc5fec40d923e855b8347369d3916d2c Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 15 Sep 2011 23:55:16 +0200
Subject: [PATCH] Introduce MACHINE_TYPE to lfs files.

---
 lfs/binutils          |  6 +++---
 lfs/cleanup-toolchain |  2 +-
 lfs/compat-wireless   |  2 +-
 lfs/gcc               |  6 +++---
 lfs/glibc             | 14 +++++++-------
 lfs/hostapd           |  2 +-
 lfs/linux             |  6 +++---
 lfs/pciutils          |  2 +-
 lfs/sdl               |  2 +-
 lfs/splix             |  2 +-
 lfs/unzip             |  2 +-
 lfs/wpa_supplicant    |  2 +-
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lfs/binutils b/lfs/binutils
index 8ad6902e85..c1b660b583 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -24,7 +24,7 @@
 
 include Config
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	VER = 2.18
 else
 	VER = 2.17
@@ -72,7 +72,7 @@ else
 endif
 endif
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	EXTRA_CONFIG += \
 		--host=$(BUILDTARGET) \
 		--build=$(BUILDTARGET) \
@@ -89,7 +89,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	$(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
 else
 	$(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1
diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index 445ff73a14..79d5db40a8 100644
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -29,7 +29,7 @@ VER        = ipfire
 THISAPP    = cleanup-toolchain
 TARGET     = $(DIR_INFO)/$(THISAPP)-$(PASS)-tools
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	GCC_VER = 4.1.2
 else
 	GCC_VER = 4.0.4
diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index cd8002c3fd..8ae00dd0d9 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -97,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Build Updated asix usb-lan driver
 	cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	# B43+B44 driver doesn't build on arm
 	cd $(DIR_APP) && sed -i -e "s|CONFIG_B43=m||g" config.mk
 	cd $(DIR_APP) && sed -i -e "s|CONFIG_B44=m||g" config.mk
diff --git a/lfs/gcc b/lfs/gcc
index 4b36c5bd82..6605d5b935 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -24,7 +24,7 @@
 
 include Config
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	VER = 4.1.2
 else
 	VER = 4.0.4
@@ -117,7 +117,7 @@ else
 endif
 endif
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	EXTRA_CONFIG += \
 		--build=$(BUILDTARGET) \
 		--host=$(BUILDTARGET) \
@@ -143,7 +143,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	$(DL_FILE)_MD5 = a4a3eb15c96030906d8494959eeda23c
 else
 	$(DL_FILE)_MD5 = 8970debbc55bea85ee80961d733080f0
diff --git a/lfs/glibc b/lfs/glibc
index beb6b789a9..be3738206e 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,7 @@
 
 include Config
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	VER = 2.5
 else
 	VER = 2.3.6
@@ -55,10 +55,10 @@ else
   EXTRA_INSTALL =
 endif
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	# Disable hardware FP for ARM.
 	EXTRA_CONFIG += \
-		--build=$(MACHINE) \
+		--build=arm \
 		--host=$(BUILDTARGET) \
 		--without-fp \
 		--enable-add-ons=nptl,ports
@@ -76,7 +76,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	$(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
 	glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
 else
@@ -85,7 +85,7 @@ else
 endif
 
 # ARM needs glibc-ports
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	objects += glibc-ports-$(VER).tar.bz2
 	glibc-ports-$(VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(VER).tar.bz2
 	glibc-ports-$(VER).tar.bz2_MD5 = 183f6d46e8fa5e4b2aff240ab1586c2e
@@ -120,7 +120,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/glibc-build
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(VER).tar.bz2
 	cd $(DIR_APP) && mv -v glibc-ports-$(VER) ports
 
@@ -139,7 +139,7 @@ ifeq "$(MACHINE)" "i586"
 endif
 	# This locale causes a loop on bash login - exclude it
 	cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \
 		scripts/test-installation.pl
 else
diff --git a/lfs/hostapd b/lfs/hostapd
index 6dca252f7e..b7283c8ef3 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	-cp /usr/src/linux/include/linux/netfilter/nfnetlink.h /usr/include/linux/netfilter/
 	-cp /usr/src/linux/include/linux/netfilter/nfnetlink_compat.h /usr/include/linux/netfilter/
 	cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP)/hostapd && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config
 endif
 	cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile
diff --git a/lfs/linux b/lfs/linux
index fe3f33cee5..63ffeb8460 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -63,7 +63,7 @@ else
 	TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
 endif
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	HEADERS_ARCH=arm
 else
 	HEADERS_ARCH=x86
@@ -188,7 +188,7 @@ ifeq "$(XEN)" "1"
 	cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX)
 else
 	cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
 else
 	cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
@@ -235,7 +235,7 @@ endif
 	rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
 	rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
 
-ifneq "$(MACHINE)" "arm"
+ifneq "$(MACHINE_TYPE)" "arm"
 	# Disable geode_aes modul
 	mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \
            /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off
diff --git a/lfs/pciutils b/lfs/pciutils
index 893c75c50b..ce604c1325 100644
--- a/lfs/pciutils
+++ b/lfs/pciutils
@@ -90,7 +90,7 @@ ifeq "$(LFS_PASS)" "install"
 	cd $(DIR_APP) && install -m 0644 lib/libpci.a /opt/$(MACHINE)-uClibc/lib
 	cd $(DIR_APP) && install -m 0644 lib/*.h /opt/$(MACHINE)-uClibc/include/pci
 else
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP)/lib && ./configure
 	cd $(DIR_APP)/lib && sed -e "s/^#error.*$$/#define CPU_ARCH_ARM/" -i config.h
 endif
diff --git a/lfs/sdl b/lfs/sdl
index 2e5f0f2715..2716f3fbc6 100644
--- a/lfs/sdl
+++ b/lfs/sdl
@@ -77,7 +77,7 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SDL-1.2.11-asm-page.h.patch
 	cd $(DIR_APP) && sed "/asm\/page.h/d" -i src/video/fbcon/SDL_fbvideo.c
 endif
diff --git a/lfs/splix b/lfs/splix
index bc82cf311c..c9e8e47e12 100644
--- a/lfs/splix
+++ b/lfs/splix
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP) && sed -e "s/ceill/ceil/g" -i src/*.cpp
 endif
 	cd $(DIR_APP) && make DISABLE_JBIG=1 $(MAKETUNING) $(EXTRA_MAKE)
diff --git a/lfs/unzip b/lfs/unzip
index d9278b70dc..2013cc1327 100644
--- a/lfs/unzip
+++ b/lfs/unzip
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	# ARM cannot use the x86 assembly code.
 	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
 else
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index 28edbd6bee..f60820692b 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP)/wpa_supplicant && cp $(DIR_SRC)/config/wpa_supplicant/config ./.config
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP)/wpa_supplicant && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config
 endif
 	cd $(DIR_APP)/wpa_supplicant && sed -e "s/wpa_cli\ dynamic_eap_methods/wpa_cli\ #dynamic_eap_methods/" -i Makefile
-- 
2.39.2