mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-05-07 04:58:47 +00:00
Code Issues Projects Releases Wiki Activity

suricata: fix QA error

Browse Source 
ollected errors:
 * check_data_file_clashes: Package suricata wants to install file .../1.0-r0/rootfs/var/run
	But that file is already provided by package  * base-files

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2018-10-18 18:31:01 -07:00
parent 6149fb61b0
commit b898dc231a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-security/suricata/suricata_4.0.5.bb
+5 -1
View File
@@ -69,6 +69,10 @@ do_install_append () {
-e s:/bin/kill:${base_bindir}/kill:g \ -e s:/bin/kill:${base_bindir}/kill:g \
-e s:/usr/lib:${libdir}:g \ -e s:/usr/lib:${libdir}:g \
${WORKDIR}/suricata.service > ${D}${systemd_unitdir}/system/suricata.service ${WORKDIR}/suricata.service > ${D}${systemd_unitdir}/system/suricata.service
# Remove /var/run as it is created on startup
rm -rf ${D}${localstatedir}/run
} }
pkg_postinst_ontarget_${PN} () { pkg_postinst_ontarget_${PN} () {
@@ -80,7 +84,7 @@ fi
SYSTEMD_PACKAGES = "${PN}" SYSTEMD_PACKAGES = "${PN}"
PACKAGES =+ "${PN}-socketcontrol" PACKAGES =+ "${PN}-socketcontrol"
FILES_${PN} += "${systemd_unitdir} /run" FILES_${PN} += "${systemd_unitdir}"
FILES_${PN}-socketcontrol = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}" FILES_${PN}-socketcontrol = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml" CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml"