summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-06-14 14:25:06 -0400
committerArmin Kuster <akuster808@gmail.com>2024-06-17 08:29:11 -0400
commitabfa203aa6ec8a93d636f362b2ab2166d9952c98 (patch)
tree60ee5eb15f2edf5563e6fab72f915a433a07b00a
parentcc775387a1a5fd5057f322c72bb818967627cd45 (diff)
downloadmeta-security-abfa203aa6ec8a93d636f362b2ab2166d9952c98.tar.gz
suricata: Start WORKDIR -> UNPACKDIR transition
Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-ids/suricata/suricata_7.0.0.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes-ids/suricata/suricata_7.0.0.bb b/recipes-ids/suricata/suricata_7.0.0.bb
index a01b3d9..21d4306 100644
--- a/recipes-ids/suricata/suricata_7.0.0.bb
+++ b/recipes-ids/suricata/suricata_7.0.0.bb
@@ -66,6 +66,8 @@ do_configure:prepend () {
66 oe_runconf 66 oe_runconf
67} 67}
68 68
69CFLAGS += "-Wno-error=incompatible-pointer-types"
70
69do_compile () { 71do_compile () {
70 # we do this to bypass the make provided by this pkg 72 # we do this to bypass the make provided by this pkg
71 # patches Makefile to skip the subdir 73 # patches Makefile to skip the subdir
@@ -82,7 +84,7 @@ do_install () {
82 oe_runmake install DESTDIR=${D} 84 oe_runmake install DESTDIR=${D}
83 85
84 install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles 86 install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles
85 install -m 0644 ${WORKDIR}/volatiles.03_suricata ${D}${sysconfdir}/default/volatiles/03_suricata 87 install -m 0644 ${UNPACKDIR}/volatiles.03_suricata ${D}${sysconfdir}/default/volatiles/03_suricata
86 88
87 install -m 0644 ${S}/threshold.config ${D}${sysconfdir}/suricata 89 install -m 0644 ${S}/threshold.config ${D}${sysconfdir}/suricata
88 install -m 0644 ${S}/suricata.yaml ${D}${sysconfdir}/suricata 90 install -m 0644 ${S}/suricata.yaml ${D}${sysconfdir}/suricata