From 8227a8007a09ebb8a8780a79e15846c535de5397 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: Dec 03 2017 16:47:31 +0000 Subject: etc/build.usage: update. subr/ex_pkg_dispatch.subr:ex_pkg_dispatch(): reimplement -r ALL. --- diff --git a/etc/build.usage b/etc/build.usage index 6976122..9280be5 100644 --- a/etc/build.usage +++ b/etc/build.usage @@ -33,11 +33,7 @@ usage: ./build.sh [-4|6] [-a nt32|nt64] [-b debug|release] packages or native_packages_cmdline, native_packages_dev, native_packages_etc, native_packages_inet, or dist, dist_minipix, or dist_target. - ${HOME}/midipix_build.vars, ../midipix_build.vars, and build.vars are sourced - if they exist. - - Packages that are built by pkg.build will apply local patches in ${BUILD_WORKDIR} - named ${PKG_SUBDIR}.local.patch. + ${HOME}/midipix_build.vars will be sourced if present. Examples: ./build.sh -r coreutils @@ -46,10 +42,10 @@ usage: ./build.sh [-4|6] [-a nt32|nt64] [-b debug|release] ./build.sh -r coreutils:configure,build,install Restart the configure, build, and install steps of the coreutils build. - ./build.sh -r psxscl GITROOT_HEAD=... PKG_PSXSCL_CFLAGS_CONFIGURE_EXTRA=-DPSX_INTERNAL_STRACE + ./build.sh -r psxscl DEFAULT_GITROOT_HEAD=... PKG_PSXSCL_CFLAGS_CONFIGURE_EXTRA=-DPSX_INTERNAL_STRACE Build psxscl from the internal repository with strace enabled. - ./build.sh -c -r ALL GITROOT_HEAD=... + ./build.sh -c -r ALL DEFAULT_GITROOT_HEAD=... Clean ${PREFIX} and forcibly rebuild everything. This script has been tested on the following platforms: diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr index 90a2371..ad41616 100644 --- a/subr/ex_pkg_dispatch.subr +++ b/subr/ex_pkg_dispatch.subr @@ -12,7 +12,8 @@ ex_pkg_dispatch() { _tgt_name_uc="$(ex_rtl_toupper "${_tgt_name}")"; "${_dispatch_fn}" start_target "" "${_tgt_name}"; _pkg_names="$(ex_rtl_get_var_unsafe ${_tgt_name_uc}_PACKAGES)"; - if [ -n "${_restart}" ]; then + if [ -n "${_restart}" ]\ + && [ "${_restart}" != ALL ]; then _pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_restart}")"; fi; for _pkg_name in ${_pkg_names}; do