merged

On 4/19/20 11:27 PM, Haseeb Ashraf wrote:
> fix runtime error:
> samhain[4069]: FATAL: x_dnmalloc.c: 2790: hashval < AMOUNTHASH
> Killed
>
> The proper fix is not to disable dnmalloc. This change is in
> continuation of samhain-mips64-aarch64-dnmalloc-hash-fix.patch
> which requires CONFIG_ARCH_AARCH64 or CONFIG_ARCH_MIPS64 to be
> defined for the corresponding architecture
>
> Signed-off-by: Haseeb Ashraf <[email protected]>
> ---
>  recipes-ids/samhain/samhain.inc | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
> index 0a5e432..b867bbc 100644
> --- a/recipes-ids/samhain/samhain.inc
> +++ b/recipes-ids/samhain/samhain.inc
> @@ -67,6 +67,9 @@ PACKAGECONFIG[acl] = " --enable-posix-acl , 
> --disable-posix-acl, acl"
>  PACKAGECONFIG[audit] = 
> "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit"
>  PACKAGECONFIG[ps] = "--with-ps-path=${base_bindir}/ps,,,procps"
>  
> +EXTRA_OEMAKE_append_aarch64 = " CPPFLAGS+=-DCONFIG_ARCH_AARCH64=1"
> +EXTRA_OEMAKE_append_mips64 = " CPPFLAGS+=-DCONFIG_ARCH_MIPS64=1"
> +
>  do_unpack_samhain() {
>      cd ${WORKDIR}
>      tar -xzvf samhain-${PV}.tar.gz
> @@ -118,7 +121,6 @@ do_configure () {
>       --enable-network=${SAMHAIN_MODE} \
>       --with-pid-file=${localstatedir}/run/samhain.pid \
>       --with-data-file=${localstatedir}/lib/samhain/samhain_file \
> -     --disable-dnmalloc \
>       ${EXTRA_OECONF}
>  }
>  
>
> 

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#49705): https://lists.yoctoproject.org/g/yocto/message/49705
Mute This Topic: https://lists.yoctoproject.org/mt/73144157/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to