diff options
| author |   Stéphane Veyret <stephane@neptura.org> | 2023-07-02 14:21:21 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-10 11:36:06 +0100 |
| commit | 845e8292f218d740ee653fa68bc3110aec1af3c5 (patch) | |
| tree | 35c98591857eec9b51022c6d1949668c806acec2 /scripts | |
| parent | 1067c44ee48b2e72624c42c8e1675307bd73900e (diff) | |
| download | openembedded-core-845e8292f218d740ee653fa68bc3110aec1af3c5.tar.gz | |
scripts/oe-setup-builddir: copy conf-notes.txt to build dir
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 <sveyret@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/oe-setup-builddir | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 89ae30f609..678aeac4be 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -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" |