suricata: fix QA error

PATCH New Armin Kuster 1 participant 1 message Oct 19, 2018

Share & tools

Armin Kuster

author

2018-10-19 01:41 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 recipes-security/suricata/suricata_4.0.5.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

recipes-security/suricata/suricata_4.0.5.bb +5 -1

index b30e9c5..90b4638 100644
@@ -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"

Signature · 1 line

2.7.4