From d68a86d87aa017dd0fecb0f626d22711efefcd3f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 28 Mar 2017 10:31:50 +0100 Subject: dnf: remove systemd units in nativesdk builds If the DISTRO_FEATURES contain systemd then the systemd class won't delete the units for us. Until the class is fixed to do this automatically, delete them explicitly. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/dnf/dnf_git.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_git.bb b/meta/recipes-devtools/dnf/dnf_git.bb index 7d7f597e5a..b6b6ceaff1 100644 --- a/meta/recipes-devtools/dnf/dnf_git.bb +++ b/meta/recipes-devtools/dnf/dnf_git.bb @@ -42,6 +42,12 @@ do_install_append_class-native() { RPM_NO_CHROOT_FOR_SCRIPTS=1 } +# If the distro uses systemd then these won't be deleted by systemd.bbclass +do_install_append_class-nativesdk() { + rm -rf ${D}/${systemd_unitdir} + rmdir --ignore-fail-on-non-empty ${D}${nonarch_base_libdir} +} + SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-download.service dnf-automatic-download.timer \ dnf-automatic-install.service dnf-automatic-install.timer \ -- cgit v1.2.3