mirror of
https://git.yoctoproject.org/meta-security
synced 2026-04-20 11:29:37 +00:00
samhain: rework due to changed cache handling
OE-Core changed the cache handling which made the use of ${BPN} no fail.
| Parsing recipes...WARNING: .../samhain-standalone.bb: Exception during build_dependencies for do_configure
| WARNING: .../samhain-standalone.bb: Error during finalise of .../samhain-standalone.bb
| ERROR: ExpansionError during parsing .../samhain-standalone.bb
| Traceback (most recent call last):
| File "Var <MODE_NAME>", line 1, in <module>
| bb.data_smart.ExpansionError: Failure expanding variable MODE_NAME, expression was ${@d.getVar('BPN').split('-')[1]} which triggered exception IndexError: list index out of range
| The variable dependency chain for the failure is: MODE_NAME -> SAMHAIN_MODE -> do_configure
Simplify the setting of MODE_NAME and SAMHAIN_MODE by setting them
in the recipe files where we know their values.
bitbake:
ee89ade5 cache/codeparser: Switch to a new BB_CACHEDIR variable for cache location
oe-core:
7c15e03dd3 bitbake.conf: Add BB_HASH_CODEPARSER_VALS
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
92f04c78f0
commit
7eed4a60f5
@@ -8,5 +8,8 @@ EXTRA_OECONF += " \
|
||||
--with-port=${SAMHAIN_PORT} \
|
||||
"
|
||||
|
||||
MODE_NAME = "client"
|
||||
SAMHAIN_MODE = "client"
|
||||
|
||||
RDEPENDS:${PN} = "acl zlib attr bash"
|
||||
RCONFLICTS:${PN} = "samhain-standalone"
|
||||
|
||||
@@ -8,6 +8,9 @@ SRC_URI += "file://samhain-server-volatiles \
|
||||
file://samhain-server-volatiles.conf \
|
||||
"
|
||||
|
||||
MODE_NAME = "server"
|
||||
SAMHAIN_MODE = "server"
|
||||
|
||||
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||
|
||||
do_install:append() {
|
||||
|
||||
@@ -7,6 +7,9 @@ SRC_URI += "file://samhain-not-run-ptest-on-host.patch \
|
||||
|
||||
PROVIDES += "samhain"
|
||||
|
||||
MODE_NAME = "standalone"
|
||||
SAMHAIN_MODE = "no"
|
||||
|
||||
SYSTEMD_SERVICE:${PN} = "samhain.service"
|
||||
|
||||
inherit ptest
|
||||
|
||||
@@ -40,14 +40,6 @@ SYSTEMD_PACKAGES = "${PN}"
|
||||
SYSTEMD_SERVICE:${PN} = "${INITSCRIPT_NAME}.service"
|
||||
SYSTEMD_AUTO_ENABLE = "disable"
|
||||
|
||||
# mode mapping:
|
||||
# BPN MODE_NAME SAMHAIN_MODE
|
||||
# samhain-standalone standalone no
|
||||
# samhain-client client client
|
||||
# samhain-server server server
|
||||
MODE_NAME = "${@d.getVar('BPN').split('-')[1]}"
|
||||
SAMHAIN_MODE = "${@oe.utils.ifelse(d.getVar('MODE_NAME') == 'standalone', 'no', '${MODE_NAME}')}"
|
||||
|
||||
# supports mysql|postgresql|oracle|odbc but postgresql is the only one available
|
||||
|
||||
PACKAGECONFIG ??= "postgresql ps \
|
||||
|
||||
Reference in New Issue
Block a user