diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-03-14 18:28:02 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-03-14 18:28:02 +0000 |
| commit | 23caa132da4f2fc81c38988c1349a1fb4810ded1 (patch) | |
| tree | 77cefd7a1f098f6c2e5dc5e18f13dd45ad6fac8e | |
| parent | acddc9f10db91bb44d12954859591ba961c7a953 (diff) | |
| download | midipix_build-23caa132da4f2fc81c38988c1349a1fb4810ded1.tar.bz2 midipix_build-23caa132da4f2fc81c38988c1349a1fb4810ded1.tar.xz | |
pkgtool.sh:pkgtoolp_mirror_fetch(): skip mirroring of Git URL(s) if ${PKG_MIRRORS_GIT} specifies `skip'.
subr.rtl/rtl_fetch.subr:rtlp_fetch_url_git(): skip attempting to use Git URL(s) mirror if ${_mirrors} specifies `skip'.
groups/120.native_runtime.group:{ntctty,psxscl{,_strace}}:${PKG_MIRRORS_GIT}: skip mirroring.
| -rw-r--r-- | groups/120.native_runtime.group | 3 | ||||
| -rwxr-xr-x | pkgtool.sh | 4 | ||||
| -rw-r--r-- | subr.rtl/rtl_fetch.subr | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/groups/120.native_runtime.group b/groups/120.native_runtime.group index 899bdbf8..de9ec681 100644 --- a/groups/120.native_runtime.group +++ b/groups/120.native_runtime.group @@ -28,6 +28,7 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_NTCTTY_DEPENDS:="dalist ldso ntapi pemagine"}; : ${PKG_NTCTTY_URLS_GIT:=ntctty=${DEFAULT_GITROOT_HEAD}/ntctty}; : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0}; +: ${PKG_NTCTTY_MIRRORS_GIT:="skip"}; : ${PKG_NTUX_DEPENDS:="dalist ldso ntapi pemagine psxscl"}; : ${PKG_NTUX_URLS_GIT:=ntux=${DEFAULT_GITROOT}/ntux}; : ${PKG_NTUX_CFLAGS_CONFIGURE_EXTRA:=-O0}; @@ -40,11 +41,13 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PSXSCL_URLS_GIT:=psxscl=${DEFAULT_GITROOT_HEAD}/psxscl}; : ${PKG_PSXSCL_CFLAGS_CONFIGURE_EXTRA:=-O0}; : ${PKG_PSXSCL_INSTALL_TARGET_EXTRA:=install-lib}; +: ${PKG_PSXSCL_MIRRORS_GIT:="skip"}; : ${PKG_PSXSCL_STRACE_DEPENDS:="dalist ldso ntapi pemagine psxtypes"}; : ${PKG_PSXSCL_STRACE_URLS_GIT:=psxscl=${DEFAULT_GITROOT_HEAD}/psxscl}; : ${PKG_PSXSCL_STRACE_BUILD_STEPS_DISABLE:=install_make}; : ${PKG_PSXSCL_STRACE_CFLAGS_CONFIGURE_EXTRA:="-DPSX_EXTENDED_STRACE -O0"}; : ${PKG_PSXSCL_STRACE_INSTALL_FILES:="/=lib/debug ../obj/lib/libpsxscl.so=lib/debug/"}; +: ${PKG_PSXSCL_STRACE_MIRRORS_GIT:="skip"}; : ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes}; : ${PKG_PSXTYPES_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"}; : ${PKG_PSXTYPES_IN_TREE:=1}; @@ -97,7 +97,9 @@ pkgtoolp_mirror_fetch() { fi; fi; elif _pkg_url="$(rtl_get_var_unsafe -u "PKG_${_pkg_name_real}_URLS_GIT")"; then - if [ "${_pkg_name}" != "${_pkg_name_real}" ]; then + if [ "$(rtl_get_var_unsafe -u "PKG_${_pkg_name_real}_MIRRORS_GIT")" = "skip" ]; then + _rc=0; rtl_log_msg warning "Package \`%s' specifies to skip Git URL(s) mirroring, skipping." "${_pkg_name}"; + elif [ "${_pkg_name}" != "${_pkg_name_real}" ]; then rtl_log_msg info "Mirroring package \`%s' (parent package: \`%s'), Git URL(s): \`%s'..." "${_pkg_name}" "${_pkg_name_real}" "${_pkg_url}"; if ! rtl_fileop ln_symbolic "${_pkg_name_real}" "${_mirror_dname_git}/${_pkg_name}"; then _rc=1; rtl_log_msg warning "Failed to create symbolic link \`%s' for package \`%s' w/ parent package \`%s'."\ diff --git a/subr.rtl/rtl_fetch.subr b/subr.rtl/rtl_fetch.subr index baa10073..b269b580 100644 --- a/subr.rtl/rtl_fetch.subr +++ b/subr.rtl/rtl_fetch.subr @@ -35,6 +35,8 @@ rtlp_fetch_url_git() { git submodule update) || return 1; else if git clone ${_git_args} -b "${_git_branch:-main}" "${_url}" "${_cache_dname}/${_subdir}"; then _clonefl=1; + elif [ "${_mirrors}" = "skip" ]; then + return 1; else for _url_base in ${_mirrors}; do if git clone ${_git_args} -b "${_git_branch:-main}" "${_url_base}/${_pkg_name}/${_url##*/}" "${_cache_dname}/${_subdir}"; then _clonefl=1; break; |