From a0404197399371874741d6b064f1f56992ba1e06 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 12 Jun 2019 10:27:43 +0000 Subject: aglsetup: be less restrictive on machines/features definitions When a private definition for a machine or feature has to be maintained, the easy way is to have an extra layer 'meta-xxxxxx' containing specific definitions on top of AGL. This layer can be fetched beside other meta-agl repos. In the past, aglsetup used to include any definition located in the $METADIR folder ($METADIR/*/templates/...). With the new layout and change 2b3a44b, a restriction has been put on folders matching 'meta-ag*', which is very restrictive. This patch does something in between, by matching all folders 'meta-*'. NB: with the new layout, this shouldn't include bsp layers or external layers so it's pretty safe. Bug-AGL: SPEC-2450 Change-Id: I459ea778380580e5b80685cc86779f36a232ac7c Signed-off-by: Stephane Desneux --- scripts/.aglsetup_genconfig.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash index c4dde423d..e2dc0db06 100755 --- a/scripts/.aglsetup_genconfig.bash +++ b/scripts/.aglsetup_genconfig.bash @@ -51,7 +51,7 @@ function debug() { [[ $DEBUG == 1 ]] && echo "DEBUG: $@" >&2; return 0;} info "------------ $SCRIPT: Starting" #compute AGL_REPOSITORIES -AGL_REPOSITORIES=$(for x in $(ls -d $METADIR/meta-ag*/templates/{machine,feature} $METADIR/bsp/*/templates/machine); do echo $(basename $(dirname $(dirname $x))); done | sort -u) +AGL_REPOSITORIES=$(for x in $(ls -d $METADIR/meta-*/templates/{machine,feature} $METADIR/bsp/*/templates/machine); do echo $(basename $(dirname $(dirname $x))); done | sort -u) function list_machines() { for a in $@; do -- cgit 1.2.3-korg