diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2022-11-20 13:37:35 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2024-04-24 12:29:35 -0400 |
| commit | e6c0d60746ed35083385dda16e313516e655d6f4 (patch) | |
| tree | 839912a7b6f32f6f78277b604cc2514825a7ddf8 /scripts | |
| parent | 3d9975cfe1973c1c02bc8c274c50645f72ea708d (diff) | |
Handle upstream TEMPLATECONF change
oe-core now requires that TEMPLATECONF point at conf/templates/*
inside a layer, tweak things to move the base template files into
meta-agl-core to match its expectations.
Bug-AGL: SPEC-4578
Change-Id: Idb0af9b4bd6bc55b9fb2cb50a675e928e7c2b025
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/.aglsetup_genconfig.bash | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash index c7ed92e47..3d380e69d 100755 --- a/scripts/.aglsetup_genconfig.bash +++ b/scripts/.aglsetup_genconfig.bash @@ -407,7 +407,7 @@ function genconfig() { info " Features: $FEATURES" # step 1: run usual OE setup to generate conf dir - export TEMPLATECONF=$(cd $SCRIPTDIR/../templates/base && pwd -P) + export TEMPLATECONF=$(cd $SCRIPTDIR/../meta-agl-core/conf/templates/base && pwd -P) debug "running oe-init-build-env with TEMPLATECONF=$TEMPLATECONF" info " Running $METADIR/external/poky/oe-init-build-env" info " Templates dir: $TEMPLATECONF" @@ -417,7 +417,8 @@ function genconfig() { cd $CURDIR # step 2: concatenate other remaining fragments coming from base - process_fragments $TEMPLATECONF + FRAGMENTS=$(cd $SCRIPTDIR/../templates/base && pwd -P) + process_fragments $FRAGMENTS # step 3: fragments for machine process_fragments $(find_machine_dir $MACHINE) @@ -557,6 +558,7 @@ info "OK" infon "Generating setup file: $BUILDDIR/agl-init-build-env ... " cat <<EOF >$BUILDDIR/agl-init-build-env +export TEMPLATECONF=${METADIR}/meta-agl/meta-agl-core/conf/templates/base . $METADIR/external/poky/oe-init-build-env $BUILDDIR if [ -n "\$DL_DIR" ]; then BB_ENV_PASSTHROUGH_ADDITIONS="\$BB_ENV_PASSTHROUGH_ADDITIONS DL_DIR" |