diff options
author | Stéphane Veyret <stephane@neptura.org> | 2023-07-02 14:21:21 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-08-01 06:17:28 -1000 |
commit | ee15b3129077b4ec01f86056b64c37f70fef994d (patch) | |
tree | 2046273e0305eba5bc1e6466cf843b440b0be86f /scripts/oe-setup-builddir | |
parent | f1f41ec4eafc4a0818bbb1191c4f8556429c72b0 (diff) | |
download | poky-ee15b3129077b4ec01f86056b64c37f70fef994d.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.
(From OE-Core rev: 99e814215d164274cb29ba34ab06c11172dbe9f0)
Signed-off-by: Stéphane Veyret <sveyret@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 845e8292f218d740ee653fa68bc3110aec1af3c5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts/oe-setup-builddir')
-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 | |||
98 | SHOWYPDOC=yes | 98 | SHOWYPDOC=yes |
99 | fi | 99 | fi |
100 | 100 | ||
101 | if [ -z "$OECORENOTESCONF" ]; then | ||
102 | OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" | ||
103 | fi | ||
104 | if [ ! -r "$BUILDDIR/conf/conf-notes.txt" ]; then | ||
105 | [ ! -r "$OECORENOTESCONF" ] || cp "$OECORENOTESCONF" "$BUILDDIR/conf/conf-notes.txt" | ||
106 | fi | ||
107 | |||
101 | # Prevent disturbing a new GIT clone in same console | 108 | # Prevent disturbing a new GIT clone in same console |
102 | unset OECORELOCALCONF | 109 | unset OECORELOCALCONF |
103 | unset OECORELAYERCONF | 110 | unset OECORELAYERCONF |
111 | unset OECORENOTESCONF | ||
104 | 112 | ||
105 | # Ending the first-time run message. Show the YP Documentation banner. | 113 | # Ending the first-time run message. Show the YP Documentation banner. |
106 | if [ -n "$SHOWYPDOC" ]; then | 114 | if [ -n "$SHOWYPDOC" ]; then |
@@ -116,11 +124,7 @@ EOM | |||
116 | # unset SHOWYPDOC | 124 | # unset SHOWYPDOC |
117 | fi | 125 | fi |
118 | 126 | ||
119 | if [ -z "$OECORENOTESCONF" ]; then | 127 | [ ! -r "$BUILDDIR/conf/conf-notes.txt" ] || cat "$BUILDDIR/conf/conf-notes.txt" |
120 | OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" | ||
121 | fi | ||
122 | [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" | ||
123 | unset OECORENOTESCONF | ||
124 | 128 | ||
125 | if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then | 129 | if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then |
126 | echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" | 130 | echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" |