aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-03-28 10:31:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-28 10:34:37 +0100
commit415b72ffcbd26e5f3664370d8b2a9b8105fb6342 (patch)
treed743212bc1f2287cdbf3fd48bebc5fce652a2de2
parentc76abc379ed3e0205e1a244968cae87b8e6e0936 (diff)
downloadpoky-2.3_M3.tar.gz
poky-2.3_M3.tar.bz2
poky-2.3_M3.zip
dnf: remove systemd units in nativesdk builds2.3_M3
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. (From OE-Core rev: d68a86d87aa017dd0fecb0f626d22711efefcd3f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dnf/dnf_git.bb6
1 files changed, 6 insertions, 0 deletions
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 \