sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ross Burton 2015-02-20 16:39:40 +00:00 committed by Richard Purdie
parent 76c8fadec9
commit bc309f0901
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-devtools/opkg/opkg_0.2.4.bb
View File

@ -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' \