hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: add support for git submodules with CONFIG_SRC_TREE_OVERRIDE 

Also work around an issue where git would store the modified workdir in
the submodule git config files

Signed-off-by: Felix Fietkau <nbd@nbd.name>
openwrt-18.06
Felix Fietkau 2018-04-25 11:52:20 +02:00
parent 41ab276fe4
commit 6fa88be486
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/package.mk
View File

@ -120,7 +120,12 @@ ifdef USE_GIT_TREE
define Build/Prepare/Default define Build/Prepare/Default
mkdir -p $(PKG_BUILD_DIR) mkdir -p $(PKG_BUILD_DIR)
ln -s $(CURDIR)/git-src $(PKG_BUILD_DIR)/.git ln -s $(CURDIR)/git-src $(PKG_BUILD_DIR)/.git
( cd $(PKG_BUILD_DIR); git checkout .) ( cd $(PKG_BUILD_DIR); \
git checkout .; \
git submodule update --recursive; \
git submodule foreach git config --unset core.worktree; \
git submodule foreach git checkout .; \
)
endef endef
endif endif
ifdef USE_SOURCE_DIR ifdef USE_SOURCE_DIR