diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2018-06-12 18:13:44 +0000 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2018-09-04 07:33:51 -0700 |
| commit | 280157bc380ff98d24ac89674e332c48802574b1 (patch) | |
| tree | 5d027957071543e2f764bd7de83a14ad0ad8a6e9 /meta-oe/recipes-support | |
| parent | d1824f5572faa9d7cc8eb14dd83d61faa8c35988 (diff) | |
| download | meta-openembedded-contrib-280157bc380ff98d24ac89674e332c48802574b1.tar.gz | |
rarpd, sblim-sfcb, openct: inherit systemd unconditionally
* the inherit was controlled by VIRTUAL-RUNTIME_init_manager and the installation
of .service files by DISTRO_FEATURES and systemd was in DISTRO_FEATURES but not
in VIRTUAL-RUNTIME_init_manager it was causing QA issues about unpackaged
.service files
ERROR: rarpd-ss981107-r0 do_package: QA Issue: rarpd: Files/directories
were installed but not shipped in any package:
/lib
/lib/systemd
/lib/systemd/system
/lib/systemd/system/rarpd.service
ERROR: sblim-sfcb-1.4.9-r0 do_package: QA Issue: sblim-sfcb:
Files/directories were installed but not shipped in any package:
/lib
/lib/systemd
/lib/systemd/system
/lib/systemd/system/sblim-sfcb.service
ERROR: sblim-sfcb-1.4.9-r0 do_package: QA Issue: sblim-sfcb:
Files/directories were installed but not shipped in any package:
/lib
/lib/systemd
/lib/systemd/system
/lib/systemd/system/sblim-sfcb.service
* systemd.bbclass will take care of removing /lib/systemd when systemd
isn't in DISTRO_FEATURES, so we can remove both conditions
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/openct/openct_0.6.20.bb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index c7d7203eda..913290cd97 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} +inherit systemd SYSTEMD_SERVICE_${PN} += "openct.service " SYSTEMD_AUTO_ENABLE = "enable" @@ -77,10 +77,8 @@ do_install () { install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system - fi + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf |