diff options
| -rw-r--r-- | mk/fetch.mk | 8 | ||||
| -rwxr-xr-x | scripts/prereq.sh | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mk/fetch.mk b/mk/fetch.mk index c0698f6fa..cfc681d9c 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -68,15 +68,15 @@ $(1): echo "Using git ${PKG_GIT}: $${PKG_VERSION}" $(DL_TRACE); \ case "$${PKG_GIT}" in \ tag|branch) \ - git clone --depth 1 --branch $${PKG_VERSION} $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \ + git clone --depth 1 --branch $${PKG_VERSION} $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \ ;; \ hash) \ - git clone $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \ - (cd $${PKG_NAME}-$${PKG_VERSION}; git checkout $(GITOPTS) $${PKG_VERSION}) $(DL_TRACE); \ + git clone $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \ + (cd $${PKG_NAME}-$${PKG_VERSION}; git checkout $${PKG_VERSION}) $(DL_TRACE); \ ;; \ esac ;\ else \ - git clone --depth 1 $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \ + git clone --depth 1 $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \ fi; \ tar cJf $${PKG_NAME}-$${PKG_VERSION}.tar.xz $${PKG_NAME}-$${PKG_VERSION}; \ touch $$$${filename}.nohash; \ diff --git a/scripts/prereq.sh b/scripts/prereq.sh index 8d8da4f68..d4212ec93 100755 --- a/scripts/prereq.sh +++ b/scripts/prereq.sh @@ -338,8 +338,7 @@ echo 'LC_ALL:=C' >> $topdir/prereq.mk echo "_PATH:=$PATH" >> $topdir/prereq.mk echo "PATH:=${topdir}/scripts:/usr/sbin:$PATH" >> $topdir/prereq.mk echo "GIT:=$(which git 2>/dev/null)" >> $topdir/prereq.mk -echo "GITOPTS:=" >> $topdir/prereq.mk -echo "export ADK_TOPDIR GIT GITOPTS SHA256 BASH SHELL" >> $topdir/prereq.mk +echo "export ADK_TOPDIR GIT SHA256 BASH SHELL" >> $topdir/prereq.mk # create temporary Makefile cat >Makefile.tmp <<'EOF' |