summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/macros.packages.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk
index e2face7..bf9c8fa 100644
--- a/mk/macros.packages.mk
+++ b/mk/macros.packages.mk
@@ -569,14 +569,15 @@ define __embtk_download_pkg_from_svn
endef
define __embtk_gitclone_pkg
- git clone $(__embtk_pkg_gitsite) $(__embtk_pkg_localgit)
- $(if $(findstring master,$(__embtk_pkg_gitbranch)),,
+ (git clone $(__embtk_pkg_gitsite) $(__embtk_pkg_localgit) && \
+ $(if $(findstring master,$(__embtk_pkg_gitbranch)),, \
cd $(__embtk_pkg_localgit); \
git checkout -b $(__embtk_pkg_gitbranch) \
- origin/$(__embtk_pkg_gitbranch))
- $(if $(findstring HEAD,$(__embtk_pkg_gitrev)),,
+ origin/$(__embtk_pkg_gitbranch) &&) \
+ $(if $(findstring HEAD,$(__embtk_pkg_gitrev)),, \
cd $(__embtk_pkg_localgit); \
- git reset --hard $(__embtk_pkg_gitrev))
+ git reset --hard $(__embtk_pkg_gitrev) &&) \
+ true)
endef
define __embtk_download_pkg_from_git