[oe-commits] Gary Thomas : scripts/oe-setup-builddir: Keep track of TEMPLATECONF setting

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 4474357faf2cbca250e99630d749776fbc80d44b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4474357faf2cbca250e99630d749776fbc80d44b

Author: Gary Thomas <gary at mlbassoc.com>
Date:   Mon Feb 24 17:11:48 2014 +0000

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

Signed-off-by: Gary Thomas <gary at mlbassoc.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/oe-setup-builddir | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index a869fdc..e4356f1 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -37,7 +37,15 @@ fi
 
 cd "$BUILDDIR"
 
-TEMPLATECONF=${TEMPLATECONF:-meta/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