From: Petr Štetiar Date: Thu, 24 Mar 2022 05:52:37 +0000 (+0100) Subject: imagebuilder: fix broken image generation with external targets X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3008f1f441a41e162311cee1ccadfdaaec1581c1;p=openwrt%2Fstaging%2Frmilecki.git imagebuilder: fix broken image generation with external targets When using external targets there is a symlink being created for the target under target/linux which then becomes dangling under Image Builder. Fix it by dereferencing the possible symlink. Tested on IB with external target, ipq40xx and mvebu. Signed-off-by: Petr Štetiar (cherry picked from commit 621f39d1f438bf95dbae667c575926fa16a6d797) (cherry picked from commit ec9af870f3278f75549836b469baefa260e2ed41) --- diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 8607a2d7094..3bbadc7204d 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -78,7 +78,7 @@ ifneq ($(CONFIG_SIGNATURE_CHECK),) $(CP) -L $(STAGING_DIR_ROOT)/usr/sbin/opkg-key $(PKG_BUILD_DIR)/scripts/ endif - $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ + $(CP) -L $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \ $(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/host/lib; \ fi