summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-extended/dlt-daemon
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2023-10-12 13:59:14 +0300
committerAndrew Geissler <geissonator@yahoo.com>2023-10-13 17:31:02 +0300
commit2013739591dc50e6d01836d0017e7e5a02225709 (patch)
tree0eb5e655fe53b8c868278f5d0eabfbe7fe5e9cc4 /meta-openembedded/meta-oe/recipes-extended/dlt-daemon
parent2622a13632f0d61a0aa1e11a346b79ef4c08320c (diff)
downloadopenbmc-2013739591dc50e6d01836d0017e7e5a02225709.tar.xz
master: subtree updates oct 12 2023
poky: e444d2bed0..8d0ba08aa6: Alassane Yattara (1): bitbake: toaster: Monitoring - implement Django logging system Alexander Kanavin (1): nghttp2: update 1.56.0 -> 1.57.0 Alexis Lothoré (2): oeqa/utils/gitarchive: fix tag pattern searching oeqa/utils/gitarchive: ensure tag matches regex before getting its fields Andreas Cord-Landwehr (1): wayland: consider pkgconfig sysroot for pkgdatadir André Draszik (1): wic: fix a typo in help output Archana Polampalli (1): gstreamer: upgrade 1.22.5 -> 1.22.6 Bruce Ashfield (1): linux-yocto/6.5: integrate fixes for sanity issues Chris Laplante (1): recipetool/create_buildsys_python: use importlib instead of imp Daniel McGregor (2): meson: upgrade 1.2.1 -> 1.2.2 libtirpc: conditionally enable gssapi Daniel Semkowicz (3): uboot-extlinux-config.bbclass: Remove repeated space character uboot-extlinux-config.bbclass: Uppercase "menu title" entry uboot-extlinux-config.bbclass: Add menu title configuration Fabio Estevam (1): u-boot: Upgrade to 2023.10 Fahad Arslan (1): linux-firmware: create separate package for cirrus and cnm firmwares Jermain Horsman (1): scripts/oe-setup-layers: Update how to determine if directory is git repo Jose Quaresma (4): curl: 8.3.0 -> 8.4.0 go: update 1.20.7 -> 1.20.8 go: update 1.20.8 -> 1.20.9 go: update 1.20.9 -> 1.20.10 Joshua Watt (6): bitbake: hashserv: Add remove API bitbake: bitbake-hashclient: Add remove subcommand bitbake: hashserv: Extend get_outhash API to optionally include unihash bitbake: hashserv: Add API to clean unused entries bitbake: bitbake-hashclient: Add clean-unused subcommand overview: Add note about non-reproducibility side effects Julien Stephan (4): bitbake.conf: include bblock.conf sstatesig: add a new info level for SIGGEN_LOCKEDSIGS_TASKSIG_CHECK scripts/bblock: add a script to lock/unlock recipes oeqa/selftest/bblock: add self test for bblock tool Khem Raj (1): python3-docutils: Rename utilities to their canonical names Lee Chee Yang (1): migration-guides: add release notes for 4.0.13 Marcus Flyckt (1): devtool/upgrade: check all git config locations Markus Volk (2): mesa: Upgrade 23.1.8 -> 23.2.1 gtk: Upgrade 4.12.1 -> 4.12.3 Marlon Rodriguez Garcia (1): bitbake: toaster: update selenium version and code syntax Martijn de Gouw (1): busybox: Set PATH in syslog initscript Michael Opdenacker (1): ref-manual: releases.svg: Scarthgap is now version 5.0 Mikko Rapeli (2): qemurunner.py: detect login prompt without without utf-8 conversion openssh: drop sudo from ptest dependencies Peter Kjellerstedt (4): externalsrc.bbclass: Support specifying patterns in CONFIGURE_FILES autotools.bbclass: Add *.m4 to CONFIGURE_FILES packages.bbclass: Correct the check for conflicts with renamed packages cmake.bbclass: Add *.cmake to CONFIGURE_FILES Quentin Schulz (1): uboot-extlinux-config.bbclass: fix missed override syntax migration Randy MacLeod (1): strace: skip so_peerpidfd test Rasmus Villemoes (1): openssh: update sshd_check_keys script to make use of 'sshd -G' Richard Purdie (14): wic: Add console parameters to qemux86 canned-wks qemurunner: Skip conversion from/to binary data for logfile qemurunner: Use backslashreplace with utf8 to make invalid characters clear qemurunner: Log the second serial console as well as the first qemurunner: Show both the login console log and all logging upon failure oeqa/concurrencytest: Remove invalid buffering option bitbake: selftest/fetch: Ensure top level directory timestamp doesn't break test cryptodev: Update to latest git for 6.5 kernel fixes qemux86/qemuarm: Drop kernel version overrides oeqa/qemurunner: Add newlines serial workaround runqemu/qemurunner: Use nodelay with tcp serial connections oeqa/qemurunner: Add extra logging when console doesn't appear poky/poky-tiny: Switch to the 6.5 kernel oeqa/qemurunner: Ensure we retry after BrokenPipeError Ross Burton (12): python3-numpy: remove obsolete reproducible workaround libx11: upgrade to 1.8.7 libxpm: upgrade to 3.5.17 qemuboot: reduce default size of software I/O translation buffer sysvinit-initab: rewrite loop to generate inittab ttyrun: add new recipe sysvinit-inittab: use ttyrun to run getty only if the terminal exists busybox: use ttyrun to run getty only if the terminal exists oeqa/selftest: don't skip test_read_only_image on qemuarm64 meta/conf/machine: remove SERIAL_CONSOLES_CHECK busybox-inittab: fix console handling oeqa/runtime/_qemutiny: rewrite test to be functional Sundeep KOKKONDA (1): rust: reproducibility issue fix Trevor Gamblin (1): dev-manual: fix testimage usage instructions Yogita Urade (1): qemu: fix CVE-2023-42467 meta-openembedded: ea42cec2ec..62039a2c33: Ahmad Fatoum (1): signing.bbclass: don't export OPENSSL environment variables globally Beniamin Sandu (1): libnet: upgrade version v1.2 -> v1.3 Benjamin Bara (1): libvpx: upgrade 1.13.0 -> 1.13.1 Chen Qi (1): libblockdev: fix QA error in case of multilib Christophe Vu-Brugier (3): libnvme: upgrade 1.5 -> 1.6 nvme-cli: upgrade 2.5 -> 2.6 libnvme: apply patch already upstream to fix build with musl Clément Péron (1): Revert "protobuf: stage protoc binary to sysroot" Daniel Klauer (1): graphviz: Fix build to not use $prefix as search dir Denys Zagorui (1): libbpf: add arm, powerpc and mips64 to COMPATIBLE_HOST Fabien Thomas (8): meta-filesystems/layer.conf : Add meta-networking dependency Add static-passwd and static-group files Add static-passwd and static-group files Add static-passwd and static-group files Add static-passwd and static-group files Add static-passwd and static-group files Add static-passwd and static-group files Add static-passwd and static-group files Gianfranco Costamagna (6): dlt-daemon: Make it work without systemd dlt-daemon: Enable experimental coredumphandler feature dlt-daemon: update patch 544.patch dlt-daemon: do not disable dlt-system build when systemd is set to off dlt-daemon: Add an additional fix for non-systemd builds cpprestsdk: fix typo in comment, tag is actually 2.0.18 Jeffrey Pautler (1): bolt: change product name used for CVE checking Joe Slater (1): nginx: add configure option Johannes Kauffmann (1): open62541: add Backport status and link to patch Jörg Sommer (1): collectd: Use https in SRC_URI, add HOMEPAGE Khem Raj (16): python3-pyroute2: Add missing dependency on sqlite3 for ptests python3-pylint: Upgrade to 3.0.0 python3-lz4: use python3-unittest-automake-output minicoredumber: Fix ptest reporting images: Inherit from core-image-base images: Delete layer specific base images images: Rename <layer>-image to <layer>-image-all images: Rename ptest images to rhyme with oe-core ptest images ptest-image: Switch to using core-image-minimal stressapptest: Upgrade to 1.0.11 release klibc: Upgrade to 2.0.13 release libnvme: Fix test builds on musl kernel-selftest: Build bpf tests again ptest-packagelists-meta-oe: Add kernel-selftest to x86/x86-64 images kernel-selftest: Copy the .config from kernel build kernel-selftest: Use clang options when clang is available Markus Volk (3): pugixml: Update 1.13 -> 1.14 pipewire: Upgrade 0.3.80 -> 0.3.81 gnome-control-center: Fix polkit gettext issue Martin Jansa (1): opencv: Fix build with protobuf v22 and dnn enabled Mickael RAMILISON (1): python3-rapidjson: add ptest Pawel Langowski (1): recipes-connectivity: Add tayga recipe Philip-Dylan Gleonec (1): cukinia: Fix license field Thomas Roos (1): python3-boto3, python3-botocore: remove recipes Tom Hochstein (1): libcamera: Avoid build break in signature recalculation meta-arm: 95789365f7..e914891eee: Jon Mason (1): arm-bsp/u-boot: add recipe for 2023.07.02 meta-security: aca6d4a9e7..3f7d40b0fc: Rasmus Villemoes (3): fail2ban: add systemd support fail2ban: change sqlite3 dependency to python3-sqlite3 fail2ban: add useful recommendations Change-Id: I93672642f4e0392adc6223fdc4e073910b817bc9 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/dlt-daemon')
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch80
-rw-r--r--meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb26
2 files changed, 95 insertions, 11 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
new file mode 100644
index 0000000000..3699b8c83a
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
@@ -0,0 +1,80 @@
+Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/544]
+
+From 8121a979026d5fcb05bd4e5d3a0647f321b56106 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Thu, 28 Sep 2023 12:54:23 +0200
+Subject: [PATCH] Add common dlt_cdh_cpuinfo.c to unblock build on non amd64
+ and i386 arcs
+
+---
+ src/core_dump_handler/dlt_cdh.h | 2 ++
+ src/core_dump_handler/dlt_cdh_cpuinfo.c | 33 +++++++++++++++++++++++++
+ src/core_dump_handler/dlt_cdh_crashid.c | 2 +-
+ 3 files changed, 36 insertions(+), 1 deletion(-)
+ create mode 100644 src/core_dump_handler/dlt_cdh_cpuinfo.c
+
+diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h
+index d572ecf3..8608c6c4 100644
+--- a/src/core_dump_handler/dlt_cdh.h
++++ b/src/core_dump_handler/dlt_cdh.h
+@@ -55,6 +55,8 @@ typedef struct
+ uint64_t pc;
+ uint64_t ip;
+ uint64_t lr;
++ uint64_t sp;
++ uint64_t fp;
+
+ } cdh_registers_t;
+
+diff --git a/src/core_dump_handler/dlt_cdh_cpuinfo.c b/src/core_dump_handler/dlt_cdh_cpuinfo.c
+new file mode 100644
+index 00000000..03509fda
+--- /dev/null
++++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c
+@@ -0,0 +1,33 @@
++/*
++ * SPDX license identifier: MPL-2.0
++ *
++ * Copyright (C) 2011-2015, BMW AG
++ *
++ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
++ *
++ * This Source Code Form is subject to the terms of the
++ * Mozilla Public License (MPL), v. 2.0.
++ * If a copy of the MPL was not distributed with this file,
++ * You can obtain one at http://mozilla.org/MPL/2.0/.
++ *
++ * For further information see http://www.covesa.org/.
++ */
++
++/*!
++ * \author Gianfranco Costamagna <locutusofborg@debian.org>
++ *
++ * \copyright Copyright © 2011-2015 BMW AG. \n
++ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
++ *
++ * \file dlt_cdh_cpuinfo.c
++ */
++
++#include "dlt_cdh_cpuinfo.h"
++
++void get_registers(prstatus_t *prstatus, cdh_registers_t *registers)
++{
++/* struct user_regs_struct *ptr_reg = (struct user_regs_struct *)prstatus->pr_reg;
++
++ registers->pc = ptr_reg->pc;*/ /* [REG_PROC_COUNTER]; */
++
++}
+diff --git a/src/core_dump_handler/dlt_cdh_crashid.c b/src/core_dump_handler/dlt_cdh_crashid.c
+index bca44e0e..8dd98d70 100644
+--- a/src/core_dump_handler/dlt_cdh_crashid.c
++++ b/src/core_dump_handler/dlt_cdh_crashid.c
+@@ -30,7 +30,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <asm/prctl.h>
++#include <sys/prctl.h>
+ #include <inttypes.h>
+
+ #include "dlt_cdh.h"
diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
index 33fae06190..410fffa24b 100644
--- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
@@ -17,17 +17,19 @@ DEPENDS = "zlib gzip-native json-c"
SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \
file://0002-Don-t-execute-processes-as-a-specific-user.patch \
file://0004-Modify-systemd-config-directory.patch \
+ file://544.patch \
"
SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f"
S = "${WORKDIR}/git"
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console ', '', d)} \
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal ', '', d)} \
+ dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console \
udp-connection dlt-system dlt-filetransfer "
# dlt-dbus
# General options
-PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd"
+PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF"
# Linux options
PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF -DWITH_DLT_SYSTEM=OFF,systemd"
@@ -38,26 +40,28 @@ PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION=
# Command line options
PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF"
-PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd"
-PACKAGECONFIG[dlt-adaptor-stdin] = "-DWITH_DLT_ADAPTOR_STDIN=ON,-DWITH_DLT_ADAPTOR_STDIN=OFF,,dlt-daemon-systemd"
-PACKAGECONFIG[dlt-adaptor-udp] = "-DWITH_DLT_ADAPTOR_UDP=ON,-DWITH_DLT_ADAPTOR_UDP=OFF,,dlt-daemon-systemd"
+PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF"
+PACKAGECONFIG[dlt-adaptor-stdin] = "-DWITH_DLT_ADAPTOR_STDIN=ON,-DWITH_DLT_ADAPTOR_STDIN=OFF"
+PACKAGECONFIG[dlt-adaptor-udp] = "-DWITH_DLT_ADAPTOR_UDP=ON,-DWITH_DLT_ADAPTOR_UDP=OFF"
PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF"
-PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd"
+PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF"
inherit autotools gettext cmake pkgconfig systemd
+# -DWITH_DLT_COREDUMPHANDLER=ON this feature is too experimental, disable for now
+#FILES:${PN} += "${libdir}/sysctl.d"
EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
PACKAGES += "${PN}-systemd"
SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
SYSTEMD_SERVICE:${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}"
+ ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-system', 'dlt-system.service', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-dbus', 'dlt-dbus.service', '', d)}"
SYSTEMD_AUTO_ENABLE:${PN} = "enable"
SYSTEMD_SERVICE:${PN}-systemd = " \
- ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor-udp', 'dlt-adaptor-udp.service', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples', 'dlt-example-user.service', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples dlt-console', 'dlt-receive.service', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-adaptor-udp', 'dlt-adaptor-udp.service', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-examples', 'dlt-example-user.service', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-examples dlt-console', 'dlt-receive.service', '', d)} \
"
SYSTEMD_AUTO_ENABLE:${PN}-systemd = "disable"