diff options
| -rwxr-xr-x | build.sh | 11 | ||||
| -rw-r--r-- | etc/build.usage | 2 | ||||
| -rw-r--r-- | vars/build.vars | 30 | ||||
| -rw-r--r-- | vars/invariants_digest.vars (renamed from vars/dist_digest.vars) | 8 | ||||
| -rw-r--r-- | vars/invariants_gitref.vars (renamed from vars/dist_gitref.vars) | 2 | ||||
| -rw-r--r-- | vars/invariants_tarballs.vars (renamed from vars/dist_tarballs.vars) | 8 |
6 files changed, 35 insertions, 26 deletions
@@ -30,6 +30,9 @@ buildp_dispatch() { break; fi; done; + if ! ex_pkg_dispatch "invariants" "ALL" "ALL" buildp_dispatch; then + break; + fi; buildp_dispatch finish_build; ;; finish_build) build_fini; ex_rtl_log_msg info "${BUILD_NFINI} finished, ${BUILD_NSKIP} skipped, and ${BUILD_NFAIL} failed builds in ${BUILD_NBUILT} build script(s)."; @@ -86,14 +89,6 @@ buildp_dispatch() { PKG_BUILD_STEPS="$(ex_rtl_lfilter_not \ "${PKG_BUILD_STEPS}" "fetch_git fetch_wget")"; fi; - if [ -z "${ARG_TARBALL}" ]; then - case "${_pkg_name}" in - dist_digest) exit 0; ;; - dist_tarballs) exit 0; ;; - esac; - elif [ "${_pkg_name}" = "dist_tarballs" ]; then - ex_pkg_state_set "${_pkg_name}" -all -finish; - fi; if [ "${ARG_XTRACE:-0}" -eq 1 ]; then set -o xtrace; fi; ;; diff --git a/etc/build.usage b/etc/build.usage index be9df11e..3522e9ad 100644 --- a/etc/build.usage +++ b/etc/build.usage @@ -43,7 +43,7 @@ usage: ./build.sh [-4|6] [-a nt32|nt64] [-b debug|release] host or host_tools, host_toolchain_deps, host_toolchain, host_toolchain_mingw32, native or native_tools, native_toolchain_deps, native_toolchain, native_toolchain_mingw32, native_runtime, packages_deps or host_packages_deps, native_packages_deps, native_packages_deps_x11, - packages or native_packages, or dist, dist_minipix, or dist_target. + packages or native_packages, or dist. ${HOME}/midipix_build.vars will be sourced if present. diff --git a/vars/build.vars b/vars/build.vars index 39ed6e75..4f4047cc 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1138,18 +1138,18 @@ NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}"; NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python"; # -# Build target dist_minipix +# Build target minipix # -DIST_MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; -DIST_MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; -DIST_MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; -DIST_MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix="; -DIST_MINIPIX_PACKAGES=" +MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; +MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; +MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; +MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix="; +MINIPIX_PACKAGES=" bzip2_minipix gzip_minipix xz_minipix bash_minipix coreutils_minipix dash_minipix nano_minipix tar_minipix mintty_minipix ntctty_minipix ptycon_minipix"; -DIST_MINIPIX_PARALLELISE=1; -DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist"; +MINIPIX_PARALLELISE=1; +MINIPIX_PREFIX="${PREFIX}/minipix_dist"; : ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2}; : ${PKG_BZIP2_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/bzip2-build-minipix}; : ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"}; @@ -1201,10 +1201,16 @@ DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist"; : ${PKG_PTYCON_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; # -# Build target dist_target +# Build target dist # -DIST_TARGET_NO_LOG_VARS=1; -DIST_TARGET_PACKAGES="dist_minipix_dist dist_etc dist_digest dist_gitref dist_tarballs"; +DIST_NO_LOG_VARS=1; +DIST_PACKAGES="dist_minipix_dist dist_etc"; + +# +# Build target invariants +# +INVARIANTS_NO_LOG_VARS=1; +INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_tarballs"; # # Build targets @@ -1214,6 +1220,6 @@ host_tools host_toolchain_deps host_toolchain host_toolchain_mingw32 native_tools native_toolchain_deps native_toolchain native_toolchain_mingw32 native_runtime host_packages_deps native_packages_deps native_packages_deps_x11 native_packages -dist_minipix dist_target"; +minipix dist"; # vim:filetype=sh textwidth=0 diff --git a/vars/dist_digest.vars b/vars/invariants_digest.vars index d831beb9..9d29d59f 100644 --- a/vars/dist_digest.vars +++ b/vars/invariants_digest.vars @@ -2,9 +2,13 @@ # set -o errexit -o noglob are assumed. # -pkg_dist_digest_all() { +pkg_invariants_digest_all() { local __; - ex_rtl_log_msg info "Compiling SHA256 sums..."; + if [ -z "${ARG_TARBALL}" ]; then + exit 0; + else + ex_rtl_log_msg info "Compiling SHA256 sums..."; + fi; if [ -e "${PREFIX}/SHA256SUMS" ]; then ex_rtl_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last"; fi; diff --git a/vars/dist_gitref.vars b/vars/invariants_gitref.vars index 4ebab3db..7af5c4a3 100644 --- a/vars/dist_gitref.vars +++ b/vars/invariants_gitref.vars @@ -2,7 +2,7 @@ # set -o errexit -o noglob are assumed. # -pkg_dist_gitref_all() { +pkg_invariants_gitref_all() { (ex_rtl_fileop cd "${MIDIPIX_BUILD_PWD}" && git rev-parse HEAD > "${PREFIX}/build.gitref"); }; diff --git a/vars/dist_tarballs.vars b/vars/invariants_tarballs.vars index a63bc0f2..3516b79a 100644 --- a/vars/dist_tarballs.vars +++ b/vars/invariants_tarballs.vars @@ -64,8 +64,12 @@ pkgp_dist_tarball_src() { fi; }; -pkg_dist_tarballs_all() { - ex_rtl_log_msg info "Building distribution tarballs..."; +pkg_invariants_tarballs_all() { + if [ -z "${ARG_TARBALL}" ]; then + exit 0; + else + ex_rtl_log_msg info "Building distribution tarballs..."; + fi; case "${DEFAULT_TARBALL_SUFFIX}" in bz2) if [ -n "$(which pbzip2 2>/dev/null)" ]; then TARBALL_COMPRESS_CMD="pbzip2"; |