[source] target/{sdk,imagebuild}: Fix for symlink-tree
LEDE Commits
lede-commits at lists.infradead.org
Fri Sep 30 01:16:11 PDT 2016
blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/71370d2c5543b3073653b601aba26078fdbab682
commit 71370d2c5543b3073653b601aba26078fdbab682
Author: Daniel Dickinson <lede at cshore.thecshore.com>
AuthorDate: Thu Sep 29 04:14:17 2016 -0400
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 at cshore.thecshore.com>
---
target/imagebuilder/Makefile | 2 +-
target/sdk/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 4b61963..b809193 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 4607535..77695ee 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 \
More information about the lede-commits
mailing list