aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dickinson <lede@cshore.thecshore.com>2016-09-29 04:14:17 -0400
committerJohn Crispin <john@phrozen.org>2016-09-30 00:39:25 +0200
commit71370d2c5543b3073653b601aba26078fdbab682 (patch)
treef33ca57ac0c120f3c6e6de7bc7ec641a9eff8f21
parentc3d3111831d49d1ab37d90bbe6a61f1b2263721d (diff)
downloadupstream-71370d2c5543b3073653b601aba26078fdbab682.tar.gz
upstream-71370d2c5543b3073653b601aba26078fdbab682.tar.bz2
upstream-71370d2c5543b3073653b601aba26078fdbab682.zip
target/{sdk,imagebuild}: Fix for symlink-tree
With symlink tree some directories are just symlinked which means IB and SDK end up with a symlink instead of an actual directory; this fixes the missing files by dereferencesing the directories instead of copying the symlinks. Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
-rw-r--r--target/imagebuilder/Makefile2
-rw-r--r--target/sdk/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 4b61963b0a..b809193db3 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -26,7 +26,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host/lib \
$(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts $(IB_DTSDIR)
-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
- $(CP) \
+ $(CP) -L \
$(INCLUDE_DIR) $(SCRIPT_DIR) \
$(TOPDIR)/rules.mk \
./files/Makefile \
diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 4607535292..77695ee285 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -67,7 +67,7 @@ all: compile
$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
- $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
+ $(CP) -L $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
$(TAR) -cf - -C $(TOPDIR) \
`cd $(TOPDIR); find $(KDIR_BASE) -name \*.ko` \
`cd $(TOPDIR); find $(KDIR_BASE)/firmware/ -newer $(KDIR_BASE)/firmware/Makefile \