[meta-oe][PATCH 1/2] dlt-daemon: update patch 544.patch

[meta-oe][PATCH 1/2] dlt-daemon: update patch 544.patch

[Gianfranco Costamagna]

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
---
 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
index 550493351..3699b8c83 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
@@ -1,6 +1,6 @@
 Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/544]
 
-From 5db28a4b85cf0ec3e128cfc7c9b71d12ec543695 Mon Sep 17 00:00:00 2001
+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
@@ -28,7 +28,7 @@ index d572ecf3..8608c6c4 100644
  
 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..d6fc3905
+index 00000000..03509fda
 --- /dev/null
 +++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c
 @@ -0,0 +1,33 @@
@@ -62,8 +62,8 @@ index 00000000..d6fc3905
 +{
 +/*    struct user_regs_struct *ptr_reg = (struct user_regs_struct *)prstatus->pr_reg;
 +
-+    registers->pc = ptr_reg->pc; /* [REG_PROC_COUNTER]; */
-+*/
++    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
-- 
2.34.1

[meta-oe][PATCH 2/2] dlt-daemon:

[Gianfranco Costamagna]

make sure systemd is enabled before trying to install the service files, otherwise we might face issues if we remove systemd support
only for dlt-daemon e.g. with
PACKAGECONFIG:remove="systemd systemd-watchdog systemd-journal"
---
 .../recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
index 1522d02c2..410fffa24 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
@@ -55,13 +55,13 @@ EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DS
 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"
 
-- 
2.34.1

Re: [oe] [meta-oe][PATCH 1/2] dlt-daemon: update patch 544.patch

[Khem Raj]

Gianfranco

I have staged some of your patches on master-next,  please check and
if you have anything pending, let me know

On Mon, Oct 2, 2023 at 2:15 AM Gianfranco
<costamagna.gianfranco@gmail.com> wrote:
>
> Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> ---
>  meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> index 550493351..3699b8c83 100644
> --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> @@ -1,6 +1,6 @@
>  Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/544]
>
> -From 5db28a4b85cf0ec3e128cfc7c9b71d12ec543695 Mon Sep 17 00:00:00 2001
> +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
> @@ -28,7 +28,7 @@ index d572ecf3..8608c6c4 100644
>
>  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..d6fc3905
> +index 00000000..03509fda
>  --- /dev/null
>  +++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c
>  @@ -0,0 +1,33 @@
> @@ -62,8 +62,8 @@ index 00000000..d6fc3905
>  +{
>  +/*    struct user_regs_struct *ptr_reg = (struct user_regs_struct *)prstatus->pr_reg;
>  +
> -+    registers->pc = ptr_reg->pc; /* [REG_PROC_COUNTER]; */
> -+*/
> ++    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
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#105301): https://lists.openembedded.org/g/openembedded-devel/message/105301
> Mute This Topic: https://lists.openembedded.org/mt/101708265/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe] [meta-oe][PATCH 1/2] dlt-daemon: update patch 544.patch

[Khem Raj]

seeing build failures on non-systemd distros see

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3217/steps/14/logs/stdio

    ybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/dlt-daemon/2.18.10/git/src/system/dlt-system.h:57:10:
fatal error: systemd/sd-journal.h: No such file or directory
     include <systemd/sd-journal.h>
             ^~~~~~~~~~~~~~~~~~~~~~

On Mon, Oct 2, 2023 at 12:27 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> Gianfranco
>
> I have staged some of your patches on master-next,  please check and
> if you have anything pending, let me know
>
> On Mon, Oct 2, 2023 at 2:15 AM Gianfranco
> <costamagna.gianfranco@gmail.com> wrote:
> >
> > Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> > ---
> >  meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> > index 550493351..3699b8c83 100644
> > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> > +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> > @@ -1,6 +1,6 @@
> >  Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/544]
> >
> > -From 5db28a4b85cf0ec3e128cfc7c9b71d12ec543695 Mon Sep 17 00:00:00 2001
> > +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
> > @@ -28,7 +28,7 @@ index d572ecf3..8608c6c4 100644
> >
> >  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..d6fc3905
> > +index 00000000..03509fda
> >  --- /dev/null
> >  +++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c
> >  @@ -0,0 +1,33 @@
> > @@ -62,8 +62,8 @@ index 00000000..d6fc3905
> >  +{
> >  +/*    struct user_regs_struct *ptr_reg = (struct user_regs_struct *)prstatus->pr_reg;
> >  +
> > -+    registers->pc = ptr_reg->pc; /* [REG_PROC_COUNTER]; */
> > -+*/
> > ++    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
> > --
> > 2.34.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#105301): https://lists.openembedded.org/g/openembedded-devel/message/105301
> > Mute This Topic: https://lists.openembedded.org/mt/101708265/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >

Re: [oe] [meta-oe][PATCH 1/2] dlt-daemon: update patch 544.patch

[Gianfranco Costamagna]

[-- Attachment #1: Type: text/plain, Size: 3359 bytes --]

Hello, I sent an additional patch some seconds ago.

G.

On Fri, Oct 6, 2023 at 3:06 AM Khem Raj <raj.khem@gmail.com> wrote:

> seeing build failures on non-systemd distros see
>
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3217/steps/14/logs/stdio
>
>
> ybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/dlt-daemon/2.18.10/git/src/system/dlt-system.h:57:10:
> fatal error: systemd/sd-journal.h: No such file or directory
>      include <systemd/sd-journal.h>
>              ^~~~~~~~~~~~~~~~~~~~~~
>
> On Mon, Oct 2, 2023 at 12:27 PM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > Gianfranco
> >
> > I have staged some of your patches on master-next,  please check and
> > if you have anything pending, let me know
> >
> > On Mon, Oct 2, 2023 at 2:15 AM Gianfranco
> > <costamagna.gianfranco@gmail.com> wrote:
> > >
> > > Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > > Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> > > ---
> > >  meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch | 8 ++++----
> > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> > > index 550493351..3699b8c83 100644
> > > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> > > +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
> > > @@ -1,6 +1,6 @@
> > >  Upstream-Status: Submitted [
> https://github.com/COVESA/dlt-daemon/pull/544]
> > >
> > > -From 5db28a4b85cf0ec3e128cfc7c9b71d12ec543695 Mon Sep 17 00:00:00 2001
> > > +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
> > > @@ -28,7 +28,7 @@ index d572ecf3..8608c6c4 100644
> > >
> > >  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..d6fc3905
> > > +index 00000000..03509fda
> > >  --- /dev/null
> > >  +++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c
> > >  @@ -0,0 +1,33 @@
> > > @@ -62,8 +62,8 @@ index 00000000..d6fc3905
> > >  +{
> > >  +/*    struct user_regs_struct *ptr_reg = (struct user_regs_struct
> *)prstatus->pr_reg;
> > >  +
> > > -+    registers->pc = ptr_reg->pc; /* [REG_PROC_COUNTER]; */
> > > -+*/
> > > ++    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
> > > --
> > > 2.34.1
> > >
> > >
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#105301):
> https://lists.openembedded.org/g/openembedded-devel/message/105301
> > > Mute This Topic: https://lists.openembedded.org/mt/101708265/1997914
> > > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
> [raj.khem@gmail.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > >
>

[-- Attachment #2: Type: text/html, Size: 5211 bytes --]