mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-06 04:41:06 +00:00
Check for usrmerge before removing /usr/lib
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
40ddb9e5ed
commit
f4ef325fc3
@@ -25,7 +25,9 @@ SYSTEMD_SERVICE:${PN} = "cryptmount.service"
|
|||||||
do_install:append () {
|
do_install:append () {
|
||||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
|
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
|
||||||
install -D -m 0644 ${S}/sysinit/cryptmount.service ${D}${systemd_system_unitdir}/cryptmount.service
|
install -D -m 0644 ${S}/sysinit/cryptmount.service ${D}${systemd_system_unitdir}/cryptmount.service
|
||||||
rm -fr ${D}/usr/lib
|
if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
|
||||||
|
rm -fr ${D}/usr/lib
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user