diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2014-08-27 23:03:09 +0200 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2017-06-26 22:57:12 +0200 |
| commit | 08a075d2288a05e4a409f99261ea4e219c669f1f (patch) | |
| tree | 5e489e88424accd9cf38cc28cfe9123b3a56a3ac | |
| parent | 99580aaf067c7ea315d8a23e960f459a8509098d (diff) | |
| download | openembedded-core-contrib-08a075d2288a05e4a409f99261ea4e219c669f1f.tar.gz | |
dpkg: always install dpkg-configure.service
systemd.bbclass handles everything based on DISTRO_FEATURES.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
| -rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index a0203a3f2c..8c88a324e3 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -11,11 +11,7 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" inherit autotools gettext perlnative pkgconfig systemd -python () { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - pn = d.getVar('PN', True) - d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'dpkg-configure.service') -} +SYSTEMD_SERVICE_${PN} = "dpkg-configure.service" export PERL = "${bindir}/perl" PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" @@ -48,15 +44,13 @@ do_install_append_class-native() { } do_install_append () { - if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)};then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_unitdir}/system/ - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@BINDIR@,${bindir},g' \ - -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \ - ${D}${systemd_unitdir}/system/dpkg-configure.service - fi + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_unitdir}/system + sed -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@BINDIR@,${bindir},g' \ + -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \ + -i ${D}${systemd_unitdir}/system/dpkg-configure.service } PACKAGES =+ "dpkg-perl dselect libdpkg-perl update-alternatives-dpkg" |