diff options
author | Jeremy A. Puhlman <jpuhlman@mvista.com> | 2024-03-06 23:04:26 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2024-03-27 12:36:58 -0400 |
commit | f4ef325fc31e530f7aa73e0fd94f572a48747a68 (patch) | |
tree | 4609f505fd51797e8362a2f7b5a083003059714d | |
parent | 40ddb9e5ed71cc8787c929d5011f09e244123ef0 (diff) | |
download | meta-security-f4ef325fc31e530f7aa73e0fd94f572a48747a68.tar.gz |
Check for usrmerge before removing /usr/lib
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/cryptmount/cryptmount_6.2.0.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes-security/cryptmount/cryptmount_6.2.0.bb b/recipes-security/cryptmount/cryptmount_6.2.0.bb index d815e1d..d69d88b 100644 --- a/recipes-security/cryptmount/cryptmount_6.2.0.bb +++ b/recipes-security/cryptmount/cryptmount_6.2.0.bb | |||
@@ -25,7 +25,9 @@ SYSTEMD_SERVICE:${PN} = "cryptmount.service" | |||
25 | do_install:append () { | 25 | do_install:append () { |
26 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 26 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
27 | install -D -m 0644 ${S}/sysinit/cryptmount.service ${D}${systemd_system_unitdir}/cryptmount.service | 27 | install -D -m 0644 ${S}/sysinit/cryptmount.service ${D}${systemd_system_unitdir}/cryptmount.service |
28 | rm -fr ${D}/usr/lib | 28 | if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then |
29 | rm -fr ${D}/usr/lib | ||
30 | fi | ||
29 | fi | 31 | fi |
30 | } | 32 | } |
31 | 33 | ||