> -----Original Message----- > From: Felix Fietkau [mailto:n...@openwrt.org] > Sent: Wednesday, July 15, 2015 04:09 > To: Darik Horn <dajh...@vanadac.com>; openwrt-devel@lists.openwrt.org > Subject: Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages > > Patch is badly whitespace mangled and does not apply.
Okay, I've rebased the this patch to HEAD and am resending it with a different MUA. (First Gmail, now Outlook.) The topic branch is also available at: * https://github.com/dajhorn/openwrt/tree/patchwork_472796 $ git pull https://github.com/dajhorn/openwrt.git patchwork_472796 >From 5a3fd904c3c03ac5f4c88de2d409bb39120c86c6 Mon Sep 17 00:00:00 2001 From: Darik Horn <dajh...@vanadac.com> Date: Fri, 15 May 2015 09:47:34 -0400 Subject: [PATCH] buildroot: improve git submodule handling for packages Move the `--recursive` switch from `git clone` to `git submodule` so that submodules are cloned for upstream branches where the PKG_SOURCE_VERSION commit-ish has a different .gitmodules configuration than the repository default. This is, for example, required when the master branch for a source package does not use submodules, but its topic branch for OpenWRT does. This changes the buildroot dependency from git-1.6.2 to git 1.7.12.2, which was released September 2012. Signed-off-by: Darik Horn <dajh...@vanadac.com> --- include/download.mk | 5 +++-- include/prereq-build.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/download.mk b/include/download.mk index adaa2e6..d593344 100644 --- a/include/download.mk +++ b/include/download.mk @@ -88,8 +88,9 @@ define DownloadMethod/git cd $(TMP_DIR)/dl && \ rm -rf $(SUBDIR) && \ [ \! -d $(SUBDIR) ] && \ - git clone $(URL) $(SUBDIR) --recursive && \ - (cd $(SUBDIR) && git checkout $(VERSION) && git submodule update) && \ + git clone $(URL) $(SUBDIR) && \ + (cd $(SUBDIR) && git checkout $(VERSION) && \ + git submodule update --init --recursive) && \ echo "Packing checkout..." && \ rm -rf $(SUBDIR)/.git && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 211201a..c06adaf 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -144,8 +144,8 @@ $(eval $(call SetupHostCommand,python,Please install Python 2.x, \ $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \ svn --version | grep Subversion)) -$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.6.5, \ - git clone 2>&1 | grep -- --recursive)) +$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \ + git submodule update --help 2>&1 | grep -- --recursive)) $(eval $(call SetupHostCommand,file,Please install the 'file' package, \ file --version 2>&1 | grep file)) -- 1.9.1
0001-buildroot-improve-git-submodule-handling-for-package.patch
Description: Binary data
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
