diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2014-08-27 23:03:09 +0200 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2015-02-23 17:15:51 +0100 |
| commit | 464b28761233fbc7456b8830fb04e04ca2a7597e (patch) | |
| tree | a5f20cce20735e70b7ef11d499571a6e1da65e6d | |
| parent | e32f4d8303b0ae43a81109d2f2b7ac3e40f8fd6b (diff) | |
| download | openembedded-core-contrib-464b28761233fbc7456b8830fb04e04ca2a7597e.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 14d7b9c68b..100984fe8e 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -12,11 +12,7 @@ S = "${WORKDIR}/${BPN}-${PV}" inherit autotools gettext perlnative pkgconfig systemd -python () { - if not oe.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" @@ -46,15 +42,13 @@ do_install_append_class-native() { } do_install_append () { - if ${@base_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" |