scripts/oe-setup-builddir: copy conf-notes.txt to build dir
PATCH 1/1 scripts/oe-setup-builddir: copy conf-notes.txt to build dir
From: Stéphane Veyret <[email protected]>
Since commit 569d4cd325, if one is using a custom template directory containing a conf-notes.txt, this file is only displayed when creating a new environment. When entering an already existing environment, only the default poky conf-notes.txt is displayed.
This patch copies the conf-notes.txt to display to the build directory, so that the good file is shown, even when templateconf.cfg is not used.
Signed-off-by Stéphane Veyret <[email protected]>
--- scripts/oe-setup-builddir | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
scripts/oe-setup-builddir +9 -5
@@ -98,9 +98,17 @@ EOM SHOWYPDOC=yes fi +if [ -z "$OECORENOTESCONF" ]; then + OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" +fi +if [ ! -r "$BUILDDIR/conf/conf-notes.txt" ]; then + [ ! -r "$OECORENOTESCONF" ] || cp "$OECORENOTESCONF" "$BUILDDIR/conf/conf-notes.txt" +fi + # Prevent disturbing a new GIT clone in same console unset OECORELOCALCONF unset OECORELAYERCONF +unset OECORENOTESCONF # Ending the first-time run message. Show the YP Documentation banner. if [ -n "$SHOWYPDOC" ]; then
@@ -116,11 +124,7 @@ EOM # unset SHOWYPDOC fi -if [ -z "$OECORENOTESCONF" ]; then - OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" -fi -[ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" -unset OECORENOTESCONF +[ ! -r "$BUILDDIR/conf/conf-notes.txt" ] || cat "$BUILDDIR/conf/conf-notes.txt" if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg"
Signature · 1 line
2.39.3