[source] imagebuilder: fix bundling of DTS sources

[LEDE Commits]

jow pushed a commit to source.git, branch master:
https://git.lede-project.org/37e7a1734ff4fe8777ff24345dbd6135c188c61a

commit 37e7a1734ff4fe8777ff24345dbd6135c188c61a
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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index e8e4641..6ce57f3 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -16,7 +16,7 @@ IB_NAME:=$(VERSION_DIST_SANITIZED)-imagebuilder-$(if $(CONFIG_VERSION_FILENAMES)
 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_DTSDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))/arch/$(LINUX_KARCH)/boot/dts/
 IB_IDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(STAGING_DIR_IMAGE))
 
 all: compile
@@ -72,8 +72,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 \