From 48549ba666dd81312c25eb1cf2e9b1635ef5aff9 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: Wed, 15 Feb 2017 21:53:19 +0100 Subject: build.sh: set ${PKG_NAME_PARENT} for `flavoured' packages. subr/build.subr: fix bug in log_env_vars(). subr/pkg_setup_env.subr: inherit and log variables from parent packages when processing `flavoured' packages. vars/build.vars: replaces minipix packages w/ {bash,coreutils}_flavour_minipix, which are statically linked and installed to ${PREFIX_MINIPIX}. vars/musl.vars: don't install libc.so to ${PREFIX_MINIPIX}/lib. --- build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 11ade034..57990f77 100755 --- a/build.sh +++ b/build.sh @@ -55,7 +55,9 @@ for BUILD_TARGET_LC in $(subst_tgts invariants ${BUILD_TARGETS_META:-world}); do # # # - if [ "${ARG_CHECK_UPDATES:-0}" -eq 1 ]\ + if [ "${PKG_NAME#*_flavour_*}" != "${PKG_NAME}" ]; then + PKG_NAME_PARENT="${PKG_NAME%_flavour_*}"; + elif [ "${ARG_CHECK_UPDATES:-0}" -eq 1 ]\ && [ "${BUILD_PACKAGE#*.*}" = "${BUILD_PACKAGE}" ]; then (mode_check_pkg_updates "${PKG_NAME}" "${BUILD_PACKAGE}"); continue; -- cgit v1.2.3