From 4b77259cd08ac2ebf2a2a7dfcc9d2dd826886d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Wed, 12 Feb 2020 14:42:53 +0000 Subject: groups/2*.native_packages{,cmdline,dev,etc,inet,lib,x11}.group: merged/split, adds dependencies. groups/: updates layout. etc/build.usage: updated. subr/build_init.subr:build_init(): only include actual groups in ${GROUPS_DEFAULT}. --- subr/build_init.subr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'subr') diff --git a/subr/build_init.subr b/subr/build_init.subr index 27c1986f..ee70bc2f 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -53,7 +53,9 @@ build_init() { done; for __ in $(find ./groups -name *.group | sort); do . "${__}"; __="${__##*/}"; __="${__%.group}"; - if [ "${__#[0-9][0-9][0-9].*}" != "${__}" ]; then + if [ "${__#[0-9][0-9][0-9].*}" != "${__}" ]\ + && [ "${__#*[1-9].*}" = "${__}" ]\ + && [ "${__}" != "999.invariants.group" ]; then GROUPS_DEFAULT="${GROUPS_DEFAULT:+${GROUPS_DEFAULT} }${__#*.}"; fi; done; -- cgit v1.2.3