From: Ross Burton <ross.burton@intel.com>
Date: Tue, 28 Mar 2017 09:31:50 +0000 (+0100)
Subject: dnf: remove systemd units in nativesdk builds
X-Git-Tag: yocto-2.3~317
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d68a86d87aa017dd0fecb0f626d22711efefcd3f;p=openembedded-core.git

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@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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 \