From bbb50c0f1c15dab6893cfcf695b2a269c41baa62 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: May 11 2020 09:22:26 +0000 Subject: build.sh:build(): don't forcibly initialise ${BUILD_HNAME}. midipix.env:${DEFAULT_LOG_ENV_VARS}: additionally log ${PREFIX_RPM}. --- diff --git a/build.sh b/build.sh index c284189..dfbdeef 100755 --- a/build.sh +++ b/build.sh @@ -113,11 +113,11 @@ buildp_time_update() { build() { local _build_time_hours=0 _build_time_mins=0 _build_time_secs=0 _pkg_name="" _rc=0 _status="" \ - BUILD_DATE_START="" BUILD_GROUPS="" BUILD_GROUPS_INHIBIT_DEPS=0 BUILD_HNAME="" BUILD_IS_PARENT=1 \ + BUILD_DATE_START="" BUILD_GROUPS="" BUILD_GROUPS_INHIBIT_DEPS=0 BUILD_HNAME BUILD_IS_PARENT=1 \ BUILD_NFAIL=0 BUILD_NFINI=0 BUILD_NSKIP=0 BUILD_PKGS_FAILED="" BUILD_TARGET="" BUILD_USER="" \ DEFAULT_BUILD_CPUS=1 DEFAULT_BUILD_LAST_FAILED_PKG_FNAME="" DEFAULT_BUILD_LOG_FNAME="" \ DEFAULT_BUILD_STEPS="" DEFAULT_BUILD_VARS="" DEFAULT_CLEAR_PREFIX_PATHS="" DEFAULT_GIT_ARGS="" \ - DEFAULT_GITROOT_HEAD="" DEFAULT_LOG_ENV_VARS="" DEFAULT_TARGET="" DEFAULT_WGET_ARGS="" \ + DEFAULT_GITROOT_HEAD="" DEFAULT_LOG_ENV_VARS="" DEFAULT_TARGET="" DEFAULT_WGET_ARGS="" \ MIDIPIX_BUILD_PWD=""; DEFAULT_BUILD_STATUS_IN_PROGRESS_FNAME=""; EX_PKG_DISPATCH_WAIT=""; if ! . "${0%/*}/subr/build_init.subr"; then _rc=1; printf "Error: failed to source \`${0%/*}/subr/build_init.subr'." >&2; diff --git a/midipix.env b/midipix.env index 39bb7d3..5d068d8 100644 --- a/midipix.env +++ b/midipix.env @@ -64,7 +64,7 @@ DEFAULT_BUILD_VARS=" : ${DEFAULT_LOG_ENV_VARS:=" ARCH BUILD_KIND BUILD_DLCACHEDIR BUILD_WORKDIR DEFAULT_GITROOT HOME PATH PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX - PREFIX_NATIVE USER"}; + PREFIX_NATIVE PREFIX_RPM USER"}; # Default flags & variables : ${DEFAULT_BUILD_CPUS:=};