diff mbox

dnf: remove systemd units in nativesdk builds

Message ID 1490693634-29673-1-git-send-email-ross.burton@intel.com
State Accepted
Commit d68a86d87aa017dd0fecb0f626d22711efefcd3f
Headers show

Commit Message

Ross Burton March 28, 2017, 9:33 a.m. UTC
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>

---
 meta/recipes-devtools/dnf/dnf_git.bb | 6 ++++++
 1 file changed, 6 insertions(+)

-- 
2.8.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox

Patch

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 \