diff options
author | Oleksandr Hnatiuk <ohnatiuk@cisco.com> | 2023-07-25 09:51:48 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-27 21:07:53 +0100 |
commit | 9205ac1d5359546883719918dddd75d354b7b5fd (patch) | |
tree | 08f6cfa7bdbfaf541fa3d77b1c279f477ce7855b /meta | |
parent | 0da5484b2f1667c3fb46f7b074e1b231ca93212f (diff) | |
download | poky-9205ac1d5359546883719918dddd75d354b7b5fd.tar.gz |
file: fix the way path is written to environment-setup.d
$OECORE_NATIVE_SYSROOT is not escaped, thus it is expanded to an empty string.
This happens to work because we have ${datadir} which in this context is
relocated to the buildtools sysroot after installation of buildtools.
If the $ before OECORE_NATIVE_SYSROOT is escaped, it will be saved to file.sh
as intended, but MAGIC will point to the wrong location because both
OECORE_NATIVE_SYSROOT and datadir resolve to sysroot which doubles the path
like so:
/path/to/buildtools/sysroots/x86_64-xesdk-linux/path/to/buildtools/sysroots/x86_64-xesdk-linux/usr/share/misc/magic.mgc
which does not exist. So, removing reference to OECORE_NATIVE_SYSROOT.
(From OE-Core rev: c6206249683876670602888e78ecaf719753a317)
Signed-off-by: Oleksandr Hnatiuk <ohnatiuk@cisco.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/file/file_5.44.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/file/file_5.44.bb b/meta/recipes-devtools/file/file_5.44.bb index 0834384230..3ce266475b 100644 --- a/meta/recipes-devtools/file/file_5.44.bb +++ b/meta/recipes-devtools/file/file_5.44.bb | |||
@@ -48,7 +48,7 @@ do_install:append:class-nativesdk() { | |||
48 | create_wrapper ${D}/${bindir}/file MAGIC=${datadir}/misc/magic.mgc | 48 | create_wrapper ${D}/${bindir}/file MAGIC=${datadir}/misc/magic.mgc |
49 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 49 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
50 | cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/file.sh | 50 | cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/file.sh |
51 | export MAGIC="$OECORE_NATIVE_SYSROOT${datadir}/misc/magic.mgc" | 51 | export MAGIC="${datadir}/misc/magic.mgc" |
52 | EOF | 52 | EOF |
53 | } | 53 | } |
54 | 54 | ||