diff options
| -rwxr-xr-x | build.sh | 9 | ||||
| -rw-r--r-- | etc/build.usage | 2 | ||||
| -rw-r--r-- | vars/build.vars | 10 |
3 files changed, 12 insertions, 9 deletions
@@ -33,7 +33,7 @@ case ${1} in if [ -z "${ARG_RESTART_AT}" ]; then ARG_RESTART_AT=ALL; fi; shift; ;; -init|host_toolchain|native_toolchain|runtime|lib_packages|leaf_packages|devroot|world) +host_toolchain|native_toolchain|runtime|lib_packages|leaf_packages|devroot|world) BUILD_TARGETS_META="${BUILD_TARGETS_META:+${BUILD_TARGETS_META} }${1}"; ;; *=*) set_var_unsafe "${1%%=*}" "${1#*=}"; ;; *) exec cat etc/build.usage; ;; @@ -43,6 +43,7 @@ source_vars; clear_env; if [ -z "${BUILD_TARGETS_META}" ]; then BUILD_TARGETS_META=world; fi; +BUILD_TARGETS_META="invariants ${BUILD_TARGETS_META}"; # # Check whether the pathnames in build.vars contain non-empty valid values. @@ -64,7 +65,8 @@ for BUILD_TARGET_LC in $(subst_tgts ${BUILD_TARGETS_META}); do BUILD_TARGET=$(echo ${BUILD_TARGET_LC} | tr a-z A-Z); for BUILD_PACKAGE_LC in $(get_var_unsafe ${BUILD_TARGET}_PACKAGES); do BUILD_PACKAGE=$(echo ${BUILD_PACKAGE_LC} | tr a-z A-Z); - if [ -n "${ARG_RESTART}" ]; then + if [ "${BUILD_TARGET}" != "INVARIANTS" ]\ + && [ -n "${ARG_RESTART}" ]; then if [ "${ARG_RESTART}" != "ALL" ] &&\ ! match_list ${ARG_RESTART} , ${BUILD_PACKAGE_LC}; then log_msg vnfo "Skipped \`${BUILD_PACKAGE_LC}' (-r specified.)"; @@ -86,7 +88,8 @@ for BUILD_TARGET_LC in $(subst_tgts ${BUILD_TARGETS_META}); do fi; continue; fi; - if [ -z "${ARG_RESTART}" ]\ + if [ "${BUILD_TARGET}" != "INVARIANTS" ]\ + && [ -z "${ARG_RESTART}" ]\ && is_build_script_done finish "${BUILD_PACKAGE_LC}"; then log_msg vnfo "Skipped \`${BUILD_PACKAGE_LC}' (already built.)"; : $((BUILD_NSKIP+=1)); BUILD_SCRIPT_RC=0; continue; diff --git a/etc/build.usage b/etc/build.usage index ca854028..a2bc2b1e 100644 --- a/etc/build.usage +++ b/etc/build.usage @@ -22,7 +22,7 @@ usage: ./build.sh [-x] [-a nt32|nt64] [-b debug|release] [-c] [-C] [-h] with GPG; the default compression is xz. -v Be verbose; this currently only affects secure_{cd,rm}() and insecure_mkdir(). <target>[ ...] One of: - init, host_toolchain, native_toolchain, runtime, lib_packages, + host_toolchain, native_toolchain, runtime, lib_packages, leaf_packages, world, or devroot. ${HOME}/midipix_build.vars, ../midipix_build.vars, and build.vars are sourced diff --git a/vars/build.vars b/vars/build.vars index 87b08ae4..6df53ce2 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -74,9 +74,9 @@ fi; export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; # -# Build target init +# Build target invariants # -INIT_PACKAGES="chainport"; +INVARIANTS_PACKAGES="chainport"; : ${PKG_CHAINPORT_URL:=${GITROOT}/ports/chainport}; : ${PKG_CHAINPORT_URL_TYPE:=git}; : ${PKG_CHAINPORT_BUILD_DIR:=chainport}; @@ -719,8 +719,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; # # Build meta-targets # -DEVROOT_PACKAGES="init host_toolchain native_toolchain runtime"; -WORLD_PACKAGES="init host_toolchain native_toolchain runtime lib_packages leaf_packages"; -ALL_TARGETS="init host_toolchain native_toolchain runtime lib_packages leaf_packages devroot world"; +DEVROOT_PACKAGES="host_toolchain native_toolchain runtime"; +WORLD_PACKAGES="host_toolchain native_toolchain runtime lib_packages leaf_packages"; +ALL_TARGETS="host_toolchain native_toolchain runtime lib_packages leaf_packages devroot world"; # vim:filetype=sh textwidth=0 |