[source] imagebuilder: fix bundling of DTS sources

[LEDE Commits]

jow pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/379155dc0fcfb00bdbb75c3d0d27d66a81692e43

commit 379155dc0fcfb00bdbb75c3d0d27d66a81692e43
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Sun May 14 20:45:06 2017 +0200

    imagebuilder: fix bundling of DTS sources
    
    Refer to LINUX_KARCH instead of ARCH when bundling DTS files in the image
    builder tarball.
    
    While we're at it, also dereference symbolic links when copying as some
    kernel architectures contain symbolic links in their DTS directories.
    
    This fixes aarch64 imagebuilders such as brcm2708/bcm2710 ones in particular
    as the kernel refers to "aarch64" as "arm64" internally.
    
    Ref: https://forum.lede-project.org/t/lede-image-builder-problem/3680
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 target/imagebuilder/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index d891aab..eb55ee8 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -18,6 +18,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
 IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR))
 IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))
 IB_DTSDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))/arch/$(ARCH)/boot/dts/
+IB_IDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(STAGING_DIR_IMAGE))
 
 all: compile
 
@@ -72,8 +73,8 @@ endif
 		$(INSTALL_DIR) $(IB_LDIR)/scripts/dtc; \
 		$(INSTALL_BIN) $(LINUX_DIR)/scripts/dtc/dtc $(IB_LDIR)/scripts/dtc/dtc; \
 	fi
-	if [ -d $(LINUX_DIR)/arch/$(ARCH)/boot/dts ]; then \
-		$(CP) $(LINUX_DIR)/arch/$(ARCH)/boot/dts/* $(IB_DTSDIR); \
+	if [ -d $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts ]; then \
+		$(CP) -L $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts/* $(IB_DTSDIR); \
 	fi
 	$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(PKG_BUILD_DIR)/include/version.mk
 	find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \