webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust variables that have been renamed

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2018-05-30 15:23:57 +01:00
parent 7b4323c66e
commit ba3cbb0cfb
5 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lfs/Config
View File

@@ -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

2
lfs/cdrom
View File

@@ -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

12
lfs/flash-images
View File

@@ -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

4
lfs/ipfire-netboot
View File

@@ -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

4
lfs/syslinux
View File

@@ -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