[oe-commits] [openembedded-core] 01/01: dnf: remove systemd units in nativesdk builds

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit d68a86d87aa017dd0fecb0f626d22711efefcd3f
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Mar 28 10:31:50 2017 +0100

    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 <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 7d7f597..b6b6cea 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 \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.