summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2019-12-24 23:02:28 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2019-12-24 23:02:28 +0000
commitadfcc4ec2f84dfe40a5f55daa9e6f77ccc5b1d49 (patch)
tree5f43688c6b9bdc0da70657c6fcc498e1ccfec138
parent730b175dc8decffe5a980e8ceca938dbfae20656 (diff)
downloadmidipix_build-adfcc4ec2f84dfe40a5f55daa9e6f77ccc5b1d49.tar.bz2
midipix_build-adfcc4ec2f84dfe40a5f55daa9e6f77ccc5b1d49.tar.xz
vars/build.vars:smallbasic:${PKG_DISABLE}: enabled.
subr/ex_rtl_fetch.subr:ex_rtl_fetch_urls_git(): run git-submodule(1) update --init post-checkout.
-rw-r--r--subr/ex_rtl_fetch.subr6
-rw-r--r--vars/build.vars1
2 files changed, 6 insertions, 1 deletions
diff --git a/subr/ex_rtl_fetch.subr b/subr/ex_rtl_fetch.subr
index 2468fb6b..3c3993d3 100644
--- a/subr/ex_rtl_fetch.subr
+++ b/subr/ex_rtl_fetch.subr
@@ -8,12 +8,16 @@ exp_rtl_fetch_url_git() {
if [ -e "${BUILD_DLCACHEDIR}/${_subdir}" ]; then
(ex_rtl_fileop cd "${BUILD_DLCACHEDIR}/${_subdir}" &&\
git pull ${DEFAULT_GIT_ARGS} origin "${_branch:-main}");
+ (ex_rtl_fileop cd "${BUILD_DLCACHEDIR}/${_subdir}" &&\
+ git submodule update);
else
git clone ${DEFAULT_GIT_ARGS} "${_url}" "${BUILD_DLCACHEDIR}/${_subdir}";
if [ -n "${_branch}" ]; then
(ex_rtl_fileop cd "${BUILD_DLCACHEDIR}/${_subdir}" &&\
git checkout "${_branch}");
fi;
+ (ex_rtl_fileop cd "${BUILD_DLCACHEDIR}/${_subdir}" &&\
+ git submodule update --init);
fi;
_oldpwd="${PWD}"; ex_rtl_fileop cd "${PKG_BASE_DIR}";
ex_rtl_fileop rm "${_tgtdir}/${_subdir}";
@@ -36,6 +40,8 @@ ex_rtl_fetch_urls_git() {
fi;
exp_rtl_fetch_url_git "${_tgtdir}" "${_subdir}" \
"${_url}" "${_git_branch}";
+ (ex_rtl_fileop cd "${BUILD_DLCACHEDIR}/${_subdir}" &&\
+ git submodule update --init);
done;
};
diff --git a/vars/build.vars b/vars/build.vars
index 843aadf3..0d1ca902 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1517,7 +1517,6 @@ bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils
: ${PKG_RUBY_MAKEFLAGS_BUILD:=-j1};
: ${PKG_SMALLBASIC_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"};
: ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
-: ${PKG_SMALLBASIC_DISABLE:=1};
: ${PKG_SMALLBASIC_IN_TREE:=1};
: ${PKG_TK_SHA256SUM:=131e4bae43a15dff0324c0479358bb42cfd7b8de0e1ca8d93c9207643c7144dd};
: ${PKG_TK_VERSION:=8.7a1};