pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

git-package.mk: Fix updating branch with submodules



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Dec 11 01:11:19 2015 +0100
Changeset:	d83e7d35bb03d0d86e38b94d9c2a1f63e9733444

Modified Files:
	mk/git-package.mk

Log Message:
git-package.mk: Fix updating branch with submodules

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d83e7d35bb03d0d86e38b94d9c2a1f63e9733444

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mk/git-package.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diffs:
diff --git a/mk/git-package.mk b/mk/git-package.mk
index 48c5da9..3962d8c 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -122,7 +122,10 @@ _GIT_FETCH_REPO.${repo}=	\
 	  fetch ${_GIT_FETCH_FLAGS};						\
 	${STEP_MSG} "Checking out GIT "${_GIT_FLAG.${repo}:Q}".";		\
 	${SETENV} ${_GIT_ENV} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}		\
-	  checkout ${_GIT_CHECKOUT_FLAGS} ${_GIT_FLAG.${repo}:Q}
+	  checkout ${_GIT_CHECKOUT_FLAGS} ${_GIT_FLAG.${repo}:Q};		\
+	${STEP_MSG} "Updating submodules of "${_GIT_FLAG.${repo}:Q}".";		\
+	${SETENV} ${_GIT_ENV} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}		\
+	  submodule update --recursive
 .endfor
 
 pre-extract: do-git-extract


Home | Main Index | Thread Index | Old Index