From 8b8f9004f475d29c14347af3764dd766417e0ee9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 2 May 2014 19:10:28 +0200 Subject: [PATCH] boot/syslinux: prepare to install non-core images Currently, we hard-code the path to the images we install, and expect them to be from the core/ sub-dir. Not all images we can install are located in core/. For example, the efi boot images (to come later) are not located in core/. Prepare the upcoming installation of extlinux by not expecting images be in core/. Signed-off-by: "Yann E. MORIN" Cc: Thomas Lundquist Cc: Frank Hunleth Tested-by: Frank Hunleth Tested-by: Romain Naour Signed-off-by: Peter Korsgaard --- boot/syslinux/syslinux.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 0faa81f6e2..a1eb394018 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -28,12 +28,12 @@ define SYSLINUX_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALLROOT=$(HOST_DIR) install endef -SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += isolinux.bin -SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += pxelinux.bin +SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += core/isolinux.bin +SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += core/pxelinux.bin define SYSLINUX_INSTALL_IMAGES_CMDS for i in $(SYSLINUX_IMAGES-y); do \ - $(INSTALL) -D -m 0755 $(@D)/core/$$i $(BINARIES_DIR)/$$i; \ + $(INSTALL) -D -m 0755 $(@D)/$$i $(BINARIES_DIR)/$${i##*/}; \ done endef