From 5662ab61b4f840aedb7787211c06a8060ed1da74 Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Mon, 24 Feb 2014 17:11:48 +0000 Subject: scripts/oe-setup-builddir: Keep track of TEMPLATECONF setting Keeping track of the TEMPLATECONF variable in the build tree will let this script produce the same output when listing 'conf-notes.txt' every time the script is run, regardless of whether or not TEMPLATECONF has been provided by the user. Note that the default value for TEMPLATECONF now comes from an easily customizable file $OEROOT/.templateconf (From OE-Core rev: 4474357faf2cbca250e99630d749776fbc80d44b) Signed-off-by: Gary Thomas Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- scripts/oe-setup-builddir | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'scripts/oe-setup-builddir') diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index adb55c7c38..e4356f1551 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -37,7 +37,15 @@ fi cd "$BUILDDIR" -TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} +if (test -f "$BUILDDIR/conf/templateconf.cfg") then + TEMPLATECONF=$(cat $BUILDDIR/conf/templateconf.cfg) +fi + +source $OEROOT/.templateconf + +if ! (test -f "$BUILDDIR/conf/templateconf.cfg") then + echo "$TEMPLATECONF" >$BUILDDIR/conf/templateconf.cfg +fi # # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf -- cgit v1.2.3-54-g00ecf