diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 5bd703869c..c12f59febe 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -151,13 +151,13 @@ ROOTFS_ISO9660_GRUB2_EFI_CONFIG_PATH = $(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS ifeq ($(BR2_ARCH_IS_64),y) # Backup 64-bit bootloader for use with future 32-bit builds -define ROOTFS_ISO9660_BACKUP_X64_EFI +define ROOTFS_ISO9660_BACKUP_RESTORE_X64_EFI $(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi \ $(TOPDIR)/board/shredos/bootx64.efi endef else # We are building for 32-bit, but also add the 64-bit bootloader -define ROOTFS_ISO9660_RESTORE_X64_EFI +define ROOTFS_ISO9660_BACKUP_RESTORE_X64_EFI $(INSTALL) -D -m 0644 $(TOPDIR)/board/shredos/bootx64.efi \ $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi $(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi \ @@ -169,8 +169,7 @@ define ROOTFS_ISO9660_INSTALL_GRUB2_EFI # Install memtest binaries to ISO9660 filesystem $(ROOTFS_ISO9660_COPY_MEMTEST_BINARIES) # Either backup or restore the 64-bit bootloader - $(ROOTFS_ISO9660_BACKUP_X64_EFI) - $(ROOTFS_ISO9660_RESTORE_X64_EFI) + $(ROOTFS_ISO9660_BACKUP_RESTORE_X64_EFI) # Create file to better find ISO9660 filesystem $(INSTALL) -D -m 0644 /dev/null \ $(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE) @@ -276,13 +275,13 @@ endef ifeq ($(BR2_ARCH_IS_64),y) # Backup 64-bit bootloader for use with future 32-bit builds -define ROOTFS_ISO9660_BACKUP_X64_EFI +define ROOTFS_ISO9660_BACKUP_RESTORE_X64_EFI $(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi \ $(TOPDIR)/board/shredos/bootx64.efi endef else # We are building for 32-bit, but also add the 64-bit bootloader -define ROOTFS_ISO9660_RESTORE_X64_EFI +define ROOTFS_ISO9660_BACKUP_RESTORE_X64_EFI $(INSTALL) -D -m 0644 $(TOPDIR)/board/shredos/bootx64.efi \ $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi $(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_EFI_PARTITION_CONTENT)/$(ROOTFS_ISO9660_GRUB2_EFI_PREFIX)/bootx64.efi \ @@ -294,8 +293,7 @@ define ROOTFS_ISO9660_INSTALL_GRUB2_EFI # Install memtest binaries to ISO9660 filesystem $(ROOTFS_ISO9660_COPY_MEMTEST_BINARIES) # Either backup or restore the 64-bit bootloader - $(ROOTFS_ISO9660_BACKUP_X64_EFI) - $(ROOTFS_ISO9660_RESTORE_X64_EFI) + $(ROOTFS_ISO9660_BACKUP_RESTORE_X64_EFI) # Create file to better find ISO9660 filesystem $(INSTALL) -D -m 0644 /dev/null \ $(ROOTFS_ISO9660_TMP_TARGET_DIR)/$(ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE)