summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/opkg
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-02-20 16:39:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-21 22:05:35 +0000
commitbc309f0901bad79cfab8ff986cf063375cc48ec4 (patch)
tree7ff6a56615d1e6f2efb6a82b6683458509cb55c1 /meta/recipes-devtools/opkg
parent76c8fadec9fee77e7eaa7dcf5de2fb86dfcc6d9c (diff)
downloadast2050-yocto-poky-bc309f0901bad79cfab8ff986cf063375cc48ec4.zip
ast2050-yocto-poky-bc309f0901bad79cfab8ff986cf063375cc48ec4.tar.gz
opkg: fix systemd unit installation
SYSTEMD_SERVICE doesn't need to be set conditionally, and units should be installed if the systemd DISTRO_FEATURE is enabled, not if sysvinit isn't enabled. (From OE-Core rev: bb8a7b906204b25f07fe568883c2d605593c323c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg')
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.2.4.bb8
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
index 7b49d5e..4051b72 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
@@ -26,11 +26,7 @@ SRC_URI[sha256sum] = "0f40c7e457d81edf9aedc07c778f4697111ab163a38ef95999faece015
inherit autotools 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), 'opkg-configure.service')
-}
+SYSTEMD_SERVICE_${PN} = "opkg-configure.service"
target_localstatedir := "${localstatedir}"
OPKGLIBDIR = "${target_localstatedir}/lib"
@@ -64,7 +60,7 @@ do_install_append () {
# We need to create the lock directory
install -d ${D}${OPKGLIBDIR}/opkg
- if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/opkg-configure.service ${D}${systemd_unitdir}/system/
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
OpenPOWER on IntegriCloud