summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2023-03-28 08:32:23 +0200
committerLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2023-03-28 08:32:23 +0200
commitf367005c6ab322fe689a6705e9dc6ebc878280b7 (patch)
tree548210fb62320c8634a85df22831f256cad07c6d
parent599a645fc466a4f3b7c7c59f6e693f33327c5f28 (diff)
downloadmidipix_build-f367005c6ab322fe689a6705e9dc6ebc878280b7.tar.bz2
midipix_build-f367005c6ab322fe689a6705e9dc6ebc878280b7.tar.xz
Filter _{host,minipix} package variables in ./pkgtool.sh -i.
-rwxr-xr-xpkgtool.sh15
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgtool.sh b/pkgtool.sh
index 2190697c..eca26d9b 100755
--- a/pkgtool.sh
+++ b/pkgtool.sh
@@ -242,7 +242,7 @@ pkgtoolp_info() {
pkgtoolp_info_single() {
local _ppis_rstatus="${1}" _ppis_pkg_name="${2}" _ppis_groups="${3}" _ppis_groups_noauto="${4}" \
_ppis_fname="" _ppis_group_fname="" _ppis_group_name="" _ppis_patch_idx=0 _ppis_pkg_disabled="" \
- _ppis_pkg_finished="" _ppis_pkg_name_uc="" _ppis_pkg_names="" _ppis_rc=0;
+ _ppis_pkg_finished="" _ppis_pkg_name_uc="" _ppis_pkg_names="" _ppis_pkg_vars="" _ppis_rc=0;
rtl_toupper2 \$_ppis_pkg_name \$_ppis_pkg_name_uc;
if ! ex_pkg_find_package \$_ppis_group_name "${_ppis_groups}" "${_ppis_pkg_name}"; then
@@ -258,7 +258,18 @@ pkgtoolp_info_single() {
else
rtl_get_var_unsafe \$_ppis_group_fname -u "PKG_${_ppis_pkg_name}_GROUP_FNAME";
rtl_get_var_unsafe \$_ppis_pkg_version -u "PKG_${_ppis_pkg_name}_VERSION";
- rtl_log_env_vars "package_vars" "Package variables" $(rtl_get_vars_unsafe_fast "^PKG_${_ppis_pkg_name_uc}");
+ case "${_ppis_pkg_name}" in
+ *_host)
+ _ppis_pkg_vars="$(rtl_get_vars_unsafe_fast "^PKG_${_ppis_pkg_name_uc}" | grep -Ev "_(MINIPIX)")";
+ ;;
+ *_minipix)
+ _ppis_pkg_vars="$(rtl_get_vars_unsafe_fast "^PKG_${_ppis_pkg_name_uc}" | grep -Ev "_(HOST)")";
+ ;;
+ *)
+ _ppis_pkg_vars="$(rtl_get_vars_unsafe_fast "^PKG_${_ppis_pkg_name_uc}" | grep -Ev "_(HOST|MINIPIX)")";
+ ;;
+ esac;
+ rtl_log_env_vars "package_vars" "Package variables" ${_ppis_pkg_vars};
rtl_log_msgV "info_build_group" "${MSG_info_build_group}" "${_ppis_group_name}" "${_ppis_group_fname}";
if [ "${PKG_DISABLED:-0}" -eq 1 ]; then