[meta-security,10/17] suricata: UNPACKDIR fix

Message ID	20240725090131.75860-10-mikko.rapeli@linaro.org
State	New
Headers	show Return-Path: <mikko.rapeli@linaro.org> ip: 209.85.167.42, mailfrom: mikko.rapeli@linaro.org) From: Mikko Rapeli <mikko.rapeli@linaro.org> To: yocto-patches@lists.yoctoproject.org Cc: Mikko Rapeli <mikko.rapeli@linaro.org> Subject: [meta-security][PATCH 10/17] suricata: UNPACKDIR fix Date: Thu, 25 Jul 2024 12:01:24 +0300 Message-ID: <20240725090131.75860-10-mikko.rapeli@linaro.org> In-Reply-To: <20240725090131.75860-1-mikko.rapeli@linaro.org> References: <20240725090131.75860-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[meta-security,01/17] bastille: UNPACKDIR fixes \| expand [meta-security,01/17] bastille: UNPACKDIR fixes [meta-security,02/17] python3-fail2ban: UNPACKDIR fix [meta-security,03/17] initscripts: UNPACKDIR fixes [meta-security,04/17] initramfs-framework-ima: UNPACKDIR fix [meta-security,05/17] ima-policy-appraise-all: UNPACKDIR fix [meta-security,06/17] ima-policy-simple: UNPACKDIR fix [meta-security,07/17] parsec-service: UNPACKDIR fixes [meta-security,08/17] trousers: UNPACKDIR fixes [meta-security,09/17] aide: UNPACKDIR fixes [meta-security,10/17] suricata: UNPACKDIR fix [meta-security,11/17] arpwatch: UNPACKDIR fixes [meta-security,12/17] clamav: UNPACKDIR fixes [meta-security,13/17] arpwatch: disable compiler errors [meta-security,14/17] ima-policy-hashed: set S [meta-security,15/17] ima-policy-appraise-all: set S [meta-security,16/17] ima-policy-simple: set S [meta-security,17/17] suricata: remove build paths

Message ID

20240725090131.75860-10-mikko.rapeli@linaro.org

State

New

Headers

From: Mikko Rapeli <mikko.rapeli@linaro.org>
To: yocto-patches@lists.yoctoproject.org
Cc: Mikko Rapeli <mikko.rapeli@linaro.org>
Subject: [meta-security][PATCH 10/17] suricata: UNPACKDIR fix
Date: Thu, 25 Jul 2024 12:01:24 +0300
Message-ID: <20240725090131.75860-10-mikko.rapeli@linaro.org>
In-Reply-To: <20240725090131.75860-1-mikko.rapeli@linaro.org>
References: <20240725090131.75860-1-mikko.rapeli@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[meta-security,01/17] bastille: UNPACKDIR fixes | expand

Commit Message

Mikko Rapeli July 25, 2024, 9:01 a.m. UTC

New poky uses UNPACKDIR instead of WORKDIR

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 recipes-ids/suricata/suricata_7.0.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-ids/suricata/suricata_7.0.0.bb b/recipes-ids/suricata/suricata_7.0.0.bb
index 21d4306..d87cebd 100644
--- a/recipes-ids/suricata/suricata_7.0.0.bb
+++ b/recipes-ids/suricata/suricata_7.0.0.bb
@@ -91,7 +91,7 @@  do_install () {
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/tmpfiles.d
-        install -m 0644 ${WORKDIR}/tmpfiles.suricata ${D}${sysconfdir}/tmpfiles.d/suricata.conf
+        install -m 0644 ${UNPACKDIR}/tmpfiles.suricata ${D}${sysconfdir}/tmpfiles.d/suricata.conf
 
         install -d ${D}${systemd_unitdir}/system
         sed  -e s:/etc:${sysconfdir}:g \
@@ -100,7 +100,7 @@  do_install () {
              -e s:/usr/bin:${bindir}:g \
              -e s:/bin/kill:${base_bindir}/kill:g \
              -e s:/usr/lib:${libdir}:g \
-             ${WORKDIR}/suricata.service > ${D}${systemd_unitdir}/system/suricata.service
+             ${UNPACKDIR}/suricata.service > ${D}${systemd_unitdir}/system/suricata.service
     fi
 
     # Remove /var/run as it is created on startup

[meta-security,10/17] suricata: UNPACKDIR fix

Commit Message

Patch