Adjust variables that have been renamed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/Config b/lfs/Config
index f14767f88c2b83d342e05e55d4523d935e9d9df5..8db3215709eb98624d87f018948d87b9a1cea56e 100644 (file)
--- 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 731382abfd5f0bded92c8b82c1ce2f66a52c722d..460b830331a95d799b3573d435e6c67377b03409 100644 (file)
--- 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 d3c8a7520a9efae3a9285c503da8abeb75bd6e81..44e92e8c073eee927763778e5c04d6922d8dd18d 100644 (file)
--- 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 6bcfa0566e80064dc67116fb77254afe17c7d834..759f3725a182f2b57335309a9de57a1599f0b548 100644 (file)
--- 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 c67df3dcb1e2def75b25186c03b4fe0327023d73..6b66e69466de13ab399327e62ed8b2c67e728d48 100644 (file)
--- 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