From: Oleksandr Hnatiuk <[email protected]>

$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.

Signed-off-by: Oleksandr Hnatiuk <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
(cherry picked from commit c6206249683876670602888e78ecaf719753a317)
Signed-off-by: Steve Sakoman <[email protected]>
---
 meta/recipes-devtools/file/file_5.44.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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() {
        create_wrapper ${D}/${bindir}/file MAGIC=${datadir}/misc/magic.mgc
        mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
        cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/file.sh
-               export MAGIC="$OECORE_NATIVE_SYSROOT${datadir}/misc/magic.mgc"
+               export MAGIC="${datadir}/misc/magic.mgc"
        EOF
 }
 
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#185795): 
https://lists.openembedded.org/g/openembedded-core/message/185795
Mute This Topic: https://lists.openembedded.org/mt/100666384/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to