If DISTRO_FEATURES contains usrmerge then busybox binaries are
installed under /usr/bin not /bin so use ${base_bindir} to support
both paths and avoid QA errors.
Signed-off-by: Ioan-Adrian Ratiu <adrian.ra...@ni.com>
---
recipes-core/busybox/busybox_selinux.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-core/busybox/busybox_selinux.inc
b/recipes-core/busybox/busybox_selinux.inc
index 3f20815..c38672b 100644
--- a/recipes-core/busybox/busybox_selinux.inc
+++ b/recipes-core/busybox/busybox_selinux.inc
@@ -46,10 +46,10 @@ python create_sh_wrapper_reset_alternative_vars () {
return
if os.path.exists('%s/etc/busybox.links' % (dvar)):
- create_sh_alternative_vars("/etc/busybox.links", "/bin/busybox",
0o0755)
+ create_sh_alternative_vars("/etc/busybox.links",
"${base_bindir}/busybox", 0o0755)
else:
- create_sh_alternative_vars("/etc/busybox.links.nosuid",
"/bin/busybox.nosuid", 0o0755)
- create_sh_alternative_vars("/etc/busybox.links.suid",
"/bin/busybox.suid", 0o4755)
+ create_sh_alternative_vars("/etc/busybox.links.nosuid",
"${base_bindir}/busybox.nosuid", 0o0755)
+ create_sh_alternative_vars("/etc/busybox.links.suid",
"${base_bindir}/busybox.suid", 0o4755)
}
# Add to PACKAGEBUILDPKGD so it could override the alternatives, which are set
in
--
2.18.0
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
