Patchwork [2/2] scripts/oe-setup-builddir: Keep track of TEMPLATECONF setting

login
register
mail settings
Submitter Matthieu CRAPET
Date Feb. 25, 2014, 8:34 a.m.
Message ID <8672BB614B4CCA40A6B3BDD6FD82050B57543F61@COSNADEXC13.usr.ingenico.loc>
Download mbox | patch
Permalink /patch/67385/
State New
Headers show

Comments

Matthieu CRAPET - Feb. 25, 2014, 8:34 a.m.
Hi,

You can drop parenthesis in your test (it will create a useless subshell).

Regards,
Matthieu


-----Message d'origine-----
De : openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] De la part de Gary Thomas
Envoyé : lundi 24 février 2014 16:18
À : openembedded-core@lists.openembedded.org
Cc : Gary Thomas
Objet : [OE-core] [PATCH 2/2] 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.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 scripts/oe-setup-builddir |    8 ++++++++
 1 file changed, 8 insertions(+)

Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index a869fdc..4322158 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -37,8 +37,16 @@  fi
 
 cd "$BUILDDIR"
 
+if (test -f "$BUILDDIR/conf/template.conf") then
+    TEMPLATECONF=$(cat $BUILDDIR/conf/template.conf) fi
+
 TEMPLATECONF=${TEMPLATECONF:-meta/conf}
 
+if ! (test -f "$BUILDDIR/conf/template.conf") then
+    echo "$TEMPLATECONF" >$BUILDDIR/conf/template.conf fi
+
 #
 # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf  #
--
1.7.9.5

_______________________________________________