summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pseudo/pseudo.inc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-30 16:31:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-31 13:58:01 +0100
commit1a826482bc1028ebf6da191466630f8b9df660e5 (patch)
tree5c88429e2d9064a3f4eac470aac6c81819c6bddc /meta/recipes-devtools/pseudo/pseudo.inc
parent1aa01b21b55f741344c31474bdd3db2800e9857d (diff)
downloadpoky-1a826482bc1028ebf6da191466630f8b9df660e5.tar.gz
pseudo: Ensure we use our own libsqlite
pseudo-native is special in that bitbake ends up executing it from the sysroot-components directory before we have any workdirs for the bitbake fakeroot worker. Since we switched to dynamically linking sqlite, it means sqlite from the host system may be found, we really want the version in sysroot-components. Trying to run tasks to create some special environment for pseudo is hard and error prone. The simplest fix is to add an RPATH to the binary so that it can correctly find the sqlite we want. Unfortunately passing $ORIGIN into make doesn't work so well with shell quoting so we have to fix that during do_install. [YOCTO #13814] (From OE-Core rev: 3937ca9e2dfabb1ce9bce1d536b60b1e2a43739b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo/pseudo.inc')
-rw-r--r--meta/recipes-devtools/pseudo/pseudo.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index 7ff8e449e9..50e30064bd 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -16,6 +16,7 @@ INSANE_SKIP_${PN}-dbg += "libdir"
16PROVIDES += "virtual/fakeroot" 16PROVIDES += "virtual/fakeroot"
17 17
18MAKEOPTS = "" 18MAKEOPTS = ""
19MAKEOPTS_class-native = "'RPATH=-Wl,--rpath=XORIGIN/../../../sqlite3-native/usr/lib/'"
19 20
20inherit siteinfo pkgconfig 21inherit siteinfo pkgconfig
21 22
@@ -115,6 +116,7 @@ do_install () {
115} 116}
116 117
117do_install_append_class-native () { 118do_install_append_class-native () {
119 chrpath ${D}${bindir}/pseudo -r `chrpath ${D}${bindir}/pseudo | cut -d = -f 2 | sed s/XORIGIN/\\$ORIGIN/`
118 install -d ${D}${sysconfdir} 120 install -d ${D}${sysconfdir}
119 # The fallback files should never be modified 121 # The fallback files should never be modified
120 install -m 444 ${WORKDIR}/fallback-passwd ${D}${sysconfdir}/passwd 122 install -m 444 ${WORKDIR}/fallback-passwd ${D}${sysconfdir}/passwd