summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2021-07-29 16:33:55 -0700
committerArmin Kuster <akuster808@gmail.com>2021-08-01 08:47:08 -0700
commit01399d19d0693f71a51b1167aa3c708c9a39477a (patch)
tree2c4bbbce4221843b364437fb551ac1e629a7c80e
parentd11b2079f3c62d532df250616cca27eaecf5c4a0 (diff)
downloadmeta-security-01399d19d0693f71a51b1167aa3c708c9a39477a.tar.gz
dynamix-layers: Convert to new override syntax
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb2
-rw-r--r--dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc2
-rw-r--r--dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb12
-rw-r--r--dynamic-layers/meta-rust/recipes-security/krill/krill_0.9.1.bb8
4 files changed, 12 insertions, 12 deletions
diff --git a/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb b/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb
index 38dece9..2a0c93c 100644
--- a/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb
+++ b/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb
@@ -23,5 +23,5 @@ do_configure () {
23 oe_runconf 23 oe_runconf
24} 24}
25 25
26RDEPENDS_${PN} += "zlib" 26RDEPENDS:${PN} += "zlib"
27 27
diff --git a/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc b/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc
index 8ddd5e2..5754617 100644
--- a/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc
+++ b/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "http://suricata-ids.org/"
2SECTION = "security Monitor/Admin" 2SECTION = "security Monitor/Admin"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4 4
5COMPATIBLE_HOST_powerpc = 'null' 5COMPATIBLE_HOST:powerpc = 'null'
diff --git a/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb b/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb
index 632f1d8..ca9e03e 100644
--- a/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb
+++ b/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb
@@ -122,7 +122,7 @@ CARGO_SRC_DIR = "rust"
122B = "${S}" 122B = "${S}"
123 123
124PACKAGECONFIG ??= "jansson file pcre yaml python pcap cap-ng net nfnetlink nss nspr " 124PACKAGECONFIG ??= "jansson file pcre yaml python pcap cap-ng net nfnetlink nss nspr "
125PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}" 125PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}"
126 126
127PACKAGECONFIG[pcre] = "--with-libpcre-includes=${STAGING_INCDIR} --with-libpcre-libraries=${STAGING_LIBDIR}, ,libpcre ," 127PACKAGECONFIG[pcre] = "--with-libpcre-includes=${STAGING_INCDIR} --with-libpcre-libraries=${STAGING_LIBDIR}, ,libpcre ,"
128PACKAGECONFIG[yaml] = "--with-libyaml-includes=${STAGING_INCDIR} --with-libyaml-libraries=${STAGING_LIBDIR}, ,libyaml ," 128PACKAGECONFIG[yaml] = "--with-libyaml-includes=${STAGING_INCDIR} --with-libyaml-libraries=${STAGING_LIBDIR}, ,libyaml ,"
@@ -143,7 +143,7 @@ export logdir = "${localstatedir}/log"
143 143
144CACHED_CONFIGUREVARS = "ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" 144CACHED_CONFIGUREVARS = "ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
145 145
146do_configure_prepend () { 146do_configure:prepend () {
147 oe_runconf 147 oe_runconf
148} 148}
149 149
@@ -189,7 +189,7 @@ do_install () {
189 sed -i -e "s:#!.*$:#!${USRBINPATH}/env ${PYTHON_PN}:g" ${D}${bindir}/suricatactl 189 sed -i -e "s:#!.*$:#!${USRBINPATH}/env ${PYTHON_PN}:g" ${D}${bindir}/suricatactl
190} 190}
191 191
192pkg_postinst_ontarget_${PN} () { 192pkg_postinst_ontarget:${PN} () {
193if command -v systemd-tmpfiles >/dev/null; then 193if command -v systemd-tmpfiles >/dev/null; then
194 systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/suricata.conf 194 systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/suricata.conf
195elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then 195elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
@@ -200,7 +200,7 @@ fi
200SYSTEMD_PACKAGES = "${PN}" 200SYSTEMD_PACKAGES = "${PN}"
201 201
202PACKAGES =+ "${PN}-python" 202PACKAGES =+ "${PN}-python"
203FILES_${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d" 203FILES:${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d"
204FILES_${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}" 204FILES:${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
205 205
206CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml" 206CONFFILES:${PN} = "${sysconfdir}/suricata/suricata.yaml"
diff --git a/dynamic-layers/meta-rust/recipes-security/krill/krill_0.9.1.bb b/dynamic-layers/meta-rust/recipes-security/krill/krill_0.9.1.bb
index 2671ae8..4dc61cf 100644
--- a/dynamic-layers/meta-rust/recipes-security/krill/krill_0.9.1.bb
+++ b/dynamic-layers/meta-rust/recipes-security/krill/krill_0.9.1.bb
@@ -19,7 +19,7 @@ CARGO_SRC_DIR = ""
19inherit pkgconfig useradd systemd cargo 19inherit pkgconfig useradd systemd cargo
20 20
21 21
22do_install_append () { 22do_install:append () {
23 install -d ${D}${sysconfdir} 23 install -d ${D}${sysconfdir}
24 install -d ${D}${datadir}/krill 24 install -d ${D}${datadir}/krill
25 25
@@ -31,9 +31,9 @@ KRILL_UID ?= "krill"
31KRILL_GID ?= "krill" 31KRILL_GID ?= "krill"
32 32
33USERADD_PACKAGES = "${PN}" 33USERADD_PACKAGES = "${PN}"
34GROUPADD_PARAM_${PN} = "--system ${KRILL_UID}" 34GROUPADD_PARAM:${PN} = "--system ${KRILL_UID}"
35USERADD_PARAM_${PN} = "--system -g ${KRILL_GID} --home-dir \ 35USERADD_PARAM:${PN} = "--system -g ${KRILL_GID} --home-dir \
36 /var/lib/krill/ --no-create-home \ 36 /var/lib/krill/ --no-create-home \
37 --shell /sbin/nologin ${BPN}" 37 --shell /sbin/nologin ${BPN}"
38 38
39FILES_${PN} += "{sysconfdir}/defaults ${datadir}" 39FILES:${PN} += "{sysconfdir}/defaults ${datadir}"