From b898dc231a1e7ee0940a294395ff77fe6e012a7e Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 18 Oct 2018 18:31:01 -0700 Subject: 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 --- recipes-security/suricata/suricata_4.0.5.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 () { -e s:/bin/kill:${base_bindir}/kill:g \ -e s:/usr/lib:${libdir}:g \ ${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} () { @@ -80,7 +84,7 @@ fi SYSTEMD_PACKAGES = "${PN}" PACKAGES =+ "${PN}-socketcontrol" -FILES_${PN} += "${systemd_unitdir} /run" +FILES_${PN} += "${systemd_unitdir}" FILES_${PN}-socketcontrol = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}" CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml" -- cgit v1.2.3-54-g00ecf