From 64122293d28bf9bfa3fa953354f768d350d02d24 Mon Sep 17 00:00:00 2001 From: Ioan-Adrian Ratiu Date: Fri, 20 Jul 2018 15:19:52 +0300 Subject: busybox: fix usrmerge install 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 Signed-off-by: Joe MacDonald --- recipes-core/busybox/busybox_selinux.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-core/busybox/busybox_selinux.inc b/recipes-core/busybox/busybox_selinux.inc index 3f20815..df7c117 100644 --- a/recipes-core/busybox/busybox_selinux.inc +++ b/recipes-core/busybox/busybox_selinux.inc @@ -8,6 +8,7 @@ python create_sh_wrapper_reset_alternative_vars () { dvar = d.getVar('D', True) pn = d.getVar('PN', True) + base_bindir = d.getVar('base_bindir', True) def create_sh_alternative_vars(links, target, mode): import shutil @@ -46,10 +47,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", "%s/busybox" % base_bindir, 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", "%s/busybox.nosuid" % base_bindir, 0o0755) + create_sh_alternative_vars("/etc/busybox.links.suid", "%s/busybox.suid" % base_bindir, 0o4755) } # Add to PACKAGEBUILDPKGD so it could override the alternatives, which are set in -- cgit v1.2.3-54-g00ecf