mirror of
https://git.yoctoproject.org/meta-security
synced 2026-01-12 03:10:13 +00:00
dynamix-layers: Convert to new override syntax
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
@@ -23,5 +23,5 @@ do_configure () {
|
||||
oe_runconf
|
||||
}
|
||||
|
||||
RDEPENDS_${PN} += "zlib"
|
||||
RDEPENDS:${PN} += "zlib"
|
||||
|
||||
|
||||
@@ -2,4 +2,4 @@ HOMEPAGE = "http://suricata-ids.org/"
|
||||
SECTION = "security Monitor/Admin"
|
||||
LICENSE = "GPLv2"
|
||||
|
||||
COMPATIBLE_HOST_powerpc = 'null'
|
||||
COMPATIBLE_HOST:powerpc = 'null'
|
||||
|
||||
@@ -122,7 +122,7 @@ CARGO_SRC_DIR = "rust"
|
||||
B = "${S}"
|
||||
|
||||
PACKAGECONFIG ??= "jansson file pcre yaml python pcap cap-ng net nfnetlink nss nspr "
|
||||
PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}"
|
||||
PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}"
|
||||
|
||||
PACKAGECONFIG[pcre] = "--with-libpcre-includes=${STAGING_INCDIR} --with-libpcre-libraries=${STAGING_LIBDIR}, ,libpcre ,"
|
||||
PACKAGECONFIG[yaml] = "--with-libyaml-includes=${STAGING_INCDIR} --with-libyaml-libraries=${STAGING_LIBDIR}, ,libyaml ,"
|
||||
@@ -143,7 +143,7 @@ export logdir = "${localstatedir}/log"
|
||||
|
||||
CACHED_CONFIGUREVARS = "ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
|
||||
|
||||
do_configure_prepend () {
|
||||
do_configure:prepend () {
|
||||
oe_runconf
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@ do_install () {
|
||||
sed -i -e "s:#!.*$:#!${USRBINPATH}/env ${PYTHON_PN}:g" ${D}${bindir}/suricatactl
|
||||
}
|
||||
|
||||
pkg_postinst_ontarget_${PN} () {
|
||||
pkg_postinst_ontarget:${PN} () {
|
||||
if command -v systemd-tmpfiles >/dev/null; then
|
||||
systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/suricata.conf
|
||||
elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
|
||||
@@ -200,7 +200,7 @@ fi
|
||||
SYSTEMD_PACKAGES = "${PN}"
|
||||
|
||||
PACKAGES =+ "${PN}-python"
|
||||
FILES_${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d"
|
||||
FILES_${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
|
||||
FILES:${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d"
|
||||
FILES:${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
|
||||
|
||||
CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml"
|
||||
CONFFILES:${PN} = "${sysconfdir}/suricata/suricata.yaml"
|
||||
|
||||
@@ -19,7 +19,7 @@ CARGO_SRC_DIR = ""
|
||||
inherit pkgconfig useradd systemd cargo
|
||||
|
||||
|
||||
do_install_append () {
|
||||
do_install:append () {
|
||||
install -d ${D}${sysconfdir}
|
||||
install -d ${D}${datadir}/krill
|
||||
|
||||
@@ -31,9 +31,9 @@ KRILL_UID ?= "krill"
|
||||
KRILL_GID ?= "krill"
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
GROUPADD_PARAM_${PN} = "--system ${KRILL_UID}"
|
||||
USERADD_PARAM_${PN} = "--system -g ${KRILL_GID} --home-dir \
|
||||
GROUPADD_PARAM:${PN} = "--system ${KRILL_UID}"
|
||||
USERADD_PARAM:${PN} = "--system -g ${KRILL_GID} --home-dir \
|
||||
/var/lib/krill/ --no-create-home \
|
||||
--shell /sbin/nologin ${BPN}"
|
||||
|
||||
FILES_${PN} += "{sysconfdir}/defaults ${datadir}"
|
||||
FILES:${PN} += "{sysconfdir}/defaults ${datadir}"
|
||||
|
||||
Reference in New Issue
Block a user