etc/build.usage, subr/build_{args,checks}.subr: merges -c into -C as -C prefix.

etc/build.usage, subr/build_{args,init}.subr: merges -[46N] into -F as ipv4|ipv6|offline.
subr/ex_rtl_fetch.subr: honour ${{ARG_FETCH_FORCE,DEFAULT_GIT_ARGS}}.
subr/pkg_install_strip.subr: correctly strip non-release build binaries.
subr/pkg_install_strip.subr:pkg_install_strip(): honour ${ARG_DEBUG_MINIPIX}.
vars/env.vars, subr/pkg_fetch_{download,git,wget}.subr: merges fetch_{git,wget} into fetch_download.
vars/midipix.vars: adds ${DEFAULT_GIT_ARGS}.
vars/{musl,python[23]{,_host}}.vars: updated concerning fetch_download.

7 files changed, 21 insertions, 20 deletions

diff --git a/vars/env.vars b/vars/env.vars
index 1f1c7f1e..7e7b6d50 100644
--- a/vars/env.vars
+++ b/vars/env.vars
@@ -1,5 +1,5 @@
 DEFAULT_BUILD_STEPS="
-	fetch_wget fetch_git fetch_extract fetch						\
+	fetch_download fetch_extract 								\
 	configure_patch_pre configure_autotools configure_patch configure			\
 	build											\
 	install_subdirs install_make install_files install_libs					\
diff --git a/vars/midipix.vars b/vars/midipix.vars
index 55df1d79..471670ca 100644
--- a/vars/midipix.vars
+++ b/vars/midipix.vars
@@ -51,6 +51,7 @@
 : ${DEFAULT_GITROOT_HEAD:=git://midipix.org};
 : ${DEFAULT_MAKE_INSTALL_VNAME:=DESTDIR};
 : ${DEFAULT_MAKEFLAGS_BUILD:=-j${DEFAULT_BUILD_CPUS}};
+: ${DEFAULT_GIT_ARGS:=""};
 : ${DEFAULT_WGET_ARGS:="--no-check-certificate"};
 
 # Target-relative defaults
diff --git a/vars/musl.vars b/vars/musl.vars
index 97ee5cc5..5b2b984d 100644
--- a/vars/musl.vars
+++ b/vars/musl.vars
@@ -2,22 +2,22 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkgp_mmglue_fetch_git() {
+pkgp_mmglue_fetch_download() {
 	ex_rtl_fileop rm "${PKG_BASE_DIR}/mmglue";
 	ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "mmglue=${DEFAULT_GITROOT}/mmglue@main";
-	ex_pkg_state_set "${PKG_NAME}" fetch -extract;
+	ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
 };
 
-pkg_musl_no_complex_host_fetch_git() {
-	pkgp_mmglue_fetch_git
-}
+pkg_musl_full_fetch_download() {
+	pkgp_mmglue_fetch_download;
+};
 
-pkg_musl_full_host_fetch_git() {
-	pkgp_mmglue_fetch_git
-}
+pkg_musl_full_host_fetch_download() {
+	pkgp_mmglue_fetch_download;
+};
 
-pkg_musl_full_fetch_git() {
-	pkgp_mmglue_fetch_git
-}
+pkg_musl_no_complex_host_fetch_download() {
+	pkgp_mmglue_fetch_download;
+};
 
 # vim:filetype=sh
diff --git a/vars/python2.vars b/vars/python2.vars
index aee9d6c6..6e13843e 100644
--- a/vars/python2.vars
+++ b/vars/python2.vars
@@ -2,10 +2,10 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_python2_fetch_git() {
+pkg_python2_fetch_download() {
 	ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython2";
 	ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main";
-	ex_pkg_state_set "${PKG_NAME}" fetch -extract;
+	ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
 };
 
 # vim:filetype=sh
diff --git a/vars/python2_host.vars b/vars/python2_host.vars
index 99f79636..c6343f20 100644
--- a/vars/python2_host.vars
+++ b/vars/python2_host.vars
@@ -2,10 +2,10 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_python2_host_fetch_git() {
+pkg_python2_host_fetch_download() {
 	ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython2";
 	ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main";
-	ex_pkg_state_set "${PKG_NAME}" fetch -extract;
+	ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
 };
 
 # vim:filetype=sh
diff --git a/vars/python3.vars b/vars/python3.vars
index da82bfcd..100a1b05 100644
--- a/vars/python3.vars
+++ b/vars/python3.vars
@@ -2,10 +2,10 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_python3_fetch_git() {
+pkg_python3_fetch_download() {
 	ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython3";
 	ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main";
-	ex_pkg_state_set "${PKG_NAME}" fetch -extract;
+	ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
 };
 
 # vim:filetype=sh
diff --git a/vars/python3_host.vars b/vars/python3_host.vars
index f0063efe..f2c72716 100644
--- a/vars/python3_host.vars
+++ b/vars/python3_host.vars
@@ -2,10 +2,10 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_python3_host_fetch_git() {
+pkg_python3_host_fetch_download() {
 	ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython3";
 	ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main";
-	ex_pkg_state_set "${PKG_NAME}" fetch -extract;
+	ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
 };
 
 # vim:filetype=sh