CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

busybox: fix usrmerge install

Browse Source 
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.ratiu@ni.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Ioan-Adrian Ratiu 2018-07-20 15:19:52 +03:00 committed by Joe MacDonald
parent 78eca8242e
commit 64122293d2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
recipes-core/busybox/busybox_selinux.inc
View File

@ -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