From ba3cbb0cfbf41c05185caa1f42b985738ff218bc Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 30 May 2018 15:23:57 +0100
Subject: [PATCH] Adjust variables that have been renamed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/Config         |  2 +-
 lfs/cdrom          |  2 +-
 lfs/flash-images   | 12 ++----------
 lfs/ipfire-netboot |  4 ++--
 lfs/syslinux       |  4 ++--
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lfs/Config b/lfs/Config
index f14767f88c..8db3215709 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -80,7 +80,7 @@ DIR_TMP     = /tmp
 CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' ' -f1)
 
 # We support EFI on x86_64
-ifeq "$(MACHINE)" "x86_64"
+ifeq "$(BUILD_ARCH)" "x86_64"
 	EFI = 1
 endif
 
diff --git a/lfs/cdrom b/lfs/cdrom
index 731382abfd..460b830331 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -29,7 +29,7 @@ VER = ipfire
 THISAPP    = cdrom
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 	TAR_OPTIONS =
 else
 	TAR_OPTIONS = --lzma
diff --git a/lfs/flash-images b/lfs/flash-images
index d3c8a7520a..44e92e8c07 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -29,14 +29,6 @@ VER = ipfire
 THISAPP    = flash-image
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE)" "x86_64"
-	EFI = 1
-endif
-
-ifeq "$(MACHINE)" "i586"
-	EFI = 1
-endif
-
 DEVICE     = $(shell losetup -f)
 PART_BOOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1
 ifeq "$(EFI)" "1"
@@ -95,11 +87,11 @@ endif
 S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
 S_ROOT := 2477600
 
-ifeq "$(MACHINE)" "x86_64"
+ifeq "$(BUILD_ARCH)" "x86_64"
 	EFI_ARCH = x64
 endif
 
-ifeq "$(MACHINE)" "i586"
+ifeq "$(BUILD_ARCH)" "i586"
 	EFI_ARCH = ia32
 endif
 
diff --git a/lfs/ipfire-netboot b/lfs/ipfire-netboot
index 6bcfa0566e..759f3725a1 100644
--- a/lfs/ipfire-netboot
+++ b/lfs/ipfire-netboot
@@ -79,14 +79,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && tar axf $(DIR_DL)/ipxe-$(PXE_VER).tar.gz
 	cd $(DIR_APP) && rm -rfv ipxe && ln -s ipxe-$(PXE_VER) ipxe
 	cd $(DIR_APP) && make bin/ipxe.lkrn
-ifeq "$(MACHINE)" "x86_64"
+ifeq "$(BUILD_ARCH)" "x86_64"
 	cd $(DIR_APP) && make bin-x86_64-efi/ipxe.efi
 endif
 
 	# Installation
 	-mkdir -pv /usr/share/ipfire-netboot
 	cd $(DIR_APP) && install -m 644 bin/ipxe.lkrn /usr/share/ipfire-netboot
-ifeq "$(MACHINE)" "x86_64"
+ifeq "$(BUILD_ARCH)" "x86_64"
 	cd $(DIR_APP) && install -m 644 bin-x86_64-efi/ipxe.efi \
 		/usr/share/ipfire-netboot
 endif
diff --git a/lfs/syslinux b/lfs/syslinux
index c67df3dcb1..6b66e69466 100644
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -77,13 +77,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Build
 	cd $(DIR_APP) && make bios $(MAKETUNING)
-ifeq "$(MACHINE)" "x86_64"
+ifeq "$(BUILD_ARCH)" "x86_64"
 	cd $(DIR_APP) && make efi64 $(MAKETUNING)
 endif
 
 	# Install
 	cd $(DIR_APP) && make bios install
-ifeq "$(MACHINE)" "x86_64"
+ifeq "$(BUILD_ARCH)" "x86_64"
 	cd $(DIR_APP) && make efi64 install
 endif
 
-- 
2.39.2