aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardas Meile <eduardas.m@fods.com>2018-12-04 18:19:45 +0200
committerArmin Kuster <akuster808@gmail.com>2019-02-04 21:27:51 -0800
commitd1a3da795329f03cc1bf71e30c4282b1e8d84333 (patch)
tree5b2bd8e42b6ffc57c89e8003de1235f4408e67a3
parent61d159eb11cdef3d24a7aa58d07fc1e1b4f9191f (diff)
downloadmeta-openembedded-contrib-d1a3da795329f03cc1bf71e30c4282b1e8d84333.tar.gz
meta-openembedded-contrib-d1a3da795329f03cc1bf71e30c4282b1e8d84333.tar.bz2
meta-openembedded-contrib-d1a3da795329f03cc1bf71e30c4282b1e8d84333.zip
toybox: fix to use "usrmerge" distro feature properly
Signed-off-by: Eduardas Meile <eduardas.m@fods.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-core/toybox/toybox_0.7.5.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-core/toybox/toybox_0.7.5.bb b/meta-oe/recipes-core/toybox/toybox_0.7.5.bb
index 7e8e7b2eaa..1ea868f672 100644
--- a/meta-oe/recipes-core/toybox/toybox_0.7.5.bb
+++ b/meta-oe/recipes-core/toybox/toybox_0.7.5.bb
@@ -60,7 +60,7 @@ python do_package_prepend () {
dvar = d.getVar('D')
pn = d.getVar('PN')
- target = "/bin/toybox"
+ target = d.expand("${base_bindir}/toybox")
f = open('%s/etc/toybox.links' % (dvar), 'r')
for alt_link_name in f: