summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-10-18 18:31:01 -0700
committerArmin Kuster <akuster808@gmail.com>2018-10-31 09:02:21 -0700
commitb898dc231a1e7ee0940a294395ff77fe6e012a7e (patch)
tree9d1122fc7b22054de73a64ee066da1c5adb84021
parent6149fb61b0df2611b58d08b3816c4a8766fe38e9 (diff)
downloadmeta-security-b898dc231a1e7ee0940a294395ff77fe6e012a7e.tar.gz
suricata: fix QA error
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>
-rw-r--r--recipes-security/suricata/suricata_4.0.5.bb6
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes-security/suricata/suricata_4.0.5.bb b/recipes-security/suricata/suricata_4.0.5.bb
index b30e9c5..90b4638 100644
--- a/recipes-security/suricata/suricata_4.0.5.bb
+++ b/recipes-security/suricata/suricata_4.0.5.bb
@@ -69,6 +69,10 @@ do_install_append () {
69 -e s:/bin/kill:${base_bindir}/kill:g \ 69 -e s:/bin/kill:${base_bindir}/kill:g \
70 -e s:/usr/lib:${libdir}:g \ 70 -e s:/usr/lib:${libdir}:g \
71 ${WORKDIR}/suricata.service > ${D}${systemd_unitdir}/system/suricata.service 71 ${WORKDIR}/suricata.service > ${D}${systemd_unitdir}/system/suricata.service
72
73 # Remove /var/run as it is created on startup
74 rm -rf ${D}${localstatedir}/run
75
72} 76}
73 77
74pkg_postinst_ontarget_${PN} () { 78pkg_postinst_ontarget_${PN} () {
@@ -80,7 +84,7 @@ fi
80SYSTEMD_PACKAGES = "${PN}" 84SYSTEMD_PACKAGES = "${PN}"
81 85
82PACKAGES =+ "${PN}-socketcontrol" 86PACKAGES =+ "${PN}-socketcontrol"
83FILES_${PN} += "${systemd_unitdir} /run" 87FILES_${PN} += "${systemd_unitdir}"
84FILES_${PN}-socketcontrol = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}" 88FILES_${PN}-socketcontrol = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
85 89
86CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml" 90CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml"