[yocto] [meta-security][rocko][PATCH v2] clamav: Add missing clamav.service file to SRC_URI
Jagadeesh Krishnanjanappa
jkrishnanjanappa at mvista.com
Fri Mar 23 12:10:41 PDT 2018
This solves the below error when systemd is used as init manager,
-- snip --
ERROR: clamav-0.99.2-r0 do_package: SYSTEMD_SERVICE_clamav value clamav.service does not exist
ERROR: clamav-0.99.2-r0 do_package: Function failed: systemd_populate_packages
-- snip --
Other issue:
* Ship /lib/systemd/system/clamav-freshclam.service into ${PN}-freshclam
package, to solve below warning:
-- snip --
[10240] WARNING: QA Issue: clamav: Files/directories were installed but not shipped in any package:
/lib/systemd/system/clamav-freshclam.service
-- snip --
V2 changes:
* Removed non-existent multilib-alternatives bbclass
Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa at mvista.com>
---
recipes-security/clamav/clamav_0.99.2.bb | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/recipes-security/clamav/clamav_0.99.2.bb b/recipes-security/clamav/clamav_0.99.2.bb
index 5dfda8f..a7f69df 100644
--- a/recipes-security/clamav/clamav_0.99.2.bb
+++ b/recipes-security/clamav/clamav_0.99.2.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=${PV} \
file://clamd.conf \
file://freshclam.conf \
file://volatiles.03_clamav \
+ file://${BPN}.service \
"
SRC_URI[md5sum] = "61b51a04619aeafd965892a53f86d192"
@@ -26,7 +27,7 @@ SO_VER = "7.1.1"
EXTRANATIVEPATH += "chrpath-native"
-inherit autotools-brokensep pkgconfig useradd systemd
+inherit autotools-brokensep pkgconfig useradd systemd
UID = "clamav"
GID = "clamav"
@@ -90,6 +91,9 @@ do_install_append() {
install -m 0644 ${WORKDIR}/volatiles.03_clamav ${D}${sysconfdir}/default/volatiles/volatiles.03_clamav
sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/libclamav.pc
rm ${D}/${libdir}/libclamav.so
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
+ install -D -m 0644 ${WORKDIR}/clamav.service ${D}${systemd_unitdir}/system/clamav.service
+ fi
}
pkg_postinst_${PN} () {
@@ -126,7 +130,8 @@ FILES_${PN}-freshclam = "${bindir}/freshclam \
${sysconfdir}/clamav ${sysconfdir}/default/volatiles \
${localstatedir}/lib/clamav \
${docdir}/${PN}-freshclam ${mandir}/man1/freshclam.* \
- ${mandir}/man5/freshclam.conf.*"
+ ${mandir}/man5/freshclam.conf.* \
+ ${systemd_unitdir}/system/clamav-freshclam.service"
FILES_${PN}-dev = " ${bindir}/clamav-config ${libdir}/*.la \
${libdir}/pkgconfig/*.pc \
--
2.7.4
More information about the yocto
mailing list