From f42965c7189c8fbbce85f268a96a94a504de9737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Tue, 19 Jul 2016 08:32:07 +0000 Subject: - Additionally install ncursesw and ntctty into ${PREFIX_MINIPIX} and create Minipix tarball in 999.tarballs.build which solely contains ${PREFIX_MINIPIX}. - Adds {bash,coreutils}_static which are linked statically and installed to ${PREFIX_MINIPIX} as opposed to {bash_coreutils} which are not linked statically and installed to ${PREFIX_NATIVE}. - Adds file v5.28. - Add support for ${PREFIX_MINIPIX} to midipix.sh (either automatically detected or specified via -m.) - Adds verbosity flag -v wrt. secure_{cd,rm}() and insecure_mkdir(). - Build slibtool{_host,} w/ `--prefix='. - Export ${ARG_TARBALL} instead of special-casing build level 9. - Fix mc configure failure (error: could not determine how to read list of mounted file systems.) --- build.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 8662d5ee..b0e1a0bd 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,8 @@ VALID_BUILD_LEVELS="fetch,extract,build_dir,autoconf,patch,configure,clean,build while [ ${#} -gt 0 ]; do case ${1} in -c) ARG_CLEAN=1; ;; --t*) ARG_TARBALL=1; [ "${1#-t.}" != "${1}" ] && TARBALL_SUFFIX=${1#-t.}; ;; +-t*) export ARG_TARBALL=1; [ "${1#-t.}" != "${1}" ] && TARBALL_SUFFIX=${1#-t.}; ;; +-v) export ARG_VERBOSE=1; ;; -x) ARG_XTRACE=1; set -o xtrace; ;; -a) [ -z "${2}" ] && exec cat build.usage || ARCH="${2}"; shift; ;; -b) [ -z "${2}" ] && exec cat build.usage || BUILD="${2}"; shift; ;; @@ -94,7 +95,7 @@ if [ ${ARG_CLEAN:-0} -eq 1 ]; then fi; # Create directory hierarchy and usr -> . symlinks. -insecure_mkdir ${PREFIX} ${PREFIX_NATIVE} ${PREFIX_CROSS} ${PREFIX_TARGET}/lib ${DLCACHEDIR} ${WORKDIR}; +insecure_mkdir ${PREFIX} ${PREFIX_MINIPIX} ${PREFIX_NATIVE} ${PREFIX_CROSS} ${PREFIX_TARGET}/lib ${DLCACHEDIR} ${WORKDIR}; for __ in ${PREFIX}/usr ${PREFIX_NATIVE}/usr; do if [ ! -L "${__}" ]; then secure_rm "${__}"; ln -sf -- . "${__}"; @@ -112,7 +113,7 @@ BUILD_TIMES_SECS=$(command date +%s); log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname)} at ${BUILD_DATE_START}."; log_env_vars "build (global)" ${LOG_ENV_VARS}; -for BUILD_LVL in 0 1 2 3 ${ARG_TARBALL:+9}; do +for BUILD_LVL in 0 1 2 3 9; do for BUILD_SCRIPT_FNAME in ${BUILD_LVL}[0-9][0-9].*.build; do if [ -n "${ARG_RESTART_SCRIPT}" ] \ && [ "${ARG_RESTART_SCRIPT}" != "ALL" ] \ @@ -138,7 +139,8 @@ for BUILD_LVL in 0 1 2 3 ${ARG_TARBALL:+9}; do SCRIPT_NAME=${SCRIPT_FNAME%%.build*}; \ export PKG_BUILD=${BUILD}; \ export PKG_TARGET=${TARGET}; \ - export PKG_PREFIX=$(get_var_unsafe PKG_LVL${BUILD_LVL}_PREFIX);\ + export PKG_PREFIX=$(get_vars_unsafe PKG_LVL${BUILD_LVL}_PREFIX \ + PKG_$(echo ${2} | tr a-z A-Z)_PREFIX); \ export MIDIPIX_BUILD_PWD=$(pwd); cd ${WORKDIR}; \ for SCRIPT_SOURCE in build.subr ${SCRIPT_NAME}.vars \ ${BUILD_SCRIPT_FNAME}; do \ -- cgit v1.2.3