flash-image+cdrom: Execute ARMv5-specific code on ARMv5
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 13 Jun 2018 22:21:58 +0000 (23:21 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 14 Jul 2018 12:43:52 +0000 (13:43 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/cdrom
lfs/flash-images

index 7150153..f677493 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -45,7 +45,7 @@ ISO_ARGS = -J -r -v \
        -c boot/isolinux/boot.catalog
 
 # Only build a stub ISO for ARM
-ifeq "$(BUILD_PLATFORM)" "arm"
+ifeq "$(BUILD_ARCH)" "armv5tel"
        ISO_ARGS = -J -r -V "$(NAME) $(VERSION) $(BUILD_ARCH)"
 endif
 
@@ -112,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Make the ISO
        mkdir -p /install/cdrom/boot/isolinux
        dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
-ifneq "$(BUILD_PLATFORM)" "arm"
+ifneq "$(BUILD_ARCH)" "armv5tel"
        cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
        dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
        cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
index 5134fd6..24cf327 100644 (file)
@@ -59,7 +59,7 @@ MNThdd   := /install/harddisk
 IMG      := /install/images/image.img
 
 # All sizes in blocks
-ifeq "$(BUILD_PLATFORM)" "arm"
+ifeq "$(BUILD_ARCH)" "armv5tel"
  BOOTLOADER =
  S_OFFSET = 8192