diff options
author | Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> | 2018-03-23 23:52:26 +0530 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-31 11:50:13 -0700 |
commit | 58c23b47871eab3567af39b6e00b5449b6de0ca6 (patch) | |
tree | 73818b9e49e6d3b15494966defe02a61133b2cd3 /recipes-security/clamav | |
parent | 7ac11e2274ad6c49d157d5ad9122c2450e6fae8d (diff) | |
download | meta-security-58c23b47871eab3567af39b6e00b5449b6de0ca6.tar.gz |
clamav: Add missing clamav.service file to SRC_URI
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 --
Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-security/clamav')
-rw-r--r-- | recipes-security/clamav/clamav_0.99.3.bb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/recipes-security/clamav/clamav_0.99.3.bb b/recipes-security/clamav/clamav_0.99.3.bb index 2b07d69..dc26277 100644 --- a/recipes-security/clamav/clamav_0.99.3.bb +++ b/recipes-security/clamav/clamav_0.99.3.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=rel/0.99 \ | |||
14 | file://clamd.conf \ | 14 | file://clamd.conf \ |
15 | file://freshclam.conf \ | 15 | file://freshclam.conf \ |
16 | file://volatiles.03_clamav \ | 16 | file://volatiles.03_clamav \ |
17 | file://${BPN}.service \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
@@ -23,7 +24,7 @@ SO_VER = "7.1.1" | |||
23 | 24 | ||
24 | EXTRANATIVEPATH += "chrpath-native" | 25 | EXTRANATIVEPATH += "chrpath-native" |
25 | 26 | ||
26 | inherit autotools-brokensep pkgconfig useradd systemd | 27 | inherit autotools-brokensep pkgconfig useradd systemd |
27 | 28 | ||
28 | UID = "clamav" | 29 | UID = "clamav" |
29 | GID = "clamav" | 30 | GID = "clamav" |
@@ -87,6 +88,9 @@ do_install_append() { | |||
87 | install -m 0644 ${WORKDIR}/volatiles.03_clamav ${D}${sysconfdir}/default/volatiles/volatiles.03_clamav | 88 | install -m 0644 ${WORKDIR}/volatiles.03_clamav ${D}${sysconfdir}/default/volatiles/volatiles.03_clamav |
88 | sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/libclamav.pc | 89 | sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/libclamav.pc |
89 | rm ${D}/${libdir}/libclamav.so | 90 | rm ${D}/${libdir}/libclamav.so |
91 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then | ||
92 | install -D -m 0644 ${WORKDIR}/clamav.service ${D}${systemd_unitdir}/system/clamav.service | ||
93 | fi | ||
90 | } | 94 | } |
91 | 95 | ||
92 | pkg_postinst_${PN} () { | 96 | pkg_postinst_${PN} () { |
@@ -123,7 +127,8 @@ FILES_${PN}-freshclam = "${bindir}/freshclam \ | |||
123 | ${sysconfdir}/clamav ${sysconfdir}/default/volatiles \ | 127 | ${sysconfdir}/clamav ${sysconfdir}/default/volatiles \ |
124 | ${localstatedir}/lib/clamav \ | 128 | ${localstatedir}/lib/clamav \ |
125 | ${docdir}/${PN}-freshclam ${mandir}/man1/freshclam.* \ | 129 | ${docdir}/${PN}-freshclam ${mandir}/man1/freshclam.* \ |
126 | ${mandir}/man5/freshclam.conf.*" | 130 | ${mandir}/man5/freshclam.conf.* \ |
131 | ${systemd_unitdir}/system/clamav-freshclam.service" | ||
127 | 132 | ||
128 | FILES_${PN}-dev = " ${bindir}/clamav-config ${libdir}/*.la \ | 133 | FILES_${PN}-dev = " ${bindir}/clamav-config ${libdir}/*.la \ |
129 | ${libdir}/pkgconfig/*.pc \ | 134 | ${libdir}/pkgconfig/*.pc \ |