diff options
author | Gary Thomas <gary@mlbassoc.com> | 2014-02-24 17:11:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-11 08:10:43 -0700 |
commit | 4474357faf2cbca250e99630d749776fbc80d44b (patch) | |
tree | 311ae131818cc4e7276df867890ef9e71f8c932e | |
parent | cac863e958a0c8fe0f8a84dc194273c699f0c40f (diff) | |
download | openembedded-core-4474357faf2cbca250e99630d749776fbc80d44b.tar.gz openembedded-core-4474357faf2cbca250e99630d749776fbc80d44b.tar.bz2 openembedded-core-4474357faf2cbca250e99630d749776fbc80d44b.zip |
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@mlbassoc.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/oe-setup-builddir | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index a869fdc7c0..e4356f1551 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 |