From 74d09327d9adb466cbdf235b6e0b1118f48a129f Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Wed, 8 Dec 2010 06:11:52 -0700 Subject: [PATCH] poky-env-internal: Allow the environment variable POKYCONF to provide the basis for the working "conf" directory. By using the POKYCONF variable, a meta layer can provide the basic setup for files to be used during a build. This is similar to the default values stored in the main meta tree, .../meta/conf/local.conf.sample, etc Signed-off-by: Gary Thomas Signed-off-by: Richard Purdie --- scripts/poky-env-internal | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index 5b206ed..c8b39c9 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal @@ -58,6 +58,24 @@ if ! (test -d "$BITBAKEDIR" && test -d "$BUILDDIR"); then return fi +# +# $POKYCONF can point to a directory for the template local.conf & bblayers.conf +# +if [ "x" != "x$POKYCONF" ]; then + if ! (test -d "$POKYCONF"); then + # Allow POKYCONF=meta-xyz/conf as a shortcut + if [ -d "$OEROOT/$POKYCONF" ]; then + POKYCONF="$OEROOT/$POKYCONF" + fi + if ! (test -d "$POKYCONF"); then + echo >&2 "Error: '$POKYCONF' must be a directory containing local.conf & bblayers.conf" + return + fi + fi + POKYLAYERCONF="$POKYCONF/bblayers.conf" + POKYLOCALCONF="$POKYCONF/local.conf" +fi + if [ "x" = "x$POKYLOCALCONF" ]; then POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample" fi -- 2.7.4