Rename build targets to build groups to avoid confusion w/ target architectures.

7 files changed, 82 insertions, 82 deletions

diff --git a/build.sh b/build.sh
index 875107ed..cbb2f511 100755
--- a/build.sh
+++ b/build.sh
@@ -3,17 +3,17 @@
 #
 
 buildp_dispatch() {
-	local _msg="${1}" _pkg_name="${2}" _tgt_name="${3}"					\
-		_build_tgt_meta="" _build_tgt_lc="" _build_tgts_lc="" _last_pkg="" _pkg_restart="" PKGS_FOUND;
+	local _msg="${1}" _group_name="${2}" _pkg_name="${3}"					\
+		_build_group_meta="" _build_group_lc="" _build_groups_lc="" _last_pkg="" _pkg_restart="" PKGS_FOUND;
 	case "${_msg}" in
 	# Top-level
 	start_build)	shift; build_args "${@}"; build_init;
 			ex_rtl_log_set_vnfo_lvl "${ARG_VERBOSE:-0}";
 			ex_rtl_log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname)} at ${BUILD_DATE_START}.";
 			ex_rtl_log_env_vars "build (global)" ${DEFAULT_LOG_ENV_VARS};
-			_build_tgts_lc="${BUILD_TARGETS:-${TARGETS_DEFAULT}}";
+			_build_groups_lc="${BUILD_GROUPS:-${GROUPS_DEFAULT}}";
 			if ! ex_rtl_lmatch "${ARG_DIST}" , rpm; then
-				_build_tgts_lc="$(ex_rtl_lfilter_not "${_build_tgts_lc}" "host_tools_rpm")";
+				_build_groups_lc="$(ex_rtl_lfilter_not "${_build_groups_lc}" "host_tools_rpm")";
 			fi;
 			if [ "${ARG_RESTART}" = "LAST" ]; then
 				if [ -n "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}" ]\
@@ -24,8 +24,8 @@ buildp_dispatch() {
 				fi;
 			fi;
 			PKGS_FOUND="";
-			for _build_tgt_lc in ${_build_tgts_lc}; do
-				ex_pkg_dispatch "${_build_tgt_lc}"				\
+			for _build_group_lc in ${_build_groups_lc}; do
+				ex_pkg_dispatch "${_build_group_lc}"				\
 						"${ARG_RESTART}" "${ARG_RESTART_AT}"		\
 						buildp_dispatch PKGS_FOUND;
 				if [ ${?} -ne 0 ]; then
@@ -49,9 +49,9 @@ buildp_dispatch() {
 				ex_rtl_log_msg failexit "Build script failure(s) in: ${BUILD_PKGS_FAILED}.";
 			fi; ;;
 
-	# Target build
-	start_target)	ex_rtl_log_msg inf2 "Starting \`${_tgt_name}' build target..."; ;;
-	finish_target)	ex_rtl_log_msg suc2 "Finished \`${_tgt_name}' build target."; ;;
+	# Group build
+	start_group)	ex_rtl_log_msg inf2 "Starting \`${_group_name}' build group..."; ;;
+	finish_group)	ex_rtl_log_msg suc2 "Finished \`${_group_name}' build group."; ;;
 
 	# Package build
 	start_pkg)	ex_rtl_log_msg info "Starting \`${_pkg_name}' build..."; ;;
diff --git a/etc/build.usage b/etc/build.usage
index 3db9c2d1..b8016345 100644
--- a/etc/build.usage
+++ b/etc/build.usage
@@ -1,6 +1,6 @@
 usage: ./build.sh [-a nt32|nt64] [-b debug|release] [-C dir[,..]] [-D kind[,..]]
                   [-F ipv4|ipv6|offline] [-h] [-P [jobs]] [-r ALL|LAST|name[,..][:step,..]]
-                  [-R] [-v[v[v[v]]]] [--as-needed] [--debug-minipix] [<target>[ ..]]
+                  [-R] [-v[v[v[v]]]] [--as-needed] [--debug-minipix] [<group>[ ..]]
         -a nt32|nt64      Selects 32-bit or 64-bit architecture; defaults to nt64.
         -b debug|release  Selects debug or release build; defaults to debug.
         -C dir[,..]       Clean build directory (build,) ${PREFIX} before processing build
@@ -15,7 +15,7 @@ usage: ./build.sh [-a nt32|nt64] [-b debug|release] [-C dir[,..]] [-D kind[,..]]
                           Force IPv4 (ipv4) or IPv6 (ipv6) when downloading package archives
                           and/or Git repositories or don't download either at all (offline.)
         -h                Show this screen.
-        -P [jobs]         Enables parallelisation at target-level, whenever applicable.
+        -P [jobs]         Enables parallelisation at group-level, whenever applicable.
                           The maximum count of jobs defaults to the number of logical
                           processors on the host system.
                           If -R is not specified and at least one (1) package fails to build,
@@ -35,7 +35,7 @@ usage: ./build.sh [-a nt32|nt64] [-b debug|release] [-C dir[,..]] [-D kind[,..]]
         -v[v[v[v]]]       Be verbose; -vv: always print package logs; -vvv: set xtrace during package builds; -vvvv: logs fileops.
         --as-needed       Don't build unless the midipix_build repository has received new commits.
         --debug-minipix   Don't strip(1) minipix binaries to facilitate debugging minipix.
-        <target>[ ..]     One of: host_deps, host_packages_deps, host_toolchain, host_toolchain_deps,
+        <group>[ ..]      One of: host_deps, host_packages_deps, host_toolchain, host_toolchain_deps,
                           host_toolchain_mingw32, host_tools, host_tools_rpm, minipix, native_packages,
                           native_packages_deps, native_packages_deps_deps, native_packages_deps_x11,
                           native_runtime, native_toolchain, native_toolchain_deps, native_toolchain_mingw32,
diff --git a/subr/build_args.subr b/subr/build_args.subr
index bf6956fb..6a95b520 100644
--- a/subr/build_args.subr
+++ b/subr/build_args.subr
@@ -82,7 +82,7 @@ build_args() {
 	while [ ${#} -gt 0 ]; do
 	case "${1}" in
 	*=*)	ex_rtl_set_var_unsafe "${1%%=*}" "${1#*=}"; ;;
-	*)	BUILD_TARGETS="${BUILD_TARGETS:+${BUILD_TARGETS} }${1}"; ;;
+	*)	BUILD_GROUPS="${BUILD_GROUPS:+${BUILD_GROUPS} }${1}"; ;;
 	esac; shift; done;
 };
 
diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr
index ddb78092..8e025532 100644
--- a/subr/ex_pkg_dispatch.subr
+++ b/subr/ex_pkg_dispatch.subr
@@ -7,40 +7,40 @@
 #
 
 exp_pkg_dispatch() {
-	local _pkg_name="${1}" _tgt_name="${2}" _restart_at="${3}"				\
+	local _group_name="${1}" _pkg_name="${2}" _restart_at="${3}"				\
 		_dispatch_fn="${4}" _stderrout_path="${5}" _pipe_path="${6}"			\
 		_njobs_vname="${7}" _pkg_name_uc="";
 	_pkg_name_uc="$(ex_rtl_toupper "${_pkg_name}")";
 	if [ -n "$(ex_rtl_get_var_unsafe PKG_${_pkg_name_uc}_DISABLED)" ]; then
-		"${_dispatch_fn}" disabled_pkg "${_pkg_name}" "${_tgt_name}";
+		"${_dispatch_fn}" disabled_pkg "${_group_name}" "${_pkg_name}";
 	elif ex_pkg_state_test "${_pkg_name}" finish\
 	&& [ -z "${_restart_at}" ]; then
-		"${_dispatch_fn}" skipped_pkg "${_pkg_name}" "${_tgt_name}";
+		"${_dispatch_fn}" skipped_pkg "${_group_name}" "${_pkg_name}";
 	else
 		_stderrout_path="${BUILD_WORKDIR}/${_pkg_name}_stderrout.log";
-		"${_dispatch_fn}" start_pkg "${_pkg_name}" "${_tgt_name}";
+		"${_dispatch_fn}" start_pkg "${_group_name}" "${_pkg_name}";
 		(set -o errexit -o noglob; BUILD_IS_PARENT=0;
-		ex_pkg_env "${_pkg_name}" "${_tgt_name}" "${_restart_at}";
-		ex_pkg_exec "${_pkg_name}" "${_tgt_name}" "${_restart_at}"			\
+		ex_pkg_env "${_group_name}" "${_pkg_name}" "${_restart_at}";
+		ex_pkg_exec "${_group_name}" "${_pkg_name}" "${_restart_at}"			\
 			"${_dispatch_fn}";) 1>"${_stderrout_path}" 2>&1 3>"${_pipe_path}" &
 		: $((${_njobs_vname}+=1));
 	fi;
 };
 
 ex_pkg_dispatch() {
-	local _tgt_name="${1}" _restart="${2}" _restart_at="${3}" _dispatch_fn="${4}" _pkgs_found_vname="${5}"	\
+	local _group_name="${1}" _restart="${2}" _restart_at="${3}" _dispatch_fn="${4}" _pkgs_found_vname="${5}"\
 		_njob="" _njobs="" _njobs_max="" _pipe_msg="" _pipe_path="" _pkg_names="" _pkgs_found=""	\
-		_pkgs_found_new="" _script_rc="" _stderrout_path="" _tgt_name_uc="";
+		_pkgs_found_new="" _script_rc="" _stderrout_path="" _group_name_uc="";
 	ex_rtl_fileop mkdir "${BUILD_WORKDIR}";
 	_pipe_path="${BUILD_WORKDIR}/build.fifo";
-	_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)";
+	_group_name_uc="$(ex_rtl_toupper "${_group_name}")";
+	"${_dispatch_fn}" start_group "${_group_name}" "";
+	_pkg_names="$(ex_rtl_get_var_unsafe ${_group_name_uc}_PACKAGES)";
 	if [ -n "${_restart}" ]\
 	&& ! ex_rtl_lmatch "ALL LAST" " " "${_restart}"; then
 		_pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_restart}")";
 	fi;
-	if [ "$(ex_rtl_get_var_unsafe ${_tgt_name_uc}_PARALLELISE)" = 1 ]\
+	if [ "$(ex_rtl_get_var_unsafe ${_group_name_uc}_PARALLELISE)" = 1 ]\
 	&& [ "${ARG_PARALLEL:-0}" -gt 1 ]; then
 		_njobs_max="${DEFAULT_BUILD_CPUS}";
 	else
@@ -55,9 +55,9 @@ ex_pkg_dispatch() {
 				break;
 			else
 				_pkgs_found_new="${_pkgs_found_new:+${_pkgs_found_new} }${1}";
-				exp_pkg_dispatch "${1}" "${_tgt_name}"				\
-					"${_restart_at}" "${_dispatch_fn}"			\
-					"${_stderrout_path}" "${_pipe_path}"			\
+				exp_pkg_dispatch "${_group_name}" "${1}"				\
+					"${_restart_at}" "${_dispatch_fn}"				\
+					"${_stderrout_path}" "${_pipe_path}"				\
 					_njobs; shift;
 			fi;
 		done;
@@ -72,7 +72,7 @@ ex_pkg_dispatch() {
 							break;
 						else
 							_pkgs_found_new="${_pkgs_found_new:+${_pkgs_found_new} }${1}";
-							exp_pkg_dispatch "${1}" "${_tgt_name}"		\
+							exp_pkg_dispatch "${_group_name}" "${1}"	\
 								"${_restart_at}" "${_dispatch_fn}"	\
 								"${_stderrout_path}" "${_pipe_path}"	\
 								_njobs; shift;
@@ -93,7 +93,7 @@ ex_pkg_dispatch() {
 			return "${_script_rc}";
 		fi;
 	done;
-	"${_dispatch_fn}" finish_target "" "${_tgt_name}";
+	"${_dispatch_fn}" finish_group "${_group_name}" "";
 	if [ -n "${_pkgs_found_vname}" ]; then
 		_pkgs_found="$(ex_rtl_get_var_unsafe "${_pkgs_found_vname}")";
 		ex_rtl_set_var_unsafe "${_pkgs_found_vname}" "${_pkgs_found:+${_pkgs_found} }${_pkgs_found_new}";
diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr
index bc4f9ce2..cbfb6ecd 100644
--- a/subr/ex_pkg_env.subr
+++ b/subr/ex_pkg_env.subr
@@ -3,41 +3,41 @@
 #
 
 exp_pkg_env_source() {
-	local _pkg_name="${1}" _tgt_name="${2}"				\
-		_tgt_name_uc="" _pkg_name_uc="" _pkg_name_inherit_uc=""	\
+	local _group_name="${1}" _pkg_name="${2}"				\
+		_group_name_uc="" _pkg_name_uc="" _pkg_name_inherit_uc=""	\
 		_build_type_uc="" _vname_dst="" _vars_set="";
 	ex_rtl_fileop source_opt "vars/${_pkg_name}.vars";
-	_tgt_name_uc="$(ex_rtl_toupper "${_tgt_name}")";
+	_group_name_uc="$(ex_rtl_toupper "${_group_name}")";
 	_pkg_name_uc="$(ex_rtl_toupper "${_pkg_name}")";
-	ex_rtl_set_vars BUILD_TYPE					\
-		"DEFAULT ${_tgt_name_uc} PKG_${_pkg_name_uc}"		\
+	ex_rtl_set_vars BUILD_TYPE						\
+		"DEFAULT ${_group_name_uc} PKG_${_pkg_name_uc}"			\
 		_vars_set;
 	_build_type_uc="$(ex_rtl_toupper "${PKG_BUILD_TYPE}")";
 	ex_rtl_set_vars INHERIT_FROM "PKG_${_pkg_name_uc}" _vars_set;
 	_pkg_name_inherit_uc="$(ex_rtl_toupper "${PKG_INHERIT_FROM}")";
-	for _vname_dst in $(ex_rtl_lfilter_not				\
+	for _vname_dst in $(ex_rtl_lfilter_not					\
 			"${DEFAULT_BUILD_VARS}" BUILD_TYPE); do
 		if [ -n "${_pkg_name_inherit_uc}" ]; then
-			ex_rtl_set_vars "${_vname_dst}"			\
-				"DEFAULT DEFAULT_${_build_type_uc}	\
-				${_tgt_name_uc}				\
-				PKG_${_pkg_name_inherit_uc}		\
+			ex_rtl_set_vars "${_vname_dst}"				\
+				"DEFAULT DEFAULT_${_build_type_uc}		\
+				${_group_name_uc}				\
+				PKG_${_pkg_name_inherit_uc}			\
 				PKG_${_pkg_name_uc}" _vars_set;
 		else
-			ex_rtl_set_vars "${_vname_dst}"			\
-				"DEFAULT DEFAULT_${_build_type_uc}	\
-				${_tgt_name_uc} PKG_${_pkg_name_uc}"	\
+			ex_rtl_set_vars "${_vname_dst}"				\
+				"DEFAULT DEFAULT_${_build_type_uc}		\
+				${_group_name_uc} PKG_${_pkg_name_uc}"		\
 				_vars_set;
 		fi;
 	done;
-	ex_rtl_unset_vars $(ex_rtl_lfilter_not				\
-		"$(set | awk -F= '/^PKG_/{print $1}' | sort)"		\
+	ex_rtl_unset_vars $(ex_rtl_lfilter_not					\
+		"$(set | awk -F= '/^PKG_/{print $1}' | sort)"			\
 		"${_vars_set}");
 };
 
 ex_pkg_env() {
-	local _pkg_name="${1}" _tgt_name="${2}" _restart_at="${3}" _vname="";
-	exp_pkg_env_source "${_pkg_name}" "${_tgt_name}";
+	local _group_name="${1}" _pkg_name="${2}" _restart_at="${3}" _vname="";
+	exp_pkg_env_source "${_group_name}" "${_pkg_name}";
 	: ${PKG_NAME:="${_pkg_name}"};
 	: ${MIDIPIX_BUILD_PWD:="$(pwd)"};
 	: ${PKG_BASE_DIR:="${BUILD_WORKDIR}/${_pkg_name}-${PKG_BUILD_TYPE}-${PKG_TARGET}"};
diff --git a/subr/ex_pkg_exec.subr b/subr/ex_pkg_exec.subr
index 7092dad3..0a87b450 100644
--- a/subr/ex_pkg_exec.subr
+++ b/subr/ex_pkg_exec.subr
@@ -3,12 +3,12 @@
 #
 
 exp_pkg_exec_pre() {
-	local _pkg_name="${1}" _tgt_name="${2}" _restart_at="${3}";
+	local _group_name="${1}" _pkg_name="${2}" _restart_at="${3}";
 	if [ -z "${PKG_URL}" ]\
 	&& [ -z "${PKG_URLS_GIT}" ]\
 	&& [ -z "${PKG_VERSION}" ]\
 	&& ! ex_rtl_test_cmd "pkg_${_pkg_name}_all"; then
-		"${_dispatch_fn}" exec_missing "${_pkg_name}" "${_tgt_name}";
+		"${_dispatch_fn}" exec_missing "${_group_name}" "${_pkg_name}";
 		return 1;
 	elif ! ex_pkg_state_test "${_pkg_name}" "start" "${_restart_at}"; then
 		if [ "${PKG_NO_CLEAN_BASE_DIR:-0}" -eq 0 ]; then
@@ -22,16 +22,16 @@ exp_pkg_exec_pre() {
 };
 
 ex_pkg_exec() {
-	local _pkg_name="${1}" _tgt_name="${2}" _restart_at="${3}"			\
+	local _group_name="${1}" _pkg_name="${2}" _restart_at="${3}"			\
 		_step="" _step_cmd="" _step_cmd_pfx="" _step_rc="";
 	trap "if [ \${?} -eq 0 ]; then							\
-		echo \"done ${_pkg_name} ${_tgt_name}\" >&3;				\
+		echo \"done ${_group_name} ${_pkg_name}\" >&3;				\
 	      else									\
-		echo \"fail ${_pkg_name} ${_tgt_name}\" >&3;				\
+		echo \"fail ${_group_name} ${_pkg_name}\" >&3;				\
 		pkill -U "${$}";							\
 	      fi;" EXIT HUP INT TERM USR1 USR2;
-	exp_pkg_exec_pre "${_pkg_name}" "${_tgt_name}" "${_restart_at}";
-	"${_dispatch_fn}" exec_start "${_pkg_name}" "${_tgt_name}";
+	exp_pkg_exec_pre "${_group_name}" "${_pkg_name}" "${_restart_at}";
+	"${_dispatch_fn}" exec_start "${_group_name}" "${_pkg_name}";
 	if ex_rtl_test_cmd "pkg_${_pkg_name}_all"; then
 		"pkg_${_pkg_name}_all" "${_restart_at}";
 	else	set -- ${PKG_BUILD_STEPS};
@@ -42,25 +42,25 @@ ex_pkg_exec() {
 				continue;
 			else	ex_rtl_try_run						\
 					"pkg_${_pkg_name}_${_step}_pre"			\
-					"${_pkg_name}" "${_tgt_name}" "${_restart_at}";
+					"${_group_name}" "${_pkg_name}" "${_restart_at}";
 				if ex_rtl_test_cmd "pkg_${_pkg_name}_${_step}"; then
 					ex_rtl_try_run "pkg_${_pkg_name}_${_step}"	\
-						"${_pkg_name}" "${_tgt_name}" "${_restart_at}";
+						"${_group_name}" "${_pkg_name}" "${_restart_at}";
 				else
 					ex_rtl_try_run "pkg_${_step}"			\
-						"${_pkg_name}" "${_tgt_name}" "${_restart_at}";
+						"${_group_name}" "${_pkg_name}" "${_restart_at}";
 				fi;
 				ex_rtl_try_run						\
 					"pkg_${_pkg_name}_${_step}_post"		\
-					"${_pkg_name}" "${_tgt_name}" "${_restart_at}";
+					"${_group_name}" "${_pkg_name}" "${_restart_at}";
 
 			fi;
-			echo "step ${_pkg_name} ${_tgt_name} ${_step}" >&3;
-			"${_dispatch_fn}" exec_step "${_pkg_name}" "${_tgt_name}" "${_step}";
+			echo "step ${_group_name} ${_pkg_name} ${_step}" >&3;
+			"${_dispatch_fn}" exec_step "${_group_name}" "${_pkg_name}" "${_step}";
 			ex_pkg_state_set "${_pkg_name}" "${_step}" "${1:+-${1}}";
 		done;
 	fi;
-	"${_dispatch_fn}" exec_finish "${_pkg_name}" "${_tgt_name}";
+	"${_dispatch_fn}" exec_finish "${_group_name}" "${_pkg_name}";
 	ex_pkg_state_set "${_pkg_name}" finish;
 };
 
diff --git a/vars/build.vars b/vars/build.vars
index 612a24cd..2cf96aee 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -145,7 +145,7 @@ gl_cv_struct_dirent_d_ino=yes
 gl_cv_C_locale_sans_EILSEQ=yes"};
 
 #
-# Build target host_tools
+# Build group host_tools
 #
 HOST_TOOLS_BUILD_TYPE="host";
 HOST_TOOLS_CONFIGURE_ARGS="--disable-nls --prefix= --target=${DEFAULT_TARGET}";
@@ -186,7 +186,7 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_LIBTOOL_HOST_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
 
 #
-# Build target host_deps
+# Build group host_deps
 #
 HOST_DEPS_BUILD_TYPE="host";
 HOST_DEPS_CONFIGURE_ARGS="--disable-nls --prefix= --target=${DEFAULT_TARGET}";
@@ -228,7 +228,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_TEXINFO_HOST_LIBTOOL:=rdlibtool};
 
 #
-# Build target host_tools_rpm
+# Build group host_tools_rpm
 #
 HOST_TOOLS_RPM_BUILD_TYPE="host";
 HOST_TOOLS_RPM_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}";
@@ -255,7 +255,7 @@ HOST_TOOLS_RPM_PREFIX="${PREFIX}";
 : ${PKG_RPM_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"};
 
 #
-# Build target host_toolchain_deps
+# Build group host_toolchain_deps
 #
 HOST_TOOLCHAIN_DEPS_BUILD_TYPE="host";
 HOST_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=";
@@ -284,7 +284,7 @@ HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX}";
 : ${PKG_PSXTYPES_HOST_PREFIX:="${PREFIX_CROSS}"};
 
 #
-# Build target host_toolchain
+# Build group host_toolchain
 #
 HOST_TOOLCHAIN_BUILD_TYPE="host";
 HOST_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --prefix= --target=${DEFAULT_TARGET}";
@@ -366,7 +366,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_NASM_HOST_PREFIX:=${PREFIX}};
 
 #
-# Build target host_toolchain_mingw32
+# Build group host_toolchain_mingw32
 #
 HOST_TOOLCHAIN_MINGW32_BUILD_TYPE="host";
 HOST_TOOLCHAIN_MINGW32_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --target=x86_64-w64-mingw32";
@@ -388,7 +388,7 @@ HOST_TOOLCHAIN_MINGW32_TARGET="x86_64-w64-mingw32";
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_PREFIX:=${PREFIX}};
 
 #
-# Build target host_packages_deps
+# Build group host_packages_deps
 #
 HOST_PACKAGES_DEPS_BUILD_TYPE="host";
 HOST_PACKAGES_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST:+${DEFAULT_CFLAGS_HOST} }-I${PREFIX}/include";
@@ -538,7 +538,7 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_TZDB_HOST_BUILD_DIR:="tzdb-${PKG_TZDB_HOST_VERSION}"};
 
 #
-# Build target native_tools
+# Build group native_tools
 #
 NATIVE_TOOLS_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=${DEFAULT_TARGET}";
 NATIVE_TOOLS_PACKAGES="
@@ -560,7 +560,7 @@ NATIVE_TOOLS_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PKGCONF_INSTALL_FILES:=/=lib/pkgconfig};
 
 #
-# Build target native_toolchain_deps
+# Build group native_toolchain_deps
 #
 NATIVE_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=${DEFAULT_TARGET}";
 NATIVE_TOOLCHAIN_DEPS_PACKAGES="
@@ -607,7 +607,7 @@ NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MPC_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE}};
 
 #
-# Build target native_toolchain
+# Build group native_toolchain
 #
 NATIVE_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=${DEFAULT_TARGET}";
 NATIVE_TOOLCHAIN_PACKAGES="
@@ -638,7 +638,7 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GCC_FULL_GITROOT:=${DEFAULT_GITROOT}};
 
 #
-# Build target native_toolchain_mingw32
+# Build group native_toolchain_mingw32
 #
 NATIVE_TOOLCHAIN_MINGW32_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=x86_64-w64-mingw32";
 NATIVE_TOOLCHAIN_MINGW32_PACKAGES="
@@ -657,7 +657,7 @@ NATIVE_TOOLCHAIN_MINGW32_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_TARGET:=x86_64-w64-mingw32};
 
 #
-# Build target native_runtime
+# Build group native_runtime
 #
 NATIVE_RUNTIME_BUILD_TYPE="native";
 NATIVE_RUNTIME_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_RUNTIME}";
@@ -710,7 +710,7 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_SLTDL_INSTALL_TARGET_EXTRA:=install-lib};
 
 #
-# Build target native_packages_deps_deps
+# Build group native_packages_deps_deps
 #
 NATIVE_PACKAGES_DEPS_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_DEPS_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
@@ -743,7 +743,7 @@ NATIVE_PACKAGES_DEPS_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_LIBUV_URL:=https://dist.libuv.org/dist/v${PKG_LIBUV_VERSION}/libuv-v${PKG_LIBUV_VERSION}.tar.gz};
 
 #
-# Build target native_packages_deps
+# Build group native_packages_deps
 #
 NATIVE_PACKAGES_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
@@ -1062,7 +1062,7 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_UTF8PROC_IN_TREE:=1};
 
 #
-# Build target native_packages_deps_x11
+# Build group native_packages_deps_x11
 #
 NATIVE_PACKAGES_DEPS_X11_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
@@ -1291,7 +1291,7 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_SDL1_MAKEFLAGS_BUILD:=-j1};
 
 #
-# Build target dev_packages
+# Build group dev_packages
 #
 DEV_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 DEV_PACKAGES_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
@@ -1305,7 +1305,7 @@ DEV_PACKAGES_PREFIX="${NATIVE_PACKAGES_DEPS_PREFIX}";
 DEV_PACKAGES_PYTHON="${PREFIX}/bin/python2";
 
 #
-# Build target native_packages
+# Build group native_packages
 #
 NATIVE_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
@@ -1974,7 +1974,7 @@ ${NATIVE_PACKAGES_ETC_PACKAGES}
 ${NATIVE_PACKAGES_INET_PACKAGES}";
 
 #
-# Build target minipix
+# Build group minipix
 #
 MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 MINIPIX_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
@@ -2053,15 +2053,15 @@ MINIPIX_RPM_DISABLE=1;
 : ${PKG_PTYCON_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
 
 #
-# Build target invariants
+# Build group invariants
 #
 INVARIANTS_NO_LOG_VARS=1;
 INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_minipix invariants_tarballs invariants_zipdist";
 
 #
-# Build targets
+# Build groups
 #
-TARGETS_DEFAULT="
+GROUPS_DEFAULT="
 host_tools host_deps host_tools_rpm 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_deps native_packages_deps native_packages_deps_x11