Re: [oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.18 -> 7.0.20
Resubmitted thanks!
On Thu, Jul 18, 2024, 01:13 Khem Raj wrote:
> This fails to build
>
> https://errors.yoctoproject.org/Errors/Details/791076/
>
> Always test with
>
> bitbake -ccleanall
> bitbake recipe
>
> to ensure all tasks are run.
>
> On Tue, Jul 16, 2024 at 5:56 AM Gianfranco via lists.openembedded.org
> wrote:
> >
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../{vboxguestdrivers_7.0.18.bb => vboxguestdrivers_7.0.20.bb} | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > rename meta-oe/recipes-support/vboxguestdrivers/{
> vboxguestdrivers_7.0.18.bb => vboxguestdrivers_7.0.20.bb} (97%)
> >
> > diff --git a/meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_7.0.18.bb b/meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_7.0.20.bb
> > similarity index 97%
> > rename from meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_7.0.18.bb
> > rename to meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_7.0.20.bb
> > index 47f616e99..714814fba 100644
> > --- a/meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_7.0.18.bb
> > +++ b/meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_7.0.20.bb
> > @@ -15,7 +15,7 @@ SRC_URI = "
> http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
> > file://Makefile.utils \
> > "
> >
> > -SRC_URI[sha256sum] =
> "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"
> > +SRC_URI[sha256sum] =
> "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02"
> >
> > S ?= "${WORKDIR}/vbox_module"
> > S:task-patch = "${WORKDIR}/${VBOX_NAME}"
> > --
> > 2.34.1
> >
> >
> >
> >
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#111393):
https://lists.openembedded.org/g/openembedded-devel/message/111393
Mute This Topic: https://lists.openembedded.org/mt/107251081/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.18 -> 7.0.20
Also update copying file md5sum
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...{vboxguestdrivers_7.0.18.bb => vboxguestdrivers_7.0.20.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.0.18.bb =>
vboxguestdrivers_7.0.20.bb} (96%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb
similarity index 96%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb
index 47f616e99..444b86a1b 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb
@@ -1,7 +1,7 @@
SUMMARY = "VirtualBox Linux Guest Drivers"
SECTION = "core"
LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM =
"file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e"
+LIC_FILES_CHKSUM =
"file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=217590d3a513571b94632edf5fa1169a"
DEPENDS = "virtual/kernel"
@@ -15,7 +15,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-SRC_URI[sha256sum] =
"d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"
+SRC_URI[sha256sum] =
"5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#111392):
https://lists.openembedded.org/g/openembedded-devel/message/111392
Mute This Topic: https://lists.openembedded.org/mt/107251081/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.18 -> 7.0.20
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_7.0.18.bb => vboxguestdrivers_7.0.20.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.0.18.bb =>
vboxguestdrivers_7.0.20.bb} (97%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb
index 47f616e99..714814fba 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb
@@ -15,7 +15,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-SRC_URI[sha256sum] =
"d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"
+SRC_URI[sha256sum] =
"5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#111374):
https://lists.openembedded.org/g/openembedded-devel/message/111374
Mute This Topic: https://lists.openembedded.org/mt/107251081/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.14 -> 7.0.18
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_7.0.14.bb => vboxguestdrivers_7.0.18.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.0.14.bb =>
vboxguestdrivers_7.0.18.bb} (97%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
index 208b1bb6e..eebbe202f 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
@@ -15,7 +15,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-SRC_URI[sha256sum] =
"45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9"
+SRC_URI[sha256sum] =
"d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110291):
https://lists.openembedded.org/g/openembedded-devel/message/110291
Mute This Topic: https://lists.openembedded.org/mt/106000265/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.12 -> 7.0.14
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_7.0.12.bb => vboxguestdrivers_7.0.14.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.0.12.bb =>
vboxguestdrivers_7.0.14.bb} (97%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb
index 6b493de7c..208b1bb6e 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb
@@ -15,7 +15,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-SRC_URI[sha256sum] =
"d76634c6ccf62503726a5aeae6c78a3462474c51a0ebe4942591ccc2d939890a"
+SRC_URI[sha256sum] =
"45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108338):
https://lists.openembedded.org/g/openembedded-devel/message/108338
Mute This Topic: https://lists.openembedded.org/mt/103793927/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dlt-daemon: cherry-pick another upstream-proposed patch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/568.patch | 27 +++
.../dlt-daemon/dlt-daemon_2.18.10.bb | 1 +
2 files changed, 28 insertions(+)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/568.patch
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/568.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/568.patch
new file mode 100644
index 0..1a14daa4d
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/568.patch
@@ -0,0 +1,27 @@
+Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/568]
+
+From f68119a1ef9b8ae2bb894801a22842719d0856be Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Tue, 14 Nov 2023 17:18:57 +0100
+Subject: [PATCH] dlt_cdh:
+
+Make sure on 64 bit we read an ELF64 structure.
+Otherwise we get a read error, and the context file is missing some good
+to know information
+---
+ src/core_dump_handler/dlt_cdh.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h
+index 3dac480a..1ace805b 100644
+--- a/src/core_dump_handler/dlt_cdh.h
b/src/core_dump_handler/dlt_cdh.h
+@@ -45,7 +45,7 @@
+ #define CORE_FILE_PATTERN "%s/core.%d.%s.%d.gz"
+ #define CONTEXT_FILE_PATTERN"%s/context.%d.%s.%d.txt"
+
+-#if ((__SIZEOF_POINTER) == 4)
++#if ((__SIZEOF_POINTER__) == 4)
+ #define ELF_EhdrElf32_Ehdr
+ #define ELF_PhdrElf32_Phdr
+ #define ELF_ShdrElf32_Shdr
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 3d2e4a73f..b6cb788fe 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
@@ -19,6 +19,7 @@ SRC_URI =
"git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \
file://0004-Modify-systemd-config-directory.patch \
file://544.patch \
file://567.patch \
+ file://568.patch \
"
SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#106719):
https://lists.openembedded.org/g/openembedded-devel/message/106719
Mute This Topic: https://lists.openembedded.org/mt/102559563/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dlt-daemon: cherry-pick another upstream-proposed patch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/567.patch | 36 +++
.../dlt-daemon/dlt-daemon_2.18.10.bb | 1 +
2 files changed, 37 insertions(+)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/567.patch
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/567.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/567.patch
new file mode 100644
index 0..fd3648045
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/567.patch
@@ -0,0 +1,36 @@
+Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/567]
+
+From c84e48f6986054cf8b9459e608235b7bd1635746 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Mon, 13 Nov 2023 12:37:23 +0100
+Subject: [PATCH] dlt_cdh:
+
+Make sure on 64 bit we read an ELF64 structure.
+Otherwise we get a read error, and the context file is missing some good
+to know information
+---
+ src/core_dump_handler/dlt_cdh.h | 7 +++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h
+index 8608c6c4..3dac480a 100644
+--- a/src/core_dump_handler/dlt_cdh.h
b/src/core_dump_handler/dlt_cdh.h
+@@ -45,10 +45,17 @@
+ #define CORE_FILE_PATTERN "%s/core.%d.%s.%d.gz"
+ #define CONTEXT_FILE_PATTERN"%s/context.%d.%s.%d.txt"
+
++#if ((__SIZEOF_POINTER) == 4)
+ #define ELF_EhdrElf32_Ehdr
+ #define ELF_PhdrElf32_Phdr
+ #define ELF_ShdrElf32_Shdr
+ #define ELF_NhdrElf32_Nhdr
++#else
++#define ELF_EhdrElf64_Ehdr
++#define ELF_PhdrElf64_Phdr
++#define ELF_ShdrElf64_Shdr
++#define ELF_NhdrElf64_Nhdr
++#endif
+
+ typedef struct
+ {
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 410fffa24..3d2e4a73f 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
@@ -18,6 +18,7 @@ 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 \
+ file://567.patch \
"
SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#106638):
https://lists.openembedded.org/g/openembedded-devel/message/106638
Mute This Topic: https://lists.openembedded.org/mt/102559563/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] cpulimit: add DESCRIPTION field
Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Federico Briata --- meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb index 58e4fd6e8..f88d3b6ca 100644 --- a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb +++ b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb @@ -1,4 +1,5 @@ SUMMARY = "cpulimit is a tool which limits the CPU usage of a process" +DESCRIPTION = "cpulimit is a simple program that attempts to limit the CPU usage of a process (expressed in percentage, not in CPU time). This is useful to control batch jobs, when you don't want them to eat too much CPU. It does not act on the nice value or other priority stuff, but on the real CPU usage. Besides it is able to adapt itself to the overall system load, dynamically and quickly." HOMEPAGE = "http://cpulimit.sourceforge.net; LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=86c1c0d961a437e529db93aa3bb32dc4" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105740): https://lists.openembedded.org/g/openembedded-devel/message/105740 Mute This Topic: https://lists.openembedded.org/mt/102197323/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.10 -> 7.0.12
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../0001-vbox_fb-fix-kernel-v6.5-build.patch | 50 ---
...s_7.0.10.bb => vboxguestdrivers_7.0.12.bb} | 3 +-
2 files changed, 1 insertion(+), 52 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.0.10.bb =>
vboxguestdrivers_7.0.12.bb} (96%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch
deleted file mode 100644
index 01969d4a1..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4cf34517b0c793405dca154cc70c9b5d1a566a8a Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield
-Date: Fri, 29 Sep 2023 14:52:50 -0400
-Subject: [PATCH] vbox_fb: fix kernel v6.5 build
-
-When building against the 6.5 kernel (and kernel headers), the following
-build error is encountered:
-
- |
vboxguestdrivers/7.0.10/vboxguestdrivers-7.0.10/vboxvideo/vbox_fb.c:194:24:
error: 'drm_fb_helper_sys_fillrect' undeclared here (not in a function); did
you mean 'drm_fb_helper_lastclose'?
- | 194 | .fb_fillrect = drm_fb_helper_sys_fillrect,
- | |^~
- | |drm_fb_helper_lastclose
- |
vboxguestdrivers/7.0.10/vboxguestdrivers-7.0.10/vboxvideo/vbox_fb.c:195:24:
error: 'drm_fb_helper_sys_copyarea' undeclared here (not in a function); did
you mean 'drm_fb_helper_set_par'?
- | 195 | .fb_copyarea = drm_fb_helper_sys_copyarea,
- | |^~
- | |drm_fb_helper_set_par
- |
vboxguestdrivers/7.0.10/vboxguestdrivers-7.0.10/vboxvideo/vbox_fb.c:196:25:
error: 'drm_fb_helper_sys_imageblit' undeclared here (not in a function)
- | 196 | .fb_imageblit = drm_fb_helper_sys_imageblit,
- | | ^~~
-
-We backport a patch from vbox-dev to fix the issue.
-
-Upstream-Status: Submitted
[https://www.mail-archive.com/vbox-dev@virtualbox.org/msg10129.html]
-
-Signed-off-by: Bruce Ashfield
- src/VBox/Additions/linux/drm/vbox_fb.c | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c
b/src/VBox/Additions/linux/drm/vbox_fb.c
-index 2a8c79ab..d453533c 100644
a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -196,9 +196,13 @@ static struct fb_ops vboxfb_ops = {
- .owner = THIS_MODULE,
- .fb_check_var = drm_fb_helper_check_var,
- .fb_set_par = drm_fb_helper_set_par,
-+#if RTLNX_VER_MIN(6, 5, 0)
-+ FB_DEFAULT_SYS_OPS,
-+#else
- .fb_fillrect = drm_fb_helper_sys_fillrect,
- .fb_copyarea = drm_fb_helper_sys_copyarea,
- .fb_imageblit = drm_fb_helper_sys_imageblit,
-+#endif
- .fb_pan_display = drm_fb_helper_pan_display,
- .fb_blank = drm_fb_helper_blank,
- .fb_setcmap = drm_fb_helper_setcmap,
---
-2.34.1
-
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb
similarity index 96%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb
index 8e9013824..5574cdb2a 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb
@@ -13,10 +13,9 @@ VBOX_NAME = "VirtualBox-${PV}"
SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
file://Makefile.utils \
-file://0001-vbox_fb-fix-kernel-v6.5-build.patch \
"
-SRC_URI[sha256sum] =
"0b1e6d8b7f87d017c7fae37f80586acff04f799ffc1d51e995954d6415dee371"
+SRC_URI[sha256sum] =
"d76634c6ccf62503726a5aeae6c78a3462474c51a0ebe4942591ccc2d939890a"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105570):
https://lists.openembedded.org/g/openembedded-devel/message/105570
Mute This Topic: https://lists.openembedded.org/mt/102036680/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] cpprestsdk: fix typo in comment, tag is actually 2.0.18
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb
b/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb
index 1633412cf..36545503e 100644
--- a/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb
+++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb
@@ -11,7 +11,7 @@ SRC_URI =
"git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste
file://disable-float-tests.patch \
file://disable-outside-tests.patch "
-# tag 2.10.17
+# tag 2.10.18
SRCREV= "122d09549201da5383321d870bed45ecb9e168c5"
S = "${WORKDIR}/git"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105404):
https://lists.openembedded.org/g/openembedded-devel/message/105404
Mute This Topic: https://lists.openembedded.org/mt/101871969/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dlt-daemon: Add an additional fix for non-systemd builds
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon_2.18.10.bb | 12 ++--
1 file changed, 6 insertions(+), 6 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 ab367ad82..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
@@ -32,7 +32,7 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES',
'systemd', ' systemd s
PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF"
# Linux options
-PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd"
+PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF
-DWITH_DLT_SYSTEM=OFF,systemd"
PACKAGECONFIG[systemd-watchdog] =
"-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd"
PACKAGECONFIG[systemd-journal] =
"-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd"
PACKAGECONFIG[dlt-dbus] =
"-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib"
@@ -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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105366):
https://lists.openembedded.org/g/openembedded-devel/message/105366
Mute This Topic: https://lists.openembedded.org/mt/101793264/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH 1/2] dlt-daemon: update patch 544.patch
Hello, I sent an additional patch some seconds ago.
G.
On Fri, Oct 6, 2023 at 3:06 AM Khem Raj 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
> ^~
>
> On Mon, Oct 2, 2023 at 12:27 PM Khem Raj 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
> > wrote:
> > >
> > > Signed-off-by: Gianfranco Costamagna
> > > Signed-off-by: Gianfranco Costamagna
> > > ---
> > > 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
> > > 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 ..d6fc3905
> > > +index ..03509fda
> > > --- /dev/null
> > > +++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c
> > > @@ -0,0 +1,33 @@
> > > @@ -62,8 +62,8 @@ index ..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 (#105365):
https://lists.openembedded.org/g/openembedded-devel/message/105365
Mute This Topic: https://lists.openembedded.org/mt/101708265/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dlt-daemon:
do not disable dlt-system build when systemd is set to off
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.gitignore| 7 ---
meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
delete mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c01df45ec..0
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.pyc
-*.pyo
-/*.patch
-*.swp
-*.orig
-*.rej
-*~
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 410fffa24..47d7b1d21 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
@@ -32,7 +32,7 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES',
'systemd', ' systemd s
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"
+PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd"
PACKAGECONFIG[systemd-watchdog] =
"-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd"
PACKAGECONFIG[systemd-journal] =
"-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd"
PACKAGECONFIG[dlt-dbus] =
"-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105304):
https://lists.openembedded.org/g/openembedded-devel/message/105304
Mute This Topic: https://lists.openembedded.org/mt/101710203/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 2/2] dlt-daemon:
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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105302):
https://lists.openembedded.org/g/openembedded-devel/message/105302
Mute This Topic: https://lists.openembedded.org/mt/101708266/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 1/2] dlt-daemon: update patch 544.patch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
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
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 ..d6fc3905
+index ..03509fda
--- /dev/null
+++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c
@@ -0,0 +1,33 @@
@@ -62,8 +62,8 @@ index ..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/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH 1/2] dlt-daemon:
I sent a new patch serie. For now better keep it disabled as default until I finish writing the code. On Fri, Sep 29, 2023, 15:22 Khem Raj wrote: > thanks, do we still need the arm fix? it would be good if you resend > the whole series as v2 and so on. > > On Thu, Sep 28, 2023 at 10:24 PM Gianfranco Costamagna > wrote: > > > > Hello, the additional fix is already on patchwork! > > > > On Fri, Sep 29, 2023, 06:44 Khem Raj wrote: > >> > >> fails to build on AB > >> > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3186/steps/14/logs/stdio > >> > >> On Thu, Sep 28, 2023 at 11:57 AM Federico Pietro Briata > >> wrote: > >> > > >> > thanks guys, > >> > we'll test it and give you a feedback very soon. > >> > best regards > >> > Federico > >> > > >> > > >> > Il gio 28 set 2023, 6:58 PM Gianfranco Costamagna < > costamagna.gianfra...@gmail.com> ha scritto: > >> >> > >> >> The functionality works already. > >> >> The idea is to avoid many files with custom cpu code, and try to use > perf native functions to get pc/sp and so on. But I did test, coredumps are > correctly sent as well as context files. > >> >> > >> >> G. > >> >> > >> >> On Thu, Sep 28, 2023, 18:30 Khem Raj wrote: > >> >>> > >> >>> On Thu, Sep 28, 2023 at 8:35 AM Gianfranco Costamagna > >> >>> wrote: > >> >>> > > >> >>> > hello, sure looks perfect to me! > >> >>> > btw you will also need this one to build properly on some > architecture > >> >>> > https://patchwork.yoctoproject.org/project/oe/list/?series=17190 > >> >>> > >> >>> OK > >> >>> > >> >>> > > >> >>> > I'm polishing up the work, testing, and will try to update > upstream PR. > >> >>> > > >> >>> > But please note, this is a never-tested and highly experimental > dlt feature nobody is using right now. > >> >>> > (and it's a new binary, so won't affect the normal dlt usage) > >> >>> > >> >>> This does not generate confidence. If you want this to be > testing-only > >> >>> then mark the patches RFC so > >> >>> we can understand the intentions. > >> >>> > >> >>> > > >> >>> > Expect new commits soon :) > >> >>> > >> >>> sure > >> >>> > >> >>> > > >> >>> > G. > >> >>> > > >> >>> > On Thu, Sep 28, 2023 at 5:01 PM Khem Raj > wrote: > >> >>> >> > >> >>> >> I have staged it with some modified commit msg summary please > check > >> >>> >> master-next and see if it looks ok. > >> >>> >> > >> >>> >> On Thu, Sep 28, 2023 at 2:38 AM Gianfranco > >> >>> >> wrote: > >> >>> >> > > >> >>> >> > Make sure also without systemd enabled as default, the tools > can be built and installed, > >> >>> >> > such as dlt-adaptor, dlt-adaptor-stdin, dlt-adaptor-udp, > dlt-examples and dlt-console. > >> >>> >> > They have stub functionalities when systemd is not default, > but they can still be used with > >> >>> >> > limited functionalities > >> >>> >> > > >> >>> >> > Reported-By: Federico Briata > >> >>> >> > Reported-By: Andrea Reali > >> >>> >> > Signed-off-by: Gianfranco Costamagna < > costamagnagianfra...@yahoo.it> > >> >>> >> > Signed-off-by: Gianfranco Costamagna > > >> >>> >> > --- > >> >>> >> > .../dlt-daemon/dlt-daemon_2.18.10.bb| 13 > +++-- > >> >>> >> > 1 file changed, 7 insertions(+), 6 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 33fae0619..3811772a7 100644 > >> >>> >> > --- a/meta-oe/recip
[oe] [meta-oe][PATCH 2/2] dlt-daemon: also enable experimental coredumphandler feature
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/544.patch | 80 +++
.../dlt-daemon/dlt-daemon_2.18.10.bb | 3 +
2 files changed, 83 insertions(+)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
new file mode 100644
index 0..550493351
--- /dev/null
+++ b/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 5db28a4b85cf0ec3e128cfc7c9b71d12ec543695 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+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 ..d6fc3905
+--- /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
++ *
++ * \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
+ #include
+ #include
+-#include
++#include
+ #include
+
+ #include "dlt_cdh.h"
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 3811772a7..1522d02c2 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
@@ -17,6 +17,7 @@ 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"
@@ -47,6 +48,8 @@ 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"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105240):
https://lists.openembedded.org/g/openembedded-devel/message/105240
Mute This Topic: https://lists.openembedded.org/mt/101656256/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 1/2] dlt-daemon:
Make sure also without systemd enabled as default, the tools can be built and
installed,
such as dlt-adaptor, dlt-adaptor-stdin, dlt-adaptor-udp, dlt-examples and
dlt-console.
They have stub functionalities when systemd is not default, but they can still
be used with
limited functionalities
Reported-By: Federico Briata
Reported-By: Andrea Reali
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon_2.18.10.bb| 13 +++--
1 file changed, 7 insertions(+), 6 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 33fae0619..3811772a7 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
@@ -22,12 +22,13 @@ 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,11 +39,11 @@ 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
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105239):
https://lists.openembedded.org/g/openembedded-devel/message/105239
Mute This Topic: https://lists.openembedded.org/mt/101634559/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH 1/2] dlt-daemon:
Hello, the additional fix is already on patchwork!
On Fri, Sep 29, 2023, 06:44 Khem Raj wrote:
> fails to build on AB
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3186/steps/14/logs/stdio
>
> On Thu, Sep 28, 2023 at 11:57 AM Federico Pietro Briata
> wrote:
> >
> > thanks guys,
> > we'll test it and give you a feedback very soon.
> > best regards
> > Federico
> >
> >
> > Il gio 28 set 2023, 6:58 PM Gianfranco Costamagna <
> costamagna.gianfra...@gmail.com> ha scritto:
> >>
> >> The functionality works already.
> >> The idea is to avoid many files with custom cpu code, and try to use
> perf native functions to get pc/sp and so on. But I did test, coredumps are
> correctly sent as well as context files.
> >>
> >> G.
> >>
> >> On Thu, Sep 28, 2023, 18:30 Khem Raj wrote:
> >>>
> >>> On Thu, Sep 28, 2023 at 8:35 AM Gianfranco Costamagna
> >>> wrote:
> >>> >
> >>> > hello, sure looks perfect to me!
> >>> > btw you will also need this one to build properly on some
> architecture
> >>> > https://patchwork.yoctoproject.org/project/oe/list/?series=17190
> >>>
> >>> OK
> >>>
> >>> >
> >>> > I'm polishing up the work, testing, and will try to update upstream
> PR.
> >>> >
> >>> > But please note, this is a never-tested and highly experimental dlt
> feature nobody is using right now.
> >>> > (and it's a new binary, so won't affect the normal dlt usage)
> >>>
> >>> This does not generate confidence. If you want this to be testing-only
> >>> then mark the patches RFC so
> >>> we can understand the intentions.
> >>>
> >>> >
> >>> > Expect new commits soon :)
> >>>
> >>> sure
> >>>
> >>> >
> >>> > G.
> >>> >
> >>> > On Thu, Sep 28, 2023 at 5:01 PM Khem Raj wrote:
> >>> >>
> >>> >> I have staged it with some modified commit msg summary please check
> >>> >> master-next and see if it looks ok.
> >>> >>
> >>> >> On Thu, Sep 28, 2023 at 2:38 AM Gianfranco
> >>> >> wrote:
> >>> >> >
> >>> >> > Make sure also without systemd enabled as default, the tools can
> be built and installed,
> >>> >> > such as dlt-adaptor, dlt-adaptor-stdin, dlt-adaptor-udp,
> dlt-examples and dlt-console.
> >>> >> > They have stub functionalities when systemd is not default, but
> they can still be used with
> >>> >> > limited functionalities
> >>> >> >
> >>> >> > Reported-By: Federico Briata
> >>> >> > Reported-By: Andrea Reali
> >>> >> > Signed-off-by: Gianfranco Costamagna <
> costamagnagianfra...@yahoo.it>
> >>> >> > Signed-off-by: Gianfranco Costamagna
> >>> >> > ---
> >>> >> > .../dlt-daemon/dlt-daemon_2.18.10.bb| 13
> +++--
> >>> >> > 1 file changed, 7 insertions(+), 6 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 33fae0619..3811772a7 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
> >>> >> > @@ -22,12 +22,13 @@ 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
> >>> >> >
Re: [oe] [meta-oe][PATCH 1/2] dlt-daemon:
The functionality works already.
The idea is to avoid many files with custom cpu code, and try to use perf
native functions to get pc/sp and so on. But I did test, coredumps are
correctly sent as well as context files.
G.
On Thu, Sep 28, 2023, 18:30 Khem Raj wrote:
> On Thu, Sep 28, 2023 at 8:35 AM Gianfranco Costamagna
> wrote:
> >
> > hello, sure looks perfect to me!
> > btw you will also need this one to build properly on some architecture
> > https://patchwork.yoctoproject.org/project/oe/list/?series=17190
>
> OK
>
> >
> > I'm polishing up the work, testing, and will try to update upstream PR.
> >
> > But please note, this is a never-tested and highly experimental dlt
> feature nobody is using right now.
> > (and it's a new binary, so won't affect the normal dlt usage)
>
> This does not generate confidence. If you want this to be testing-only
> then mark the patches RFC so
> we can understand the intentions.
>
> >
> > Expect new commits soon :)
>
> sure
>
> >
> > G.
> >
> > On Thu, Sep 28, 2023 at 5:01 PM Khem Raj wrote:
> >>
> >> I have staged it with some modified commit msg summary please check
> >> master-next and see if it looks ok.
> >>
> >> On Thu, Sep 28, 2023 at 2:38 AM Gianfranco
> >> wrote:
> >> >
> >> > Make sure also without systemd enabled as default, the tools can be
> built and installed,
> >> > such as dlt-adaptor, dlt-adaptor-stdin, dlt-adaptor-udp, dlt-examples
> and dlt-console.
> >> > They have stub functionalities when systemd is not default, but they
> can still be used with
> >> > limited functionalities
> >> >
> >> > Reported-By: Federico Briata
> >> > Reported-By: Andrea Reali
> >> > Signed-off-by: Gianfranco Costamagna
> >> > Signed-off-by: Gianfranco Costamagna
> >> > ---
> >> > .../dlt-daemon/dlt-daemon_2.18.10.bb| 13
> +++--
> >> > 1 file changed, 7 insertions(+), 6 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 33fae0619..3811772a7 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
> >> > @@ -22,12 +22,13 @@ 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,11 +39,11 @@ 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
> >> >
> >> > --
> >> > 2.34.1
> >> >
> >> >
> >> >
> >> >
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105229):
https://lists.openembedded.org/g/openembedded-devel/message/105229
Mute This Topic: https://lists.openembedded.org/mt/101634559/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH 1/2] dlt-daemon:
hello, sure looks perfect to me!
btw you will also need this one to build properly on some architecture
https://patchwork.yoctoproject.org/project/oe/list/?series=17190
I'm polishing up the work, testing, and will try to update upstream PR.
But please note, this is a never-tested and highly experimental dlt feature
nobody is using right now.
(and it's a new binary, so won't affect the normal dlt usage)
Expect new commits soon :)
G.
On Thu, Sep 28, 2023 at 5:01 PM Khem Raj wrote:
> I have staged it with some modified commit msg summary please check
> master-next and see if it looks ok.
>
> On Thu, Sep 28, 2023 at 2:38 AM Gianfranco
> wrote:
> >
> > Make sure also without systemd enabled as default, the tools can be
> built and installed,
> > such as dlt-adaptor, dlt-adaptor-stdin, dlt-adaptor-udp, dlt-examples
> and dlt-console.
> > They have stub functionalities when systemd is not default, but they can
> still be used with
> > limited functionalities
> >
> > Reported-By: Federico Briata
> > Reported-By: Andrea Reali
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../dlt-daemon/dlt-daemon_2.18.10.bb| 13 +++--
> > 1 file changed, 7 insertions(+), 6 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 33fae0619..3811772a7 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
> > @@ -22,12 +22,13 @@ 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,11 +39,11 @@ 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
> >
> > --
> > 2.34.1
> >
> >
> >
> >
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105227):
https://lists.openembedded.org/g/openembedded-devel/message/105227
Mute This Topic: https://lists.openembedded.org/mt/101634559/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dlt-daemon: add a new patch to unblock build on arm
---
.../dlt-daemon/dlt-daemon/544.patch | 88 +++
.../dlt-daemon/dlt-daemon_2.18.10.bb | 2 +
2 files changed, 90 insertions(+)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
new file mode 100644
index 0..cf52371a0
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch
@@ -0,0 +1,88 @@
+Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/544]
+
+From ca7011239a6e7d7fd366e0312d0ae19ac30e2cb7 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Thu, 28 Sep 2023 12:54:23 +0200
+Subject: [PATCH 1/2] 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 | 32 +
+ 2 files changed, 34 insertions(+)
+ 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 ..a9fc5df3
+--- /dev/null
b/src/core_dump_handler/dlt_cdh_cpuinfo.c
+@@ -0,0 +1,32 @@
++/*
++ * 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
++ *
++ * \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]; */
++}
+
+From 124b3dc395eb47a0f780021efa620138adc3f804 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Thu, 28 Sep 2023 13:03:44 +0200
+Subject: [PATCH 2/2] Fix include
+
+---
+ src/core_dump_handler/dlt_cdh_crashid.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+ #include
+ #include
+-#include
++#include
+ #include
+
+ #include "dlt_cdh.h"
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 c70f63e8d..adfc2d412 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
@@ -17,6 +17,7 @@ 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"
@@ -62,6 +63,7 @@ SYSTEMD_SERVICE:${PN}-systemd = " \
"
SYSTEMD_AUTO_ENABLE:${PN}-systemd = "disable"
+FILES:${PN} += "${libdir}/sysctl.d"
FILES:${PN}-doc += "${datadir}/dlt-filetransfer"
do_install:append() {
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105225):
https://lists.openembedded.org/g/openembedded-devel/message/105225
Mute This Topic: https://lists.openembedded.org/mt/101639329/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 2/2] dlt-daemon: also enable experimental coredumphandler feature
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 3811772a7..c70f63e8d 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
@@ -47,7 +47,7 @@ PACKAGECONFIG[dlt-console] =
"-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF"
inherit autotools gettext cmake pkgconfig systemd
-EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON
-DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
+EXTRA_OECMAKE += "-DWITH_DLT_COREDUMPHANDLER=ON -DWITH_DLT_LOGSTORAGE_GZIP=ON
-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
PACKAGES += "${PN}-systemd"
SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105220):
https://lists.openembedded.org/g/openembedded-devel/message/105220
Mute This Topic: https://lists.openembedded.org/mt/101634560/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 1/2] dlt-daemon:
Make sure also without systemd enabled as default, the tools can be built and
installed,
such as dlt-adaptor, dlt-adaptor-stdin, dlt-adaptor-udp, dlt-examples and
dlt-console.
They have stub functionalities when systemd is not default, but they can still
be used with
limited functionalities
Reported-By: Federico Briata
Reported-By: Andrea Reali
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon_2.18.10.bb| 13 +++--
1 file changed, 7 insertions(+), 6 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 33fae0619..3811772a7 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
@@ -22,12 +22,13 @@ 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,11 +39,11 @@ 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
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105219):
https://lists.openembedded.org/g/openembedded-devel/message/105219
Mute This Topic: https://lists.openembedded.org/mt/101634559/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] mosquitto: upgrade 2.0.17 -> 2.0.18
Hello, since I maintain the same patch set for both Debian, Ubuntu and
meta-oe, I would prefer to use cp to keep them in sync between releases...
(whenever possible, specially for upstream proposed PRs)
If you want me to add it anyway, please let me know!
G.
On Mon, Sep 25, 2023, 19:58 Khem Raj wrote:
> On Mon, Sep 25, 2023 at 6:15 AM Gianfranco
> wrote:
> >
> > Add two patches from Debian, pull requests proposed upstream as 2894 and
> 2895
> > to make it start only when board is online, and to fix dynamic
> websockets link failure
> > ---
> > .../mosquitto/files/2894.patch| 23 +
> > .../mosquitto/files/2895.patch| 25 +++
> > ...osquitto_2.0.17.bb => mosquitto_2.0.18.bb} | 4 ++-
> > 3 files changed, 51 insertions(+), 1 deletion(-)
> > create mode 100644
> meta-networking/recipes-connectivity/mosquitto/files/2894.patch
> > create mode 100644
> meta-networking/recipes-connectivity/mosquitto/files/2895.patch
> > rename meta-networking/recipes-connectivity/mosquitto/{
> mosquitto_2.0.17.bb => mosquitto_2.0.18.bb} (95%)
> >
> > diff --git
> a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
> b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
> > new file mode 100644
> > index 0..3275e57e3
> > --- /dev/null
> > +++ b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
> > @@ -0,0 +1,23 @@
> > +From: Joachim Zobel
> > +Date: Wed, 13 Sep 2023 09:55:34 +0200
> > +Subject: [PATCH] Link correctly with shared websockets library if
> needed see:
> > + https://github.com/eclipse/mosquitto/pull/2751
> > +
> > +Patch contributed by Joachim Zobel and
> Daniel Engberg
>
> It will be good to annotate the patch with Signed-off-by and
> Upstream-Status:
>
>
> https://docs.yoctoproject.org/dev/contributor-guide/recipe-style-guide.html?highlight=upstream+status#patch-upstream-status
>
> > +---
> > + src/CMakeLists.txt | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
> > +index 9380a04..dce8313 100644
> > +--- a/src/CMakeLists.txt
> > b/src/CMakeLists.txt
> > +@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS)
> > + link_directories(${mosquitto_SOURCE_DIR})
> > + endif (WIN32)
> > + else (STATIC_WEBSOCKETS)
> > +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
> > ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
> > + endif (STATIC_WEBSOCKETS)
> > + endif (WITH_WEBSOCKETS)
> > +
> > diff --git
> a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
> b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
> > new file mode 100644
> > index 0..a9e9c97b8
> > --- /dev/null
> > +++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
> > @@ -0,0 +1,25 @@
> > +From: Joachim Zobel
> > +Date: Wed, 13 Sep 2023 10:05:43 +0200
> > +Subject: [PATCH] Mosquitto now waits for network-online when starting
> > + (Closes: #1036450)
> > +
> > +See: https://github.com/eclipse/mosquitto/issues/2878
> > +---
> > + service/systemd/mosquitto.service.simple | 4 ++--
> > + 1 file changed, 2 insertions(+), 2 deletions(-)
> > +
> > +diff --git a/service/systemd/mosquitto.service.simple
> b/service/systemd/mosquitto.service.simple
> > +index 15ee0d6..c2a330b 100644
> > +--- a/service/systemd/mosquitto.service.simple
> > b/service/systemd/mosquitto.service.simple
> > +@@ -1,8 +1,8 @@
> > + [Unit]
> > + Description=Mosquitto MQTT Broker
> > + Documentation=man:mosquitto.conf(5) man:mosquitto(8)
> > +-After=network.target
> > +-Wants=network.target
> > ++After=network-online.target
> > ++Wants=network-online.target
> > +
> > + [Service]
> > + ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
> > diff --git a/meta-networking/recipes-connectivity/mosquitto/
> mosquitto_2.0.17.bb b/meta-networking/recipes-connectivity/mosquitto/
> mosquitto_2.0.18.bb
> > similarity index 95%
> > rename from meta-networking/recipes-connectivity/mosquitto/
> mosquitto_2.0.17.bb
> > rename to meta-networking/recipes-connectivity/mosquitto/
> mosquitto_2.0.18.bb
> > index 690b6bc12..0c9ccc810 100644
> > --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
> > +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
> > @@ -17,9 +17,11 @@ DEPENDS = "uthash cjson"
[oe] [meta-oe][PATCH] mosquitto: upgrade 2.0.17 -> 2.0.18
Add two patches from Debian, pull requests proposed upstream as 2894 and 2895
to make it start only when board is online, and to fix dynamic websockets link
failure
---
.../mosquitto/files/2894.patch| 23 +
.../mosquitto/files/2895.patch| 25 +++
...osquitto_2.0.17.bb => mosquitto_2.0.18.bb} | 4 ++-
3 files changed, 51 insertions(+), 1 deletion(-)
create mode 100644
meta-networking/recipes-connectivity/mosquitto/files/2894.patch
create mode 100644
meta-networking/recipes-connectivity/mosquitto/files/2895.patch
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.17.bb =>
mosquitto_2.0.18.bb} (95%)
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
new file mode 100644
index 0..3275e57e3
--- /dev/null
+++ b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
@@ -0,0 +1,23 @@
+From: Joachim Zobel
+Date: Wed, 13 Sep 2023 09:55:34 +0200
+Subject: [PATCH] Link correctly with shared websockets library if needed see:
+ https://github.com/eclipse/mosquitto/pull/2751
+
+Patch contributed by Joachim Zobel and Daniel
Engberg
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9380a04..dce8313 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS)
+ link_directories(${mosquitto_SOURCE_DIR})
+ endif (WIN32)
+ else (STATIC_WEBSOCKETS)
+- set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
+ endif (STATIC_WEBSOCKETS)
+ endif (WITH_WEBSOCKETS)
+
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
new file mode 100644
index 0..a9e9c97b8
--- /dev/null
+++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch
@@ -0,0 +1,25 @@
+From: Joachim Zobel
+Date: Wed, 13 Sep 2023 10:05:43 +0200
+Subject: [PATCH] Mosquitto now waits for network-online when starting
+ (Closes: #1036450)
+
+See: https://github.com/eclipse/mosquitto/issues/2878
+---
+ service/systemd/mosquitto.service.simple | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/service/systemd/mosquitto.service.simple
b/service/systemd/mosquitto.service.simple
+index 15ee0d6..c2a330b 100644
+--- a/service/systemd/mosquitto.service.simple
b/service/systemd/mosquitto.service.simple
+@@ -1,8 +1,8 @@
+ [Unit]
+ Description=Mosquitto MQTT Broker
+ Documentation=man:mosquitto.conf(5) man:mosquitto(8)
+-After=network.target
+-Wants=network.target
++After=network-online.target
++Wants=network-online.target
+
+ [Service]
+ ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
similarity index 95%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
index 690b6bc12..0c9ccc810 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
@@ -17,9 +17,11 @@ DEPENDS = "uthash cjson"
SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
file://mosquitto.init \
file://1571.patch \
+ file://2894.patch \
+ file://2895.patch \
"
-SRC_URI[sha256sum] =
"3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f"
+SRC_URI[sha256sum] =
"d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a"
inherit systemd update-rc.d useradd cmake pkgconfig
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#105128):
https://lists.openembedded.org/g/openembedded-devel/message/105128
Mute This Topic: https://lists.openembedded.org/mt/101573484/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] mosquitto: upgrade 2.0.15 -> 2.0.17
Fix for CVE-2023-28366, CVE-2023-0809, CVE-2023-3592
Signed-off-by: Gianfranco Costamagna
---
.../mosquitto/files/mosquitto.init| 20 +--
...osquitto_2.0.15.bb => mosquitto_2.0.17.bb} | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.15.bb =>
mosquitto_2.0.17.bb} (97%)
diff --git
a/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
index 9d5963c41..d0da219d6 100644
--- a/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
+++ b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init
@@ -1,18 +1,18 @@
-#! /bin/sh
+#!/bin/sh
# Based on the Debian initscript for mosquitto
### BEGIN INIT INFO
-# Provides: mosquitto
-# Required-Start: $remote_fs $syslog
-# Required-Stop:$remote_fs $syslog
-# Default-Start:2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description:mosquitto MQTT message broker
-# Description:
-# This is a message broker that supports version 3.1/3.1.1 of the MQ Telemetry
+# Provides: mosquitto
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: mosquitto MQTT 3.1/3.1.1 message broker
+# Description:
+# This is a message broker that supports version 3.1 of the MQ Telemetry
# Transport (MQTT) protocol.
-#
+#
# MQTT provides a method of carrying out messaging using a publish/subscribe
# model. It is lightweight, both in terms of bandwidth usage and ease of
# implementation. This makes it particularly useful at the edge of the network
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
similarity index 97%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
index eea672a70..690b6bc12 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb
@@ -19,7 +19,7 @@ SRC_URI =
"http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
file://1571.patch \
"
-SRC_URI[sha256sum] =
"4735b1d32e3f91c7a8896741d88a3022e89730a1ee897946decfa0df27039ac6"
+SRC_URI[sha256sum] =
"3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f"
inherit systemd update-rc.d useradd cmake pkgconfig
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#104853):
https://lists.openembedded.org/g/openembedded-devel/message/104853
Mute This Topic: https://lists.openembedded.org/mt/101332718/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] mosquitto: do not automatically depend on dlt-daemon, it's a non-mandatory logging system
---
.../recipes-connectivity/mosquitto/mosquitto_2.0.15.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
index d06dd2d9c..eea672a70 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.15.bb
@@ -23,7 +23,7 @@ SRC_URI[sha256sum] =
"4735b1d32e3f91c7a8896741d88a3022e89730a1ee897946decfa0df27
inherit systemd update-rc.d useradd cmake pkgconfig
-PACKAGECONFIG ??= "ssl dlt websockets \
+PACKAGECONFIG ??= "ssl websockets \
${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \
"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#104851):
https://lists.openembedded.org/g/openembedded-devel/message/104851
Mute This Topic: https://lists.openembedded.org/mt/101320067/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dlt-daemon: upgrade 2.18.9 -> 2.18.10 (commit: 0f2d4cfffada6f8448a2cb27995b38eb4271044f)
Drop patches now part of new upstream release:
- 449.patch
- 481.patch
- 482.patch
Refresh patches due to GENIVI->COVESA renaming
What's Changed:
Update ReleaseNotes and version to v2.18.9 by @minminlittleshrimp in #468
Update status badges on README.md by @michael-methner in #467
logstorage: Adds option to write logs in gzip format by @LiquidityC in #442
Re-Initialize internal logging in daemon mode only by @lvklevankhanh in #459
Remove use of DLT_LOG in signal handler by @michael-methner in #472
Update gtest_dlt_daemon_multiple_files_logging.cpp by @LocutusOfBorg in #481
Update AUTOSAR standard link by @lucafrance in #480
cmake: set version to 2.18.9 by @alexmohr in #478
Fix macro code to use boolean value in while instruction (false) by
@michael-methner in #469
dlt_user_shared: Add timeout to writev by @alexmohr in #385
build: add static lib only if necessary by @alexmohr in #479
Update CMakeLists.txt by @LocutusOfBorg in #482
watchdog: improve dlt watchdog by @alexmohr in #470
log-level-config: add option to configure log levels by @alexmohr in #474
gtest_dlt_daemon_gateway: dlt-daemon run without dlt_passive.conf file by
@lti9hc in #487
dlt_unit_test: Fix and improve quality of unit tests by @minminlittleshrimp
in #494
dlt-qnx-system improvement by @lvklevankhanh in #495
gtest: Init submodule and update version by @minminlittleshrimp in #497
dlt-qnx-system: prevent message loss in high load situations by @alexmohr
in #490
Fix compile error stringop-truncation with GCC 9.4 by @michael-methner in
#499
Update README.md by @lvklevankhanh in #503
dlt-coverage: Add coverage report generator for dlt by @minminlittleshrimp
in #501
dlt-system: move journal reading to its own thread by @alexmohr in #471
Switch from GENIVI to COVESA by @minminlittleshrimp in #511
Update CMakeLists.txt: set required std version to gnu++14 by
@LocutusOfBorg in #504
cmake: Policy CMP0115 set to OLD behavior for dlt-daemon with cmake >= 3.20
by @minminlittleshrimp in #510
fix usage of pthread_cond_timedwait by @alexmohr in #491
DLT Upstream for minor release by @minminlittleshrimp in #515
cmake: disable network trace by @alexmohr in #477
doc: add COVESA logo image by @minminlittleshrimp in #516
Prepare for 2.18.10 release by @michael-methner in #517
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...execute-processes-as-a-specific-user.patch | 10 ++--
.../dlt-daemon/dlt-daemon/481.patch | 49 ---
.../dlt-daemon/dlt-daemon/482.patch | 40 ---
.../dlt-daemon/dlt-daemon/504.patch | 34 -
...daemon_2.18.9.bb => dlt-daemon_2.18.10.bb} | 7 +--
5 files changed, 7 insertions(+), 133 deletions(-)
delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch
delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch
delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch
rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.9.bb =>
dlt-daemon_2.18.10.bb} (93%)
diff --git
a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
index 181be25c7..cfb820cec 100644
---
a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
+++
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch
@@ -18,7 +18,7 @@ diff --git a/systemd/dlt-adaptor-udp.service.cmake
b/systemd/dlt-adaptor-udp.ser
index 8dac1f2..ecf9f9e 100644
--- a/systemd/dlt-adaptor-udp.service.cmake
+++ b/systemd/dlt-adaptor-udp.service.cmake
-@@ -21,9 +21,8 @@ Wants=dlt.service
+@@ -19,9 +19,8 @@ Wants=dlt.service
[Service]
Type=simple
@@ -51,7 +51,7 @@ index b665742..35009b0 100644
[Service]
Type=simple
-User=@DLT_USER@
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT
example user application"
+ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from COVESA DLT
example user application"
-LimitCORE=infinity
\ No newline at end of file
+LimitCORE=infinity
@@ -59,7 +59,7 @@ diff --git a/systemd/dlt-receive.service.cmake
b/systemd/dlt-receive.service.cma
index c07d447..8f88f00 100644
--- a/systemd/dlt-receive.service.cmake
+++ b/systemd/dlt-receive.service.cmake
-@@ -22,6 +22,5 @@ Wants=dlt.service
+@@ -20,6 +20,5 @@ Wants=dlt.service
[Service]
Type=simple
@@ -72,7 +72,7 @@ diff --git a/systemd/dlt-system.service.cmake
b/systemd/dlt-system.service.cmake
index 0e91f42..1a5b913 100755
--- a/systemd/dlt-system.service.cmake
+++ b/systemd/dlt-system.service.cmake
-@@ -22,7 +22,6 @@ Wants=dlt.service
+@@ -20,7 +20,6 @@ Wants=dlt.service
[Servi
[oe] [meta-oe][PATCH] gpsd: make sure gps-utils-python runtime-depends on python3-pyserial
Pyserial is used at runtime (e.g. by ubxtool)
Reported-By: Federico Perenno
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb
b/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb
index 245f8728c..a755e39ed 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb
@@ -143,6 +143,7 @@ FILES:python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/*
${libdir}/gps/*.py ${libdir}
RDEPENDS:python3-pygps = " \
python3-core \
python3-io \
+python3-pyserial \
python3-threading \
python3-terminal \
gpsd \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#104202):
https://lists.openembedded.org/g/openembedded-devel/message/104202
Mute This Topic: https://lists.openembedded.org/mt/100506498/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dlt-daemon: Add patch to fix build with googletest 1.13
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/504.patch | 34 +++
.../dlt-daemon/dlt-daemon_2.18.9.bb | 1 +
2 files changed, 35 insertions(+)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch
new file mode 100644
index 0..3290d1108
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch
@@ -0,0 +1,34 @@
+Bug: https://bugs.debian.org/1041124
+From 3f8bc3343983697531d52918fb6cdba19593f3a8 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Sat, 15 Jul 2023 11:31:55 +0200
+Subject: [PATCH] Update CMakeLists.txt: set required std version to gnu++14
+
+New googletest 1.13.0 defaults to gnu++14, so makes this package FTBFS when
building testsuite with this error:
+
+In file included from /usr/include/gtest/gtest-message.h:57,
+ from /usr/include/gtest/gtest-assertion-result.h:46,
+ from /usr/include/gtest/gtest.h:64,
+ from /build/1st/dlt-daemon-2.18.9/tests/gtest_dlt_user.cpp:27:
+/usr/include/gtest/internal/gtest-port.h:270:2: error: #error C++ versions
less than C++14 are not supported.
+ 270 | #error C++ versions less than C++14 are not supported.
+ | ^
+
+Thanks Adrian Bunk for the report and the fix!
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 014fc3bb..b2e056db 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -213,7 +213,7 @@ endif()
+
+ add_compile_options(
+ $<$:-std=gnu99>
+-$<$:-std=gnu++11>
++$<$:-std=gnu++14>
+ -Wall
+ -Wextra
+ # -pedantic
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb
index 9a7b38b49..2d6d1879a 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb
@@ -19,6 +19,7 @@ SRC_URI =
"git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \
file://0004-Modify-systemd-config-directory.patch \
file://481.patch \
file://482.patch \
+ file://504.patch \
"
SRCREV = "9a2312d3512a27620d41b9a325338b6e7b3d42de"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#103973):
https://lists.openembedded.org/g/openembedded-devel/message/103973
Mute This Topic: https://lists.openembedded.org/mt/100281329/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.8 -> 7.0.10
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...t-additions-7.0.8-kernel-6.4-patch-1.patch | 29 -
...t-additions-7.0.8-kernel-6.4-patch-2.patch | 43 ---
...rs_7.0.8.bb => vboxguestdrivers_7.0.10.bb} | 4 +-
3 files changed, 1 insertion(+), 75 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.0.8.bb =>
vboxguestdrivers_7.0.10.bb} (93%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch
deleted file mode 100644
index 37ef3a9d5..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Initial support for kernel 6.4
-https://www.virtualbox.org/changeset/99666/vbox
-
-Upstream-Status: Backport
[https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch]
-
-Signed-off-by: Bruce Ashfield
-
a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -75,4 +75,11 @@
- #if RTLNX_VER_MAX(2,5,12)
- # define PageUptodate(a_pPage) Page_Uptodate(a_pPage)
-+#endif
-+
-+/** Starting from 6.4.0, iter_iov() macro should be used in order to access
to iov field. */
-+#if RTLNX_VER_MIN(6,4,0)
-+# define VBOX_ITER_IOV(_iter) iter_iov(_iter)
-+#else
-+# define VBOX_ITER_IOV(_iter) iter->iov
- #endif
-
-@@ -2400,5 +2407,5 @@
- if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
- # endif
--const struct iovec *pCurIov= iter->iov;
-+const struct iovec *pCurIov= VBOX_ITER_IOV(iter);
- size_t cLeft = iter->nr_segs;
- size_t cPagesSpan = 0;
-
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch
deleted file mode 100644
index 20c8fbd3f..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Initial support for kernel 6.4
-https://www.virtualbox.org/changeset/99667/vbox
-
-
-Upstream-Status: Backport
[https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch]
-
-Signed-off-by: Bruce Ashfield
-
a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -77,11 +77,4 @@
- #endif
-
--/** Starting from 6.4.0, iter_iov() macro should be used in order to access
to iov field. */
--#if RTLNX_VER_MIN(6,4,0)
--# define VBOX_ITER_IOV(_iter) iter_iov(_iter)
--#else
--# define VBOX_ITER_IOV(_iter) iter->iov
--#endif
--
-
-
/*
-@@ -94,4 +87,12 @@
- #else
- # define VBSF_GET_ITER_TYPE(a_pIter) ((a_pIter)->type)
-+#endif
-+
-+/** Starting from 6.4.0, iter_iov() macro should be used in order to access
to iov field
-+ * of struct iov_iter. */
-+#if RTLNX_VER_MIN(6,4,0)
-+# define VBSF_GET_ITER_IOV(_iter) iter_iov(_iter)
-+#else
-+# define VBSF_GET_ITER_IOV(_iter) iter->iov
- #endif
-
-@@ -2407,5 +2408,5 @@
- if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
- # endif
--const struct iovec *pCurIov= VBOX_ITER_IOV(iter);
-+const struct iovec *pCurIov= VBSF_GET_ITER_IOV(iter);
- size_t cLeft = iter->nr_segs;
- size_t cPagesSpan = 0;
-
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb
similarity index 93%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb
index 233323bf7..f19363652 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb
@@ -13,11 +13,9 @@ VBOX_NAME = "VirtualBox-${PV}"
SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
file://Makefile.utils \
-file://virtualbox-guest-ad
[oe] [meta-oe][PATCH] dlt-daemon: upgrade 2.18.8 -> 2.18.9 (commit: 9a2312d3512a27620d41b9a325338b6e7b3d42de)
ntroducing size limits by
@danielweber2018 in #369
dlt-logd-converter: fixes android 12 compilation by @sebastienraillet in
#445
dlt-logd-converter: Fix getting log level from log msg by @RobinChenJP in
#456
house-keeper: remove infinite wait by @alexmohr in #438
cmake: remove duplicated option message by @minminlittleshrimp in #454
Android: Add new feature in Android bp by @minminlittleshrimp in #461
dlt_multiple_files: remove superfluous mode bits and add header file to
header list by @minminlittleshrimp in #462
dlt-user: fix crash with certain strings by @alexmohr in #463
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/0001-Fix-memory-leak.patch | 34 --
...ake-Link-with-libatomic-on-rv32-rv64.patch | 45 --
...uffer-overflow-detection-on-32bit-ta.patch | 40
.../dlt-daemon/dlt-daemon/481.patch | 47 +++
.../dlt-daemon/dlt-daemon/482.patch | 38 +++
...-daemon_2.18.8.bb => dlt-daemon_2.18.9.bb} | 14 ++
6 files changed, 90 insertions(+), 128 deletions(-)
delete mode 100644
meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-memory-leak.patch
delete mode 100644
meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch
delete mode 100644
meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch
rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.8.bb =>
dlt-daemon_2.18.9.bb} (90%)
diff --git
a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-memory-leak.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-memory-leak.patch
deleted file mode 100644
index 72e3b9802..0
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-memory-leak.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b6149e203f919c899fefc702a17fbb78bdec3700 Mon Sep 17 00:00:00 2001
-From: Le Van Khanh
-Date: Thu, 9 Feb 2023 03:17:13 -0500
-Subject: [PATCH] Fix memory leak
-
-Free the ecuid_conf in case of memory alllocated
-
-CVE: CVE-2023-26257
-
-Upstream-Status: Backport
-[https://github.com/COVESA/dlt-daemon/pull/441/commits/b6149e203f919c899fefc702a17fbb78bdec3700]
-
-Signed-off-by: Le Van Khanh
-
-Signed-off-by: Yogita Urade
- src/console/dlt-control-common.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/console/dlt-control-common.c
b/src/console/dlt-control-common.c
-index abcaf92..64951c1 100644
a/src/console/dlt-control-common.c
-+++ b/src/console/dlt-control-common.c
-@@ -124,6 +124,8 @@ void set_ecuid(char *ecuid)
- if (dlt_parse_config_param("ECUId", _conf) == 0) {
- memset(local_ecuid, 0, DLT_CTRL_ECUID_LEN);
- strncpy(local_ecuid, ecuid_conf, DLT_CTRL_ECUID_LEN);
-+if (ecuid_conf !=NULL)
-+free(ecuid_conf);
- local_ecuid[DLT_CTRL_ECUID_LEN - 1] = '\0';
- }
- else {
---
-2.34.1
diff --git
a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch
deleted file mode 100644
index 7b40b7a67..0
---
a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From dd2d42a7f877d292f86e421dd9651f4b7c2abf18 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Tue, 19 Apr 2022 14:57:58 -0700
-Subject: [PATCH] cmake: Link with libatomic on rv32/rv64
-
-Use of needs to link in libatomic on riscv
-Fixes
-
-undefined reference to `__atomic_exchange_1'
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj
- src/lib/CMakeLists.txt | 8 +++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
-index 3293376..65018be 100644
a/src/lib/CMakeLists.txt
-+++ b/src/lib/CMakeLists.txt
-@@ -37,6 +37,12 @@ else()
- set(SOCKET_LIBRARY socket)
- endif()
-
-+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR
STREQUAL "riscv32")
-+set(ATOMIC_LIBRARY atomic)
-+else()
-+set(ATOMIC_LIBRARY "")
-+endif()
-+
- if(HAVE_FUNC_PTHREAD_SETNAME_NP)
- add_definitions(-DDLT_USE_PTHREAD_SETNAME_NP)
- message(STATUS "Using pthread_setname_np API to set thread name")
-@@ -44,7 +50,7 @@ else()
- message(STATUS "pthread_setname_np API not available on this platform")
- endif()
-
--target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} Threads::Threads)
-+target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} ${ATOMIC_LIBRARY}
Threads::Threads)
-
- target_inclu
[oe] [meta-oe][PATCH] dlt-daemon: upgrade 2.18.8 -> 2.18.9 (commit: 9a2312d3512a27620d41b9a325338b6e7b3d42de)
extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch
deleted file mode 100644
index e7e6cb3b1..0
---
a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-system-Fix-buffer-overflow-detection-on-32bit-ta.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 94378458d653b1edca86435026909592cbe5e793 Mon Sep 17 00:00:00 2001
-From: Changqing Li
-Date: Fri, 19 Aug 2022 11:12:17 +0800
-Subject: [PATCH] dlt-system: Fix buffer overflow detection on 32bit targets
-
-On 32bit target, dlt-system will termiated with error:
-dlt-system: *** buffer overflow detected ***: terminated
-
-Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/398]
-
-Signed-off-by: Changqing Li
- src/system/dlt-system-watchdog.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/system/dlt-system-watchdog.c
b/src/system/dlt-system-watchdog.c
-index a2b01de..c0eaa12 100644
a/src/system/dlt-system-watchdog.c
-+++ b/src/system/dlt-system-watchdog.c
-@@ -109,8 +109,8 @@ int register_watchdog_fd(struct pollfd *pollfd, int fdcnt)
-
- void watchdog_fd_handler(int fd)
- {
--long int timersElapsed = 0;
--int r = read(fd, , 8);// only needed to reset fd event
-+uint64_t timersElapsed = 0ULL;
-+int r = read(fd, , 8U);// only needed to reset fd event
- if(r < 0)
- DLT_LOG(watchdogContext, DLT_LOG_ERROR, DLT_STRING("Could not reset
systemd watchdog. Exit with: "),
- DLT_STRING(strerror(r)));
-@@ -120,4 +120,4 @@ void watchdog_fd_handler(int fd)
-
- DLT_LOG(watchdogContext, DLT_LOG_DEBUG, DLT_STRING("systemd watchdog
waited periodic\n"));
- }
--#endif
-\ No newline at end of file
-+#endif
---
-2.25.1
-
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch
new file mode 100644
index 0..a3f2b2f9e
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch
@@ -0,0 +1,47 @@
+From 95476de802585629c6d89707a9247bbb0c70f6c9 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Fri, 28 Apr 2023 22:39:57 +0200
+Subject: [PATCH] Update gtest_dlt_daemon_multiple_files_logging.cpp
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix build error due to dlt_vlog not having the correct format string with
security build flags enabled
+
+[ 88%] Building CXX object
tests/CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o
+cd dlt-daemon-2.18.9/obj-x86_64-linux-gnu/tests && /usr/bin/c++
-DCONFIGURATION_FILES_DIR=\"/etc\" -DDLT_DAEMON_USE_FIFO_IPC
-DDLT_LIB_USE_FIFO_IPC -DDLT_NETWORK_TRACE_ENABLE -DDLT_SYSTEMD_ENABLE
-DDLT_SYSTEMD_JOURNAL_ENABLE -DDLT_UNIT_TESTS -DDLT_USER_IPC_PATH=\"/tmp\"
-DDLT_USE_IPv6 -DEXTENDED_FILTERING -D_GNU_SOURCE -Idlt-daemon-2.18.9
-Idlt-daemon-2.18.9/obj-x86_64-linux-gnu/include/dlt
-Idlt-daemon-2.18.9/include/dlt -Idlt-daemon-2.18.9/src/shared
-Idlt-daemon-2.18.9/src/core_dump_handler
-Idlt-daemon-2.18.9/src/offlinelogstorage -Idlt-daemon-2.18.9/src/lib
-Idlt-daemon-2.18.9/src/daemon -Idlt-daemon-2.18.9/src/console
-Idlt-daemon-2.18.9/src/gateway -Idlt-daemon-2.18.9/systemd/3rdparty -g -O2
-ffile-prefix-map=dlt-daemon-2.18.9=. -flto=auto -ffat-lto-objects -flto=auto
-ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security
-Wdate-time -D_FORTIFY_SOURCE=2 -isystem /include -std=gnu++0x -std=gnu++11
-Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -DGTEST_HAS_PTHREAD=1
-MD -MT
tests/CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o
-MF
CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o.d
-o
CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o
-c dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp
+dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp: In member
function ‘virtual void
t_dlt_logging_multiple_files_append_reinit_normal_Test::TestBody()’:
+dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:106:13:
error: format not a string literal and no format arguments
[-Werror=format-security]
+ 106 | dlt_vlog(LOG_INFO, log1);
+ | ^~~~
+dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:110:13:
error: format not a string literal and no format arguments
[-Werror=format-security]
+ 110 | dlt_vlog(LOG_INFO, log2);
+ | ^~~~
+In file included from /usr/include/string.h:535,
+ from /usr/include/gtest/internal/gtest-port.h:264,
+ from /usr/include/gtest/inte
[oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.4 -> 7.0.8
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_7.0.4.bb => vboxguestdrivers_7.0.8.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.0.4.bb =>
vboxguestdrivers_7.0.8.bb} (97%)
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.4.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.4.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb
index 91f5ae0e0..ed3e429b3 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.4.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb
@@ -15,7 +15,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-SRC_URI[sha256sum] =
"58951f7d1bcda836c5e50ca0a6b13f0e61a07a904f476526a831df3d9bfe5b17"
+SRC_URI[sha256sum] =
"c305fbe480f507eac7c36893ead66dffaacda944f19c3813a4533e9c39bae237"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#102141):
https://lists.openembedded.org/g/openembedded-devel/message/102141
Mute This Topic: https://lists.openembedded.org/mt/98384492/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] boinc-client: Update boinc from 7.20.4 to 7.20.5
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../boinc/{boinc-client_7.20.4.bb => boinc-client_7.20.5.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-extended/boinc/{boinc-client_7.20.4.bb =>
boinc-client_7.20.5.bb} (98%)
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb
b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
similarity index 98%
rename from meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb
rename to meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
index a16117b99..4e35283dd 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
@@ -29,7 +29,7 @@ DEPENDS = "curl \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+3 wxwidgets
libnotify xcb-util libxscrnsaver', '', d)} \
nettle \
"
-SRCREV = "1eca0c7931d0409d65a1254dc5d5c46abe058daa"
+SRCREV = "4774e1cbe0ad13cb9a6f7fffbb626a417316f61d"
BRANCH = "client_release/7/7.20"
SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \
file://boinc-AM_CONDITIONAL.patch \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#100652):
https://lists.openembedded.org/g/openembedded-devel/message/100652
Mute This Topic: https://lists.openembedded.org/mt/96373516/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] boinc-client: Update boinc from 7.18.1 to 7.20.4
Drop patches now upstream, or deprecated due to gtk3 switch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../boinc/boinc-client/4563.patch | 36 ---
.../boinc/boinc-client/gtk-configure.patch| 28 ---
...lient_7.18.1.bb => boinc-client_7.20.4.bb} | 16 ++---
3 files changed, 3 insertions(+), 77 deletions(-)
delete mode 100644 meta-oe/recipes-extended/boinc/boinc-client/4563.patch
delete mode 100644
meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
rename meta-oe/recipes-extended/boinc/{boinc-client_7.18.1.bb =>
boinc-client_7.20.4.bb} (87%)
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/4563.patch
b/meta-oe/recipes-extended/boinc/boinc-client/4563.patch
deleted file mode 100644
index a18da4539..0
--- a/meta-oe/recipes-extended/boinc/boinc-client/4563.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 689dc20ede9768377d4032ff8c70b58269c8dc9c Mon Sep 17 00:00:00 2001
-From: Charlie Fenton
-Date: Mon, 18 Oct 2021 01:43:08 -0700
-Subject: [PATCH 01/10] Mac: update dependent libraries to latest:
- c-ares-1.17.2, curl-7.79.1, freetype-2.11.0, openssl-3.0.0 Previously updated
- to wxWidgets-3.1.5. FTGL version ftgl-2.1.3~rc5 is still the current
- version.
-
- lib/crypt.cpp | 7 +-
- 8 files changed, 199 insertions(+), 150 deletions(-)
-
-diff --git a/lib/crypt.cpp b/lib/crypt.cpp
-index 01249cfc340..9b1f69160b8 100644
a/lib/crypt.cpp
-+++ b/lib/crypt.cpp
-@@ -1,6 +1,6 @@
- // This file is part of BOINC.
- // http://boinc.berkeley.edu
--// Copyright (C) 2008 University of California
-+// Copyright (C) 2021 University of California
- //
- // BOINC is free software; you can redistribute it and/or modify it
- // under the terms of the GNU Lesser General Public License
-@@ -672,7 +672,10 @@ int check_validity_of_cert(
- }
- #ifdef HAVE_OPAQUE_RSA_DSA_DH
- RSA *rsa;
--rsa = EVP_PKEY_get0_RSA(pubKey);
-+// CAUTION: In OpenSSL 3.0.0, EVP_PKEY_get0_RSA() now returns a
-+// pointer of type "const struct rsa_st*" to an immutable value.
-+// Do not try to modify the contents of the returned struct.
-+rsa = (rsa_st*)EVP_PKEY_get0_RSA(pubKey);
- if (!RSA_blinding_on(rsa, c)) {
- #else
- if (!RSA_blinding_on(pubKey->pkey.rsa, c)) {
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
b/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
deleted file mode 100644
index 3b814e903..0
--- a/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d53e9617fb6446780478bb13907efd111f241cd1 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Thu, 3 Nov 2016 01:20:33 -0700
-Subject: [PATCH] Check for gtk2+ only when manager is enabled
-
-Signed-off-by: Khem Raj
-Upstream-Status: Pending
-
- configure.ac | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7beeb34ae2..35234c2762 100644
a/configure.ac
-+++ b/configure.ac
-@@ -1044,6 +1044,11 @@ else
- AM_CONDITIONAL([GUI_GTK], false)
- fi
-
-+dnl -- GTK+2.0-
-+if test "X${no_x}" != "Xyes"; then
-+ PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
-+fi
-+
- dnl -- libNotify --
- if test "${enable_manager}" = yes ; then
- PKG_CHECK_MODULES(LIBNOTIFY, [libnotify])
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
b/meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb
similarity index 87%
rename from meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
rename to meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb
index 8f85a508e..4cbbca23f 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb
@@ -26,15 +26,13 @@ DEPENDS = "curl \
sqlite3 \
virtual/egl \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libnotify', '',
d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify
xcb-util libxscrnsaver', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+3 wxwidgets
libnotify xcb-util libxscrnsaver', '', d)} \
nettle \
"
-SRCREV = "b49adfb118211e11c719766c0d71e7bdfe7f3363"
-BRANCH = "client_release/7/7.18"
+SRCREV = "1eca0c7931d0409d65a1254dc5d5c46abe058daa"
+BRANCH = "client_release/7/7.20"
SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \
file://boinc-AM_CONDITIONAL.patch \
- file://gtk-configure.patch \
- file://4563.patch \
file://0001-scripts-Do-not-check-for-files-on-build-host.patch \
"
@@ -61,14 +59,
[oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.2 -> 7.0.4
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_7.0.2.bb => vboxguestdrivers_7.0.4.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.0.2.bb =>
vboxguestdrivers_7.0.4.bb} (97%)
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.2.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.4.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.2.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.4.bb
index 49c2a3f2a..91f5ae0e0 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.2.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.4.bb
@@ -15,7 +15,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-SRC_URI[sha256sum] =
"612fd6fc417e0067653091a613e1d4fa084d3f42407dff5f991a0eb1e2ab26c8"
+SRC_URI[sha256sum] =
"58951f7d1bcda836c5e50ca0a6b13f0e61a07a904f476526a831df3d9bfe5b17"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#99699):
https://lists.openembedded.org/g/openembedded-devel/message/99699
Mute This Topic: https://lists.openembedded.org/mt/95214317/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vbxguestdrivers: upgrade 7.0.0 -> 7.0.2
From: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_7.0.0.bb => vboxguestdrivers_7.0.2.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.0.0.bb =>
vboxguestdrivers_7.0.2.bb} (97%)
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.0.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.2.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.0.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.2.bb
index 46484475e..49c2a3f2a 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.0.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.2.bb
@@ -15,7 +15,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-SRC_URI[sha256sum] =
"1e5b321bf20eec03154e2b3e16331f827a472d6e8e5b1e04c27041978975a97a"
+SRC_URI[sha256sum] =
"612fd6fc417e0067653091a613e1d4fa084d3f42407dff5f991a0eb1e2ab26c8"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#99333):
https://lists.openembedded.org/g/openembedded-devel/message/99333
Mute This Topic: https://lists.openembedded.org/mt/94625182/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.38 -> 7.0.0
Move license from GPL-2 to GPL-3
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...vboxguestdrivers_6.1.38.bb => vboxguestdrivers_7.0.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.38.bb =>
vboxguestdrivers_7.0.0.bb} (94%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.38.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.0.bb
similarity index 94%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.38.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.0.bb
index 235bc3061..46484475e 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.38.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.0.bb
@@ -1,7 +1,7 @@
SUMMARY = "VirtualBox Linux Guest Drivers"
SECTION = "core"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM =
"file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM =
"file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e"
DEPENDS = "virtual/kernel"
@@ -15,7 +15,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-SRC_URI[sha256sum] =
"56d997b58154df3974ce040a64970fa774add41e84b23dfb84b279b24545d7e4"
+SRC_URI[sha256sum] =
"1e5b321bf20eec03154e2b3e16331f827a472d6e8e5b1e04c27041978975a97a"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#99246):
https://lists.openembedded.org/g/openembedded-devel/message/99246
Mute This Topic: https://lists.openembedded.org/mt/94428022/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.36 -> 6.1.38
From: Gianfranco Costamagna
refresh patch for new upstream release
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_6.1.36.bb => vboxguestdrivers_6.1.38.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.36.bb =>
vboxguestdrivers_6.1.38.bb} (97%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.38.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.38.bb
index 7eb497ab1..235bc3061 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.38.bb
@@ -15,7 +15,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-SRC_URI[sha256sum] =
"e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047"
+SRC_URI[sha256sum] =
"56d997b58154df3974ce040a64970fa774add41e84b23dfb84b279b24545d7e4"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#98658):
https://lists.openembedded.org/g/openembedded-devel/message/98658
Mute This Topic: https://lists.openembedded.org/mt/93461622/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: fix build failure on 32 bit architectures
A variable has been renamed upstream from BUILD_TARGET_ARCH to
VBOX_KBUILD_TARGET_ARCH
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../vboxguestdrivers/vboxguestdrivers_6.1.36.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
index 70ddb436a..37dd0224d 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
@@ -21,8 +21,8 @@ SRC_URI[sha256sum] =
"e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf7
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
-export BUILD_TARGET_ARCH="${ARCH}"
-export BUILD_TARGET_ARCH:x86-64="amd64"
+export VBOX_KBUILD_TARGET_ARCH="${ARCH}"
+export VBOX_KBUILD_TARGET_ARCH:x86-64="amd64"
EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'
KBUILD_VERBOSE=1"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#97945):
https://lists.openembedded.org/g/openembedded-devel/message/97945
Mute This Topic: https://lists.openembedded.org/mt/92544071/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: refresh patch for new upstream release
Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna --- ...0001-utils-fix-build-against-5.15-libc-headers-headers.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch index 6c11f1d4c..203eec6ee 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch @@ -48,7 +48,7 @@ index c73093c..7bffde5 100644 # endif # elif defined(RT_OS_LINUX) && defined(IN_RING0) -# include "linux/version.h" --# if RTLNX_VER_MIN(5,15,0) +-# if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_MAJ_PREREQ(9,1) -# include -# else -# include -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#97922): https://lists.openembedded.org/g/openembedded-devel/message/97922 Mute This Topic: https://lists.openembedded.org/mt/92531728/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.34 -> 6.1.36
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_6.1.34.bb => vboxguestdrivers_6.1.36.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.34.bb =>
vboxguestdrivers_6.1.36.bb} (97%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.34.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.34.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
index 5e0accb23..70ddb436a 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.34.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
@@ -16,7 +16,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://0001-utils-fix-build-against-5.15-libc-headers-headers.patch \
"
-SRC_URI[sha256sum] =
"9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49"
+SRC_URI[sha256sum] =
"e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#97921):
https://lists.openembedded.org/g/openembedded-devel/message/97921
Mute This Topic: https://lists.openembedded.org/mt/92531487/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 1/2] sdbus-c++-libsystemd: Bump SRCREV to last commit of 250-stable branch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb
b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb
index 6bb5f7abb..d5c799aac 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb
@@ -10,7 +10,7 @@ inherit meson pkgconfig
DEPENDS += "gperf-native gettext-native util-linux libcap util-linux
python3-jinja2-native"
-SRCREV = "1b003bbc806198dbdd57b405d968f30565495e70"
+SRCREV = "73be9643910c3f7f3ff84765d63060846c110016"
SRCBRANCH = "v250-stable"
SRC_URI =
"git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}
\
file://static-libsystemd-pkgconfig.patch \
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#97197):
https://lists.openembedded.org/g/openembedded-devel/message/97197
Mute This Topic: https://lists.openembedded.org/mt/91208720/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 2/2] sdbus-c++: Bump version from 1.00 to 1.1.0
Cherry-pick upstream commit 7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44 to fix
build
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...7a6e06d2ec3abd3e2fd1101ab6aab386bc44.patch | 54 +++
.../run-ptest | 0
...{sdbus-c++_1.0.0.bb => sdbus-c++_1.1.0.bb} | 5 +-
3 files changed, 57 insertions(+), 2 deletions(-)
create mode 100644
meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.1.0/7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44.patch
rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-1.0.0 =>
sdbus-c++-1.1.0}/run-ptest (100%)
rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++_1.0.0.bb =>
sdbus-c++_1.1.0.bb} (89%)
diff --git
a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.1.0/7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44.patch
b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.1.0/7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44.patch
new file mode 100644
index 0..641935f68
--- /dev/null
+++
b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.1.0/7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44.patch
@@ -0,0 +1,54 @@
+commit 7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44
+Author: Stanislav Angelovic
+Date: Thu Jan 27 13:38:19 2022 +0100
+
+fix(tests): printer for std::chrono in googletest v1.11.0
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index fbf198c..ec42e55 100644
+--- a/tests/CMakeLists.txt
b/tests/CMakeLists.txt
+@@ -19,7 +19,7 @@ if (NOT TARGET GTest::gmock)
+ if (NOT TARGET GTest::gmock)
+ include(FetchContent)
+
+-message("Fetching googletest...")
++message("Fetching googletest v${GOOGLETEST_VERSION}...")
+ FetchContent_Declare(googletest
+ GIT_REPOSITORY ${GOOGLETEST_GIT_REPO}
+ GIT_TAGrelease-${GOOGLETEST_VERSION}
+diff --git a/tests/integrationtests/Defs.h b/tests/integrationtests/Defs.h
+index 2f129a4..2bfc7c9 100644
+--- a/tests/integrationtests/Defs.h
b/tests/integrationtests/Defs.h
+@@ -56,20 +56,18 @@ const bool DEFAULT_BLOCKING_VALUE{true};
+
+ constexpr const double DOUBLE_VALUE{3.24L};
+
+-/** Duration stream operator for human readable gtest value output.
+- *
+- * Note that the conversion to double is lossy if the input type has 64 or
more bits.
+- * This is ok for our integration tests because they don't have very
+- * accurate timing requirements.
+- *
+- * @return human readable duration in seconds
+- */
++}}
++
++namespace testing::internal {
++
++// Printer for std::chrono::duration types.
++// This is a workaround, since it's not a good thing to add this to std
namespace.
+ template< class Rep, class Period >
+-static std::ostream& operator<<(std::ostream& os, const
std::chrono::duration& d)
+-{
++void PrintTo(const ::std::chrono::duration& d, ::std::ostream*
os) {
+ auto seconds =
std::chrono::duration_cast>(d);
+-return os << seconds.count() << " s";
++*os << seconds.count() << "s";
++}
++
+ }
+-}}
+
+ #endif /* SDBUS_CPP_INTEGRATIONTESTS_DEFS_H_ */
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.0.0/run-ptest
b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.1.0/run-ptest
similarity index 100%
rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.0.0/run-ptest
rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.1.0/run-ptest
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb
b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.1.0.bb
similarity index 89%
rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb
rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.1.0.bb
index 39f0b4c56..3904ae5fc 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.1.0.bb
@@ -16,10 +16,11 @@ PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON
-DTESTS_INSTALL_PATH=${libdir}/${B
DEPENDS += "expat"
-SRCREV = "65782bbf435d91e5eb6af9ddab110df406a824a9"
+SRCREV = "bca8e81037766a0454740c40307eea32831c101f"
SRC_URI =
"git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master"
-SRC_URI += "file://run-ptest"
+SRC_URI += "file://run-ptest \
+file://7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44.patch "
EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \
-DBUILD_DOC=ON \
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#97198):
https://lists.openembedded.org/g/openembedded-devel/message/97198
Mute This Topic: https://lists.openembedded.org/mt/91208722/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] libmtp: Add doxygen-native dependency in case documentation build is enabled in PACKAGECONFIG. This fixes a FTBFS due to missing dependency.
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb
b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb
index b4cbb792c..3483db3c8 100644
--- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb
+++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb
@@ -30,7 +30,7 @@ EXTRA_OECONF += " \
"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)}"
-PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen"
+PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen,doxygen-native"
PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile"
PACKAGECONFIG[mtpz] = "--enable-mtpz,--disable-mtpz,libgcrypt"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#97193):
https://lists.openembedded.org/g/openembedded-devel/message/97193
Mute This Topic: https://lists.openembedded.org/mt/91206960/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.32 -> 6.1.34
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_6.1.32.bb => vboxguestdrivers_6.1.34.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.32.bb =>
vboxguestdrivers_6.1.34.bb} (97%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.32.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.34.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.32.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.34.bb
index a8cf32658..5e0accb23 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.32.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.34.bb
@@ -16,7 +16,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://0001-utils-fix-build-against-5.15-libc-headers-headers.patch \
"
-SRC_URI[sha256sum] =
"5d11384200b4e943ad0056d2cf75980ae4bee852c89650e2914e1b34eedc2d2c"
+SRC_URI[sha256sum] =
"9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96969):
https://lists.openembedded.org/g/openembedded-devel/message/96969
Mute This Topic: https://lists.openembedded.org/mt/90928343/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] websocketpp: Apply upstream proposed patch to fix a Scons 4.2.0+ build failure
See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003022
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../websocketpp/websocketpp-0.8.2/1024.patch | 506 ++
.../websocketpp/websocketpp_0.8.2.bb | 1 +
2 files changed, 507 insertions(+)
create mode 100644
meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch
new file mode 100644
index 0..7506d8bb2
--- /dev/null
+++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch
@@ -0,0 +1,506 @@
+From 05d1189ffce562560da90056d96fe2084d84654a Mon Sep 17 00:00:00 2001
+From: "Laszlo Boszormenyi (GCS)"
+Date: Mon, 14 Feb 2022 14:13:13 +0100
+Subject: [PATCH] SCons 4.2.0 no longer has env_cpp11.has_key() Check env_cpp11
+ as an array.
+
+This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003022
+---
+ examples/broadcast_server/SConscript| 2 +-
+ examples/debug_client/SConscript| 2 +-
+ examples/debug_server/SConscript| 2 +-
+ examples/dev/SConscript | 2 +-
+ examples/echo_client/SConscript | 2 +-
+ examples/echo_server/SConscript | 2 +-
+ examples/echo_server_both/SConscript| 2 +-
+ examples/echo_server_tls/SConscript | 2 +-
+ examples/external_io_service/SConscript | 2 +-
+ examples/iostream_server/SConscript | 2 +-
+ examples/print_client/SConscript| 2 +-
+ examples/print_client_tls/SConscript| 2 +-
+ examples/print_server/SConscript| 2 +-
+ examples/scratch_client/SConscript | 2 +-
+ examples/scratch_server/SConscript | 2 +-
+ examples/sip_client/SConscript | 2 +-
+ examples/subprotocol_server/SConscript | 2 +-
+ examples/telemetry_client/SConscript| 2 +-
+ examples/telemetry_server/SConscript| 2 +-
+ examples/testee_client/SConscript | 2 +-
+ examples/testee_server/SConscript | 2 +-
+ examples/utility_client/SConscript | 4 ++--
+ test/connection/SConscript | 2 +-
+ test/endpoint/SConscript| 2 +-
+ test/extension/SConscript | 2 +-
+ test/http/SConscript| 2 +-
+ test/logger/SConscript | 2 +-
+ test/message_buffer/SConscript | 2 +-
+ test/processors/SConscript | 2 +-
+ test/random/SConscript | 2 +-
+ test/roles/SConscript | 2 +-
+ test/transport/SConscript | 2 +-
+ test/transport/asio/SConscript | 2 +-
+ test/transport/iostream/SConscript | 2 +-
+ test/utility/SConscript | 2 +-
+ 35 files changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/examples/broadcast_server/SConscript
b/examples/broadcast_server/SConscript
+index 5786f570d..06c55c147 100644
+--- a/examples/broadcast_server/SConscript
b/examples/broadcast_server/SConscript
+@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
+ prgs = []
+
+ # if a C++11 environment is available build using that, otherwise use boost
+-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
++if 'WSPP_CPP11_ENABLED' in env_cpp11:
+ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] +
[polyfill_libs]
+prgs += env_cpp11.Program('broadcast_server', ["broadcast_server.cpp"],
LIBS = ALL_LIBS)
+ else:
+diff --git a/examples/debug_client/SConscript
b/examples/debug_client/SConscript
+index 781db8371..b92b14653 100644
+--- a/examples/debug_client/SConscript
b/examples/debug_client/SConscript
+@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone ()
+ prgs = []
+
+ # if a C++11 environment is available build using that, otherwise use boost
+-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
++if 'WSPP_CPP11_ENABLED' in env_cpp11:
+ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] +
[polyfill_libs] + [tls_libs]
+prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS =
ALL_LIBS)
+ else:
+diff --git a/examples/debug_server/SConscript
b/examples/debug_server/SConscript
+index 4d02261c6..7e24b07c8 100644
+--- a/examples/debug_server/SConscript
b/examples/debug_server/SConscript
+@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
+ prgs = []
+
+ # if a C++11 environment is available build using that, otherwise use boost
+-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
++if 'WSPP_CPP11_ENABLED' in env_cpp11:
+ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] +
[polyfill_libs]
+prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS =
ALL_LIBS)
+ else:
+diff --git a/examples/dev/SConscript b/examples/dev/SConscript
+index 34ddac2d5..31062fee9 100644
+--- a/examples/dev/SConscript
b/examples/dev/SConscript
+@@ -11,7 +11,7 @@ env_cpp11 = env_cpp11.Clone ()
+
+ prgs = []
+
+-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
++if 'WSPP_CPP11_ENABLED' in env_c
[oe] [meta-oe][PATCH] mosquitto: upgrade 2.0.12 -> 2.0.14
From: Gianfranco Costamagna
- Upgrade license hash due to whitespace changes
- refresh patch 1571.patch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../recipes-connectivity/mosquitto/files/1571.patch | 2 +-
.../mosquitto/{mosquitto_2.0.12.bb => mosquitto_2.0.14.bb} | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.12.bb =>
mosquitto_2.0.14.bb} (93%)
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
index 37560f30c..627638ec8 100644
--- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
+++ b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
@@ -19,4 +19,4 @@ Signed-off-by: Gianfranco Costamagna
+ LINK_FLAGS
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version"
)
- install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ install(TARGETS libmosquitto
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb
similarity index 93%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb
index 06d8211a2..739b7de62 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb
@@ -8,8 +8,8 @@ HOMEPAGE = "http://mosquitto.org/;
SECTION = "console/network"
LICENSE = "EPL-2.0 | EDL-1.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \
-file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \
-file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
+file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e \
+file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \
file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \
"
DEPENDS = "uthash cjson"
@@ -19,7 +19,7 @@ SRC_URI =
"http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
file://1571.patch \
"
-SRC_URI[sha256sum] =
"31cf0065cb431d6f4e57a5f4d56663e839c9d177362eff89582d7cfde191c933"
+SRC_URI[sha256sum] =
"d0dde8fdb12caf6e2426b4f28081919a2fce3448773bdb8af0d3cd5fe5776925"
inherit systemd update-rc.d useradd cmake pkgconfig
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#95267):
https://lists.openembedded.org/g/openembedded-devel/message/95267
Mute This Topic: https://lists.openembedded.org/mt/88999859/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] boinc-client:
* update to 7.18.1 and unblacklist
* Add openssl 3.0 build fix provided by upstream
* fix the sed command to work with the correct new libtool named file
* refresh patches
* drop patch part that is added in one patch and removed in the following one
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../packagegroups/packagegroup-meta-oe.bb | 1 +
.../boinc/boinc-client/4563.patch | 36 +++
.../boinc-client/boinc-AM_CONDITIONAL.patch | 11 +-
.../boinc/boinc-client/gtk-configure.patch| 10 +-
...ient_7.16.16.bb => boinc-client_7.18.1.bb} | 12 +++
5 files changed, 45 insertions(+), 25 deletions(-)
create mode 100644 meta-oe/recipes-extended/boinc/boinc-client/4563.patch
rename meta-oe/recipes-extended/boinc/{boinc-client_7.16.16.bb =>
boinc-client_7.18.1.bb} (92%)
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 3cf33c694..a600b24cc 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -333,6 +333,7 @@ RDEPENDS:packagegroup-meta-oe-devtools:remove:x86 = "ply"
RDEPENDS:packagegroup-meta-oe-extended ="\
bitwise \
+${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl",
"boinc-client", "", d)} \
brotli \
byacc \
cmatrix \
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/4563.patch
b/meta-oe/recipes-extended/boinc/boinc-client/4563.patch
new file mode 100644
index 0..a18da4539
--- /dev/null
+++ b/meta-oe/recipes-extended/boinc/boinc-client/4563.patch
@@ -0,0 +1,36 @@
+From 689dc20ede9768377d4032ff8c70b58269c8dc9c Mon Sep 17 00:00:00 2001
+From: Charlie Fenton
+Date: Mon, 18 Oct 2021 01:43:08 -0700
+Subject: [PATCH 01/10] Mac: update dependent libraries to latest:
+ c-ares-1.17.2, curl-7.79.1, freetype-2.11.0, openssl-3.0.0 Previously updated
+ to wxWidgets-3.1.5. FTGL version ftgl-2.1.3~rc5 is still the current
+ version.
+
+---
+ lib/crypt.cpp | 7 +-
+ 8 files changed, 199 insertions(+), 150 deletions(-)
+
+diff --git a/lib/crypt.cpp b/lib/crypt.cpp
+index 01249cfc340..9b1f69160b8 100644
+--- a/lib/crypt.cpp
b/lib/crypt.cpp
+@@ -1,6 +1,6 @@
+ // This file is part of BOINC.
+ // http://boinc.berkeley.edu
+-// Copyright (C) 2008 University of California
++// Copyright (C) 2021 University of California
+ //
+ // BOINC is free software; you can redistribute it and/or modify it
+ // under the terms of the GNU Lesser General Public License
+@@ -672,7 +672,10 @@ int check_validity_of_cert(
+ }
+ #ifdef HAVE_OPAQUE_RSA_DSA_DH
+ RSA *rsa;
+-rsa = EVP_PKEY_get0_RSA(pubKey);
++// CAUTION: In OpenSSL 3.0.0, EVP_PKEY_get0_RSA() now returns a
++// pointer of type "const struct rsa_st*" to an immutable value.
++// Do not try to modify the contents of the returned struct.
++rsa = (rsa_st*)EVP_PKEY_get0_RSA(pubKey);
+ if (!RSA_blinding_on(rsa, c)) {
+ #else
+ if (!RSA_blinding_on(pubKey->pkey.rsa, c)) {
diff --git
a/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
index 7c3b0325d..0431f523e 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
+++ b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
@@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
index d81d795de4..7beeb34ae2 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -63,6 +63,7 @@ m4_pattern_allow([AC_PROG_OBJCXX])
+@@ -59,6 +59,7 @@ m4_pattern_allow([AC_PROG_OBJCXX])
m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX],)
dnl --
AC_PROG_CPP
@@ -22,12 +22,3 @@ index d81d795de4..7beeb34ae2 100644
AC_PROG_MAKE_SET
SAH_LINKS
AC_LANG_PUSH(C)
-@@ -1068,6 +1069,8 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test
"x${enable_server}" = xyes || test "x${
- AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
- AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f
./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
-
-+PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
-+
- dnl ==
- dnl some more vodoo required for building portable client-binary (client,
clientgui)
- dnl ==
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
b/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
index e060b1a40..3b814e903 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
+++ b/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
@@ -14,7 +14,7 @@ diff --git a/configure.ac b/c
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.30 -> 6.1.32
From: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../{vboxguestdrivers_6.1.30.bb => vboxguestdrivers_6.1.32.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.30.bb =>
vboxguestdrivers_6.1.32.bb} (97%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.32.bb
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.32.bb
index 099d82ae4..4fc4a2c77 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.32.bb
@@ -16,7 +16,7 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://0001-utils-fix-build-against-5.15-libc-headers-headers.patch \
"
-SRC_URI[sha256sum] =
"3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef"
+SRC_URI[sha256sum] =
"5d11384200b4e943ad0056d2cf75980ae4bee852c89650e2914e1b34eedc2d2c"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#95031):
https://lists.openembedded.org/g/openembedded-devel/message/95031
Mute This Topic: https://lists.openembedded.org/mt/88644160/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: drop md5sum from SRC_URI.
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb | 1 -
1 file changed, 1 deletion(-)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
index 9bbc9b427..099d82ae4 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
@@ -16,7 +16,6 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://0001-utils-fix-build-against-5.15-libc-headers-headers.patch \
"
-SRC_URI[md5sum] = "2e408e56e92cf778eb8722dbbcb5c357"
SRC_URI[sha256sum] =
"3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef"
S ?= "${WORKDIR}/vbox_module"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#94164):
https://lists.openembedded.org/g/openembedded-devel/message/94164
Mute This Topic: https://lists.openembedded.org/mt/87434892/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.28 -> 6.1.30
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...{vboxguestdrivers_6.1.28.bb => vboxguestdrivers_6.1.30.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.28.bb =>
vboxguestdrivers_6.1.30.bb} (95%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
similarity index 95%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
index 014fe30bb..9bbc9b427 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb
@@ -16,8 +16,8 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://0001-utils-fix-build-against-5.15-libc-headers-headers.patch \
"
-SRC_URI[md5sum] = "c6efae8dc115b90c6124e13126794c4f"
-SRC_URI[sha256sum] =
"8d34993d8e9c0cf35e7bd44dd26c8c757f17a3b7d5a64052f945d00fd798ebfe"
+SRC_URI[md5sum] = "2e408e56e92cf778eb8722dbbcb5c357"
+SRC_URI[sha256sum] =
"3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef"
S ?= "${WORKDIR}/vbox_module"
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#94162):
https://lists.openembedded.org/g/openembedded-devel/message/94162
Mute This Topic: https://lists.openembedded.org/mt/87424452/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] boinc-client: unblacklist and update from 7.16.16 to 7.18.1. Add patch from upstream to fix openssl 3.0 build failure.
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../boinc/boinc-client/openssl-3.0.patch | 25 +++
...ient_7.16.16.bb => boinc-client_7.18.1.bb} | 6 ++---
2 files changed, 28 insertions(+), 3 deletions(-)
create mode 100644
meta-oe/recipes-extended/boinc/boinc-client/openssl-3.0.patch
rename meta-oe/recipes-extended/boinc/{boinc-client_7.16.16.bb =>
boinc-client_7.18.1.bb} (95%)
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/openssl-3.0.patch
b/meta-oe/recipes-extended/boinc/boinc-client/openssl-3.0.patch
new file mode 100644
index 0..9dcf4bd36
--- /dev/null
+++ b/meta-oe/recipes-extended/boinc/boinc-client/openssl-3.0.patch
@@ -0,0 +1,25 @@
+commit 689dc20ede9768377d4032ff8c70b58269c8dc9c
+Author: Charlie Fenton
+Date: Mon Oct 18 01:43:08 2021 -0700
+
+Mac: update dependent libraries to latest: c-ares-1.17.2, curl-7.79.1,
freetype-2.11.0, openssl-3.0.0
+Previously updated to wxWidgets-3.1.5. FTGL version ftgl-2.1.3~rc5 is
still the current version.
+
+Upstream-Status: Backport
[https://github.com/BOINC/boinc/commit/689dc20ede9768377d4032ff8c70b58269c8dc9c]
+
+diff --git a/lib/crypt.cpp b/lib/crypt.cpp
+index 01249cfc34..9b1f69160b 100644
+--- a/lib/crypt.cpp
b/lib/crypt.cpp
+@@ -672,7 +672,10 @@ int check_validity_of_cert(
+ }
+ #ifdef HAVE_OPAQUE_RSA_DSA_DH
+ RSA *rsa;
+-rsa = EVP_PKEY_get0_RSA(pubKey);
++// CAUTION: In OpenSSL 3.0.0, EVP_PKEY_get0_RSA() now returns a
++// pointer of type "const struct rsa_st*" to an immutable value.
++// Do not try to modify the contents of the returned struct.
++rsa = (rsa_st*)EVP_PKEY_get0_RSA(pubKey);
+ if (!RSA_blinding_on(rsa, c)) {
+ #else
+ if (!RSA_blinding_on(pubKey->pkey.rsa, c)) {
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb
b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
similarity index 95%
rename from meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb
rename to meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
index 79aaad9d8..dcbe220fa 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
@@ -16,7 +16,6 @@ global warming, discover sources of gravitational waves, and
many other types \
of scientific and mathematical research."
HOMEPAGE = "http://boinc.berkeley.edu/;
-PNBLACKLIST[boinc-client] ?= "Needs porting to openssl 3.x"
LICENSE = "LGPLv2+ & GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6"
@@ -30,11 +29,12 @@ DEPENDS = "curl \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify
xcb-util libxscrnsaver', '', d)} \
nettle \
"
-SRCREV = "df0239e6f074207798a8ecf1358a74545dda9132"
-BRANCH = "client_release/7/7.16"
+SRCREV = "b49adfb118211e11c719766c0d71e7bdfe7f3363"
+BRANCH = "client_release/7/7.18"
SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \
file://boinc-AM_CONDITIONAL.patch \
file://gtk-configure.patch \
+ file://openssl-3.0.patch \
"
inherit gettext autotools pkgconfig features_check systemd
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#93576):
https://lists.openembedded.org/g/openembedded-devel/message/93576
Mute This Topic: https://lists.openembedded.org/mt/86586256/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.26 -> 6.1.28
Hello Bruce
you are right, the problem is not in the kernel module but into the vboxsf
binary.
I tweak our custom Makefile to accept one additional flag, and submitted a
newer and better version
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils
+++
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils
@@ -13,7 +13,7 @@
INCLUDES = -I. -I../vboxsf -I../vboxsf/include
MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
-DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0
-CFLAGS = ${INCLUDES} ${MOD_DEFS}
+CFLAGS = ${INCLUDES} ${MOD_DEFS} ${EXTRA_CFLAGS}
LDFLAGS =
SRCS = mount.vboxsf.c \
diff --git a/meta-oe/recipes-support/vboxguestdrivers/
vboxguestdrivers_6.1.28.bb b/meta-oe/recipes-support/vboxguestdrivers/
vboxguestdrivers_6.1.28.bb
index c7e73b222..0265e38f5 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
@@ -54,7 +54,7 @@ do_configure:prepend() {
# compile and install mount utility
do_compile() {
oe_runmake all
-oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
+oe_runmake 'LD=${CC}'
'EXTRA_CFLAGS=-I${STAGING_KERNEL_BUILDDIR}/include/' 'LDFLAGS=${LDFLAGS}'
-C ${S}/utils
if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then
echo "ERROR: One of vbox*.ko modules wasn't built"
exit 1
thanks
Gianfranco
Il giorno ven 22 ott 2021 alle ore 18:58 Bruce Ashfield <
bruce.ashfi...@gmail.com> ha scritto:
> onto the
>
> On Fri, Oct 22, 2021 at 5:50 AM Gianfranco Costamagna
> wrote:
> >
> > Hello,
> > FYI I traced down the upstream change that introduced this regression:
> >
> https://www.virtualbox.org/changeset?reponame=vbox=91232%40trunk%2Finclude%2Fiprt%2Fstdarg.h=82968%40trunk%2Finclude%2Fiprt%2Fstdarg.h
> >
> > --- a/vboxsf/include/iprt/stdarg.h
> > +++ b/vboxsf/include/iprt/stdarg.h
> > @@ -43,13 +43,6 @@
> > # if __GNUC__ >= 4 /* System headers refers to __builtin_stdarg_start.
> */
> > # define __builtin_stdarg_start __builtin_va_start
> > # endif
> > -# elif defined(RT_OS_LINUX) && defined(IN_RING0)
> > -# include "linux/version.h"
> > -# if RTLNX_VER_MIN(5,15,0)
> > -# include
> > -# else
> > -# include
> > -# endif
> > # else
> > # include
> > # endif
> >
> > I did grep into the kernel source code and that files is already
> included in lots of places and drivers.
> >
> > I honestly think that file should be ship into STAGING_KERNEL_DIR
> instead of STAGING_KERNEL_BUILDDIR
> > because other binaries will need it probably in the future.
> > But this change needs to be done in poky, not meta-openembedded.
>
> The STAGING_KERNEL_DIR is only the source (up to the build), it
> contains no build artifacts .. we probably won't start copying
> generated files to that directory (unless for whatever reason it
> became universally common, with no other approach). There's been races
> doing that, there's the breakage of the source/build split, dirty
> tree, etc, that all happen when that staged source directory gets
> written to. Other parts of the system (module*, etc) all
> manipulate/read the directory there.
>
> If something needs generated / output files, it is the design to look
> in the staging_kerne_buildir (or $B if within the kernel recipe
> context), or again, if all of our out of tree builds started needing
> that, the module.bbclass might be able to arrange something to get the
> search paths correctly modified.
>
> >
> > For now I'm submitting you a patch that does this:
> > +# hack to include in the source directory the utsrelease.h file,
> making the build succeed.
> > +# this might be removed in future releases if the kernel starts
> shipping this generated file into KERNEL_DIR and not KERNEL_BUILDDIR
> > +ln -snf ${STAGING_KERNEL_BUILDDIR}/include/* ${S}/vboxsf/include
> >
>
> Why not just get the STAGING_KERNEL_DIR into the search path (via
> CFLAGS or whatever) ? It may take a patch to the package's source, but
> that's preferable to breaking the split between staged source and
> staged build artifacts.
>
> Bruce
>
> > fixing the build.
> > (please let me know if you can forward the request to poky/kernel devs)
> >
> > Gianfranco
> >
> > Il giorno gio 21 ott 2021 alle ore 00:28 Khem Raj
> ha scritto:
> >>
> >> On Wed, Oct 20, 2021 at 2:26 PM Gianfranco Costamagna
> >> wrote:
> >> >
> >> > Hello,
> >> > any idea is welcome, I can't yet figure out why this file is not in
>
[oe] [meta-oe][PATCH 1/2] vboxguestdrivers: upgrade 6.1.26 -> 6.1.28
drop two upstream cherry-pick patches:
r89690-5.14-fixes.patch
r90497-regops-5.14-fix.patch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../vboxguestdrivers/r89690-5.14-fixes.patch | 442 --
.../r90497-regops-5.14-fix.patch | 118 -
...s_6.1.26.bb => vboxguestdrivers_6.1.28.bb} | 6 +-
3 files changed, 2 insertions(+), 564 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r90497-regops-5.14-fix.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.26.bb =>
vboxguestdrivers_6.1.28.bb} (92%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
deleted file mode 100644
index 951bd5013..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
+++ /dev/null
@@ -1,442 +0,0 @@
-Subject: Fix build errors with linux 5.14
-
-Upstream-Status: backport
-
-svn-id: r89690
-
-Signed-off-by: Bruce Ashfield
-
-Index: a/src/VBox/Additions/linux/drm/vbox_drv.h
-===
a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 89690)
-+++ a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 90498)
-@@ -227,6 +227,15 @@
- sizeof(HGSMIHOSTFLAGS))
- #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE
-
-+/** Field @pdev of struct drm_device was removed in 5.14. This macro
-+ * transparently handles this change. Input argument is a pointer
-+ * to struct drm_device. */
-+#if RTLNX_VER_MIN(5,14,0)
-+# define VBOX_DRM_TO_PCI_DEV(_dev) to_pci_dev(_dev->dev)
-+#else
-+# define VBOX_DRM_TO_PCI_DEV(_dev) _dev->pdev
-+#endif
-+
- /** How frequently we refresh if the guest is not providing dirty rectangles.
*/
- #define VBOX_REFRESH_PERIOD (HZ / 2)
-
-Index: a/src/VBox/Additions/linux/drm/vbox_main.c
-===
a/src/VBox/Additions/linux/drm/vbox_main.c (revision 89690)
-+++ a/src/VBox/Additions/linux/drm/vbox_main.c (revision 90498)
-@@ -290,7 +290,7 @@
- /* Take a command buffer for each screen from the end of usable VRAM. */
- vbox->available_vram_size -= vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE;
-
-- vbox->vbva_buffers = pci_iomap_range(vbox->dev->pdev, 0,
-+ vbox->vbva_buffers = pci_iomap_range(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0,
-vbox->available_vram_size,
-vbox->num_crtcs *
-VBVA_MIN_BUFFER_SIZE);
-@@ -311,7 +311,7 @@
- return 0;
-
- err_pci_iounmap:
-- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers);
- return ret;
- }
-
-@@ -318,7 +318,7 @@
- static void vbox_accel_fini(struct vbox_private *vbox)
- {
- vbox_disable_accel(vbox);
-- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers);
- }
-
- /** Do we support the 4.3 plus mode hint reporting interface? */
-@@ -393,7 +393,7 @@
-
- /* Map guest-heap at end of vram */
- vbox->guest_heap =
-- pci_iomap_range(vbox->dev->pdev, 0, GUEST_HEAP_OFFSET(vbox),
-+ pci_iomap_range(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0,
GUEST_HEAP_OFFSET(vbox),
- GUEST_HEAP_SIZE);
- if (!vbox->guest_heap)
- return -ENOMEM;
-@@ -442,7 +442,7 @@
- err_destroy_guest_pool:
- gen_pool_destroy(vbox->guest_pool);
- err_unmap_guest_heap:
-- pci_iounmap(vbox->dev->pdev, vbox->guest_heap);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->guest_heap);
- return ret;
- }
-
-@@ -452,7 +452,7 @@
- cancel_delayed_work(>refresh_work);
- vbox_accel_fini(vbox);
- gen_pool_destroy(vbox->guest_pool);
-- pci_iounmap(vbox->dev->pdev, vbox->guest_heap);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->guest_heap);
- }
-
- #if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MIN(8,3)
-@@ -567,12 +567,16 @@
-
- size = roundup(size, PAGE_SIZE);
- if (size == 0)
-+ {
-+ DRM_ERROR("bad size\n");
- return -EINVAL;
-+ }
-
- ret = vbox_bo_create(dev, size, 0, 0, );
- if (ret) {
- if (ret != -ERESTARTSYS)
- DRM_ERROR("failed to allocate GEM object\n");
-+ DRM_ERROR("failed to allocate GEM (%d)\n", ret);
- return ret;
- }
-
-@@ -628,6 +632,21 @@
- {
-
[oe] [meta-oe][PATCH 2/2] vboxguestdrivers: Fix build failure due to the last update.
the utsrelease.h is not included in the STAGING_KERNEL_DIR, but in
STAGING_KERNEL_BUILDDIR
So, adding a hacky symlink into the source directory fixes the issue for now.
This can be re-evaluated if poky maintainers start shipping such file into
another directory or patch module*.bbclass to take account
of this additional dir into *FLAGS
https://errors.yoctoproject.org/Errors/Details/613563/
make: Entering directory
'TOPDIR/build/tmp/work/qemux86-yoe-linux/vboxguestdrivers/6.1.28-r0/vboxguestdrivers-6.1.28/utils'
i686-yoe-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse
-fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security
--sysroot=TOPDIR/build/tmp/work/qemux86-yoe-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot
-I. -I../vboxsf -I../vboxsf/include -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0
-DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0 -c -o
mount.vboxsf.o mount.vboxsf.c
i686-yoe-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse
-fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security
--sysroot=TOPDIR/build/tmp/work/qemux86-yoe-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot
-I. -I../vboxsf -I../vboxsf/include -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0
-DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0 -c -o vbsfmount.o
vbsfmount.c
In file included from ../vboxsf/include/iprt/stdarg.h:47,
from ../vboxsf/include/iprt/types.h:34,
from ../vboxsf/include/iprt/string.h:33,
from mount.vboxsf.c:53:
../vboxsf/include/iprt/linux/version.h:40:11: fatal error:
generated/utsrelease.h: No such file or directory
40 | # include
| ^~~~
compilation terminated.
Makefile:39: recipe for target 'mount.vboxsf.o' failed
---
.../vboxguestdrivers/vboxguestdrivers/Makefile.utils| 2 +-
.../recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils
index 495601f08..5982e2d08 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils
@@ -13,7 +13,7 @@
INCLUDES = -I. -I../vboxsf -I../vboxsf/include
MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
-DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0
-CFLAGS = ${INCLUDES} ${MOD_DEFS}
+CFLAGS = ${INCLUDES} ${MOD_DEFS} ${EXTRA_CFLAGS}
LDFLAGS =
SRCS = mount.vboxsf.c \
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
index c7e73b222..0265e38f5 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
@@ -54,7 +54,7 @@ do_configure:prepend() {
# compile and install mount utility
do_compile() {
oe_runmake all
-oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
+oe_runmake 'LD=${CC}' 'EXTRA_CFLAGS=-I${STAGING_KERNEL_BUILDDIR}/include/'
'LDFLAGS=${LDFLAGS}' -C ${S}/utils
if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then
echo "ERROR: One of vbox*.ko modules wasn't built"
exit 1
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#93540):
https://lists.openembedded.org/g/openembedded-devel/message/93540
Mute This Topic: https://lists.openembedded.org/mt/86522834/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 2/2] vboxguestdrivers: Fix build failure due to the last update.
the utsrelease.h is not included in the STAGING_KERNEL_DIR, but in
STAGING_KERNEL_BUILDDIR
So, adding a hacky symlink into the source directory fixes the issue for now.
This can be re-evaluated if poky maintainers start shipping such file into
another directory or patch module*.bbclass to take account
of this additional dir into *FLAGS
https://errors.yoctoproject.org/Errors/Details/613563/
make: Entering directory
'TOPDIR/build/tmp/work/qemux86-yoe-linux/vboxguestdrivers/6.1.28-r0/vboxguestdrivers-6.1.28/utils'
i686-yoe-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse
-fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security
--sysroot=TOPDIR/build/tmp/work/qemux86-yoe-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot
-I. -I../vboxsf -I../vboxsf/include -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0
-DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0 -c -o
mount.vboxsf.o mount.vboxsf.c
i686-yoe-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse
-fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security
--sysroot=TOPDIR/build/tmp/work/qemux86-yoe-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot
-I. -I../vboxsf -I../vboxsf/include -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0
-DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0 -c -o vbsfmount.o
vbsfmount.c
In file included from ../vboxsf/include/iprt/stdarg.h:47,
from ../vboxsf/include/iprt/types.h:34,
from ../vboxsf/include/iprt/string.h:33,
from mount.vboxsf.c:53:
../vboxsf/include/iprt/linux/version.h:40:11: fatal error:
generated/utsrelease.h: No such file or directory
40 | # include
| ^~~~
compilation terminated.
Makefile:39: recipe for target 'mount.vboxsf.o' failed
---
.../vboxguestdrivers/vboxguestdrivers_6.1.28.bb | 4
1 file changed, 4 insertions(+)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
index c7e73b222..b76204ae2 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.28.bb
@@ -49,6 +49,10 @@ do_configure:prepend() {
#
vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108:
*** The kernel build folder path must end in /build, or the variable
KERN_VER must be set. Stop.
mkdir -p ${WORKDIR}/${KERNEL_VERSION}
ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build
+
+# hack to include in the source directory the utsrelease.h file, making
the build succeed.
+# this might be removed in future releases if the kernel starts shipping
this generated file into ${STAGING_KERNEL_DIR} and not
${STAGING_KERNEL_BUILDDIR}
+ln -snf ${STAGING_KERNEL_BUILDDIR}/include/* ${S}/vboxsf/include
}
# compile and install mount utility
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#93533):
https://lists.openembedded.org/g/openembedded-devel/message/93533
Mute This Topic: https://lists.openembedded.org/mt/86510108/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 1/2] vboxguestdrivers: upgrade 6.1.26 -> 6.1.28
drop two upstream cherry-pick patches:
r89690-5.14-fixes.patch
r90497-regops-5.14-fix.patch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../vboxguestdrivers/r89690-5.14-fixes.patch | 442 --
.../r90497-regops-5.14-fix.patch | 118 -
...s_6.1.26.bb => vboxguestdrivers_6.1.28.bb} | 6 +-
3 files changed, 2 insertions(+), 564 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r90497-regops-5.14-fix.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.26.bb =>
vboxguestdrivers_6.1.28.bb} (92%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
deleted file mode 100644
index 951bd5013..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
+++ /dev/null
@@ -1,442 +0,0 @@
-Subject: Fix build errors with linux 5.14
-
-Upstream-Status: backport
-
-svn-id: r89690
-
-Signed-off-by: Bruce Ashfield
-
-Index: a/src/VBox/Additions/linux/drm/vbox_drv.h
-===
a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 89690)
-+++ a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 90498)
-@@ -227,6 +227,15 @@
- sizeof(HGSMIHOSTFLAGS))
- #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE
-
-+/** Field @pdev of struct drm_device was removed in 5.14. This macro
-+ * transparently handles this change. Input argument is a pointer
-+ * to struct drm_device. */
-+#if RTLNX_VER_MIN(5,14,0)
-+# define VBOX_DRM_TO_PCI_DEV(_dev) to_pci_dev(_dev->dev)
-+#else
-+# define VBOX_DRM_TO_PCI_DEV(_dev) _dev->pdev
-+#endif
-+
- /** How frequently we refresh if the guest is not providing dirty rectangles.
*/
- #define VBOX_REFRESH_PERIOD (HZ / 2)
-
-Index: a/src/VBox/Additions/linux/drm/vbox_main.c
-===
a/src/VBox/Additions/linux/drm/vbox_main.c (revision 89690)
-+++ a/src/VBox/Additions/linux/drm/vbox_main.c (revision 90498)
-@@ -290,7 +290,7 @@
- /* Take a command buffer for each screen from the end of usable VRAM. */
- vbox->available_vram_size -= vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE;
-
-- vbox->vbva_buffers = pci_iomap_range(vbox->dev->pdev, 0,
-+ vbox->vbva_buffers = pci_iomap_range(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0,
-vbox->available_vram_size,
-vbox->num_crtcs *
-VBVA_MIN_BUFFER_SIZE);
-@@ -311,7 +311,7 @@
- return 0;
-
- err_pci_iounmap:
-- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers);
- return ret;
- }
-
-@@ -318,7 +318,7 @@
- static void vbox_accel_fini(struct vbox_private *vbox)
- {
- vbox_disable_accel(vbox);
-- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers);
- }
-
- /** Do we support the 4.3 plus mode hint reporting interface? */
-@@ -393,7 +393,7 @@
-
- /* Map guest-heap at end of vram */
- vbox->guest_heap =
-- pci_iomap_range(vbox->dev->pdev, 0, GUEST_HEAP_OFFSET(vbox),
-+ pci_iomap_range(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0,
GUEST_HEAP_OFFSET(vbox),
- GUEST_HEAP_SIZE);
- if (!vbox->guest_heap)
- return -ENOMEM;
-@@ -442,7 +442,7 @@
- err_destroy_guest_pool:
- gen_pool_destroy(vbox->guest_pool);
- err_unmap_guest_heap:
-- pci_iounmap(vbox->dev->pdev, vbox->guest_heap);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->guest_heap);
- return ret;
- }
-
-@@ -452,7 +452,7 @@
- cancel_delayed_work(>refresh_work);
- vbox_accel_fini(vbox);
- gen_pool_destroy(vbox->guest_pool);
-- pci_iounmap(vbox->dev->pdev, vbox->guest_heap);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->guest_heap);
- }
-
- #if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MIN(8,3)
-@@ -567,12 +567,16 @@
-
- size = roundup(size, PAGE_SIZE);
- if (size == 0)
-+ {
-+ DRM_ERROR("bad size\n");
- return -EINVAL;
-+ }
-
- ret = vbox_bo_create(dev, size, 0, 0, );
- if (ret) {
- if (ret != -ERESTARTSYS)
- DRM_ERROR("failed to allocate GEM object\n");
-+ DRM_ERROR("failed to allocate GEM (%d)\n", ret);
- return ret;
- }
-
-@@ -628,6 +632,21 @@
- {
-
Re: [oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.26 -> 6.1.28
Hello,
FYI I traced down the upstream change that introduced this regression:
https://www.virtualbox.org/changeset?reponame=vbox=91232%40trunk%2Finclude%2Fiprt%2Fstdarg.h=82968%40trunk%2Finclude%2Fiprt%2Fstdarg.h
--- a/vboxsf/include/iprt/stdarg.h
+++ b/vboxsf/include/iprt/stdarg.h
@@ -43,13 +43,6 @@
# if __GNUC__ >= 4 /* System headers refers to __builtin_stdarg_start. */
# define __builtin_stdarg_start __builtin_va_start
# endif
-# elif defined(RT_OS_LINUX) && defined(IN_RING0)
-# include "linux/version.h"
-# if RTLNX_VER_MIN(5,15,0)
-# include
-# else
-# include
-# endif
# else
# include
# endif
I did grep into the kernel source code and that files is already included
in lots of places and drivers.
I honestly think that file should be ship into STAGING_KERNEL_DIR instead
of STAGING_KERNEL_BUILDDIR
because other binaries will need it probably in the future.
But this change needs to be done in poky, not meta-openembedded.
For now I'm submitting you a patch that does this:
+# hack to include in the source directory the utsrelease.h file,
making the build succeed.
+# this might be removed in future releases if the kernel starts
shipping this generated file into KERNEL_DIR and not KERNEL_BUILDDIR
+ln -snf ${STAGING_KERNEL_BUILDDIR}/include/* ${S}/vboxsf/include
fixing the build.
(please let me know if you can forward the request to poky/kernel devs)
Gianfranco
Il giorno gio 21 ott 2021 alle ore 00:28 Khem Raj ha
scritto:
> On Wed, Oct 20, 2021 at 2:26 PM Gianfranco Costamagna
> wrote:
> >
> > Hello,
> > any idea is welcome, I can't yet figure out why this file is not in
> recipes-sysroot or whatever.
> > Do you have any help? Of course copy-pasting the "generated" directory
> from the kernel build artifacts works,
> > but I think there should a better way than patching the kernel recipe...
> >
>
> this file should be in kernel-build-artifacts, so I wonder why this is
> not available. Bruce any ideas ?
>
> > Gianfranco
> >
> > Il giorno mer 20 ott 2021 alle ore 21:32 Khem Raj
> ha scritto:
> >>
> >> seeing this failure on qemux86
> >>
> >> https://errors.yoctoproject.org/Errors/Details/613563/
> >>
> >> On Wed, Oct 20, 2021 at 3:56 AM Gianfranco
> >> wrote:
> >> >
> >> > drop two upstream cherry-pick patches:
> >> > r89690-5.14-fixes.patch
> >> > r90497-regops-5.14-fix.patch
> >> >
> >> > Signed-off-by: Gianfranco Costamagna
> >> > Signed-off-by: Gianfranco Costamagna
> >> > ---
> >> > .../vboxguestdrivers/r89690-5.14-fixes.patch | 442
> --
> >> > .../r90497-regops-5.14-fix.patch | 118 -
> >> > ...s_6.1.26.bb => vboxguestdrivers_6.1.28.bb} | 6 +-
> >> > 3 files changed, 2 insertions(+), 564 deletions(-)
> >> > delete mode 100644
> meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
> >> > delete mode 100644
> meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r90497-regops-5.14-fix.patch
> >> > rename meta-oe/recipes-support/vboxguestdrivers/{
> vboxguestdrivers_6.1.26.bb => vboxguestdrivers_6.1.28.bb} (92%)
> >> >
> >> > diff --git
> a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
> b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
> >> > deleted file mode 100644
> >> > index 951bd5013..0
> >> > ---
> a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
> >> > +++ /dev/null
> >> > @@ -1,442 +0,0 @@
> >> > -Subject: Fix build errors with linux 5.14
> >> > -
> >> > -Upstream-Status: backport
> >> > -
> >> > -svn-id: r89690
> >> > -
> >> > -Signed-off-by: Bruce Ashfield
> >> > -
> >> > -Index: a/src/VBox/Additions/linux/drm/vbox_drv.h
> >> > -===
> >> > a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 89690)
> >> > -+++ a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 90498)
> >> > -@@ -227,6 +227,15 @@
> >> > - sizeof(HGSMIHOSTFLAGS))
> >> > - #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE
> >> > -
> >> > -+/** Field @pdev of struct drm_device was removed in 5.14. This macro
> >> > -+ * transparently handles this change. Input argument is a pointer
> >> > -+ * to struct drm_device
Re: [oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.26 -> 6.1.28
Hello,
any idea is welcome, I can't yet figure out why this file is not in
recipes-sysroot or whatever.
Do you have any help? Of course copy-pasting the "generated" directory from
the kernel build artifacts works,
but I think there should a better way than patching the kernel recipe...
Gianfranco
Il giorno mer 20 ott 2021 alle ore 21:32 Khem Raj ha
scritto:
> seeing this failure on qemux86
>
> https://errors.yoctoproject.org/Errors/Details/613563/
>
> On Wed, Oct 20, 2021 at 3:56 AM Gianfranco
> wrote:
> >
> > drop two upstream cherry-pick patches:
> > r89690-5.14-fixes.patch
> > r90497-regops-5.14-fix.patch
> >
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../vboxguestdrivers/r89690-5.14-fixes.patch | 442 --
> > .../r90497-regops-5.14-fix.patch | 118 -
> > ...s_6.1.26.bb => vboxguestdrivers_6.1.28.bb} | 6 +-
> > 3 files changed, 2 insertions(+), 564 deletions(-)
> > delete mode 100644
> meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
> > delete mode 100644
> meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r90497-regops-5.14-fix.patch
> > rename meta-oe/recipes-support/vboxguestdrivers/{
> vboxguestdrivers_6.1.26.bb => vboxguestdrivers_6.1.28.bb} (92%)
> >
> > diff --git
> a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
> b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
> > deleted file mode 100644
> > index 951bd5013..0
> > ---
> a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
> > +++ /dev/null
> > @@ -1,442 +0,0 @@
> > -Subject: Fix build errors with linux 5.14
> > -
> > -Upstream-Status: backport
> > -
> > -svn-id: r89690
> > -
> > -Signed-off-by: Bruce Ashfield
> > -
> > -Index: a/src/VBox/Additions/linux/drm/vbox_drv.h
> > -===
> > a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 89690)
> > -+++ a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 90498)
> > -@@ -227,6 +227,15 @@
> > - sizeof(HGSMIHOSTFLAGS))
> > - #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE
> > -
> > -+/** Field @pdev of struct drm_device was removed in 5.14. This macro
> > -+ * transparently handles this change. Input argument is a pointer
> > -+ * to struct drm_device. */
> > -+#if RTLNX_VER_MIN(5,14,0)
> > -+# define VBOX_DRM_TO_PCI_DEV(_dev) to_pci_dev(_dev->dev)
> > -+#else
> > -+# define VBOX_DRM_TO_PCI_DEV(_dev) _dev->pdev
> > -+#endif
> > -+
> > - /** How frequently we refresh if the guest is not providing dirty
> rectangles. */
> > - #define VBOX_REFRESH_PERIOD (HZ / 2)
> > -
> > -Index: a/src/VBox/Additions/linux/drm/vbox_main.c
> > -===
> > a/src/VBox/Additions/linux/drm/vbox_main.c (revision 89690)
> > -+++ a/src/VBox/Additions/linux/drm/vbox_main.c (revision 90498)
> > -@@ -290,7 +290,7 @@
> > - /* Take a command buffer for each screen from the end of usable
> VRAM. */
> > - vbox->available_vram_size -= vbox->num_crtcs *
> VBVA_MIN_BUFFER_SIZE;
> > -
> > -- vbox->vbva_buffers = pci_iomap_range(vbox->dev->pdev, 0,
> > -+ vbox->vbva_buffers =
> pci_iomap_range(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0,
> > -vbox->available_vram_size,
> > -vbox->num_crtcs *
> > -VBVA_MIN_BUFFER_SIZE);
> > -@@ -311,7 +311,7 @@
> > - return 0;
> > -
> > - err_pci_iounmap:
> > -- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers);
> > -+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers);
> > - return ret;
> > - }
> > -
> > -@@ -318,7 +318,7 @@
> > - static void vbox_accel_fini(struct vbox_private *vbox)
> > - {
> > - vbox_disable_accel(vbox);
> > -- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers);
> > -+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers);
> > - }
> > -
> > - /** Do we support the 4.3 plus mode hint reporting interface? */
> > -@@ -393,7 +393,7 @@
> > -
> > - /* Map guest-heap at end of vram */
> > - vbox->guest_heap =
> > -- pci_
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.26 -> 6.1.28
drop two upstream cherry-pick patches:
r89690-5.14-fixes.patch
r90497-regops-5.14-fix.patch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../vboxguestdrivers/r89690-5.14-fixes.patch | 442 --
.../r90497-regops-5.14-fix.patch | 118 -
...s_6.1.26.bb => vboxguestdrivers_6.1.28.bb} | 6 +-
3 files changed, 2 insertions(+), 564 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r90497-regops-5.14-fix.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.26.bb =>
vboxguestdrivers_6.1.28.bb} (92%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
deleted file mode 100644
index 951bd5013..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch
+++ /dev/null
@@ -1,442 +0,0 @@
-Subject: Fix build errors with linux 5.14
-
-Upstream-Status: backport
-
-svn-id: r89690
-
-Signed-off-by: Bruce Ashfield
-
-Index: a/src/VBox/Additions/linux/drm/vbox_drv.h
-===
a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 89690)
-+++ a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 90498)
-@@ -227,6 +227,15 @@
- sizeof(HGSMIHOSTFLAGS))
- #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE
-
-+/** Field @pdev of struct drm_device was removed in 5.14. This macro
-+ * transparently handles this change. Input argument is a pointer
-+ * to struct drm_device. */
-+#if RTLNX_VER_MIN(5,14,0)
-+# define VBOX_DRM_TO_PCI_DEV(_dev) to_pci_dev(_dev->dev)
-+#else
-+# define VBOX_DRM_TO_PCI_DEV(_dev) _dev->pdev
-+#endif
-+
- /** How frequently we refresh if the guest is not providing dirty rectangles.
*/
- #define VBOX_REFRESH_PERIOD (HZ / 2)
-
-Index: a/src/VBox/Additions/linux/drm/vbox_main.c
-===
a/src/VBox/Additions/linux/drm/vbox_main.c (revision 89690)
-+++ a/src/VBox/Additions/linux/drm/vbox_main.c (revision 90498)
-@@ -290,7 +290,7 @@
- /* Take a command buffer for each screen from the end of usable VRAM. */
- vbox->available_vram_size -= vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE;
-
-- vbox->vbva_buffers = pci_iomap_range(vbox->dev->pdev, 0,
-+ vbox->vbva_buffers = pci_iomap_range(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0,
-vbox->available_vram_size,
-vbox->num_crtcs *
-VBVA_MIN_BUFFER_SIZE);
-@@ -311,7 +311,7 @@
- return 0;
-
- err_pci_iounmap:
-- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers);
- return ret;
- }
-
-@@ -318,7 +318,7 @@
- static void vbox_accel_fini(struct vbox_private *vbox)
- {
- vbox_disable_accel(vbox);
-- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers);
- }
-
- /** Do we support the 4.3 plus mode hint reporting interface? */
-@@ -393,7 +393,7 @@
-
- /* Map guest-heap at end of vram */
- vbox->guest_heap =
-- pci_iomap_range(vbox->dev->pdev, 0, GUEST_HEAP_OFFSET(vbox),
-+ pci_iomap_range(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0,
GUEST_HEAP_OFFSET(vbox),
- GUEST_HEAP_SIZE);
- if (!vbox->guest_heap)
- return -ENOMEM;
-@@ -442,7 +442,7 @@
- err_destroy_guest_pool:
- gen_pool_destroy(vbox->guest_pool);
- err_unmap_guest_heap:
-- pci_iounmap(vbox->dev->pdev, vbox->guest_heap);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->guest_heap);
- return ret;
- }
-
-@@ -452,7 +452,7 @@
- cancel_delayed_work(>refresh_work);
- vbox_accel_fini(vbox);
- gen_pool_destroy(vbox->guest_pool);
-- pci_iounmap(vbox->dev->pdev, vbox->guest_heap);
-+ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->guest_heap);
- }
-
- #if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MIN(8,3)
-@@ -567,12 +567,16 @@
-
- size = roundup(size, PAGE_SIZE);
- if (size == 0)
-+ {
-+ DRM_ERROR("bad size\n");
- return -EINVAL;
-+ }
-
- ret = vbox_bo_create(dev, size, 0, 0, );
- if (ret) {
- if (ret != -ERESTARTSYS)
- DRM_ERROR("failed to allocate GEM object\n");
-+ DRM_ERROR("failed to allocate GEM (%d)\n", ret);
- return ret;
- }
-
-@@ -628,6 +632,21 @@
- {
-
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.22 -> 6.1.24
Drop patch to fix build failure with kernel 5.13, now part of upstream codebase
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../40-linux-5.13-support.patch | 276 --
...s_6.1.22.bb => vboxguestdrivers_6.1.26.bb} | 6 +-
2 files changed, 3 insertions(+), 279 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.22.bb =>
vboxguestdrivers_6.1.26.bb} (94%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
deleted file mode 100644
index e95e24049..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-Subject: Fix build errors with linux 5.13
-Origin: upstream, https://www.virtualbox.org/browser/vbox/trunk
-Bug: https://bugs.launchpad.net/bugs/1929193
-
-diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h
virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h
virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h
2021-04-28 16:24:47.0 +
-+++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h
2021-06-23 10:08:44.431714404 +
-@@ -46,20 +41,20 @@
- * Evaluates to true if the linux kernel version is equal or higher to the
- * one specfied. */
- #define RTLNX_VER_MIN(a_Major, a_Minor, a_Patch) \
--(LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch))
-+ (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch))
-
- /** @def RTLNX_VER_MAX
- * Evaluates to true if the linux kernel version is less to the one specfied
- * (exclusive). */
- #define RTLNX_VER_MAX(a_Major, a_Minor, a_Patch) \
--(LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch))
-+ (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch))
-
- /** @def RTLNX_VER_RANGE
- * Evaluates to true if the linux kernel version is equal or higher to the
given
- * minimum version and less (but not equal) to the maximum version
(exclusive). */
- #define RTLNX_VER_RANGE(a_MajorMin, a_MinorMin, a_PatchMin, a_MajorMax,
a_MinorMax, a_PatchMax) \
--( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin,
a_PatchMin) \
-- && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax,
a_PatchMax) )
-+ ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin,
a_PatchMin) \
-+ && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax,
a_PatchMax) )
-
-
- /** @def RTLNX_RHEL_MIN
-@@ -70,7 +65,7 @@
- */
- #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
- # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) \
-- ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) &&
(RHEL_MINOR) >= (a_iMinor)))
-+ ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) &&
(RHEL_MINOR) >= (a_iMinor)))
- #else
- # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) (0)
- #endif
-@@ -83,7 +78,7 @@
- */
- #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
- # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) \
-- ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) &&
(RHEL_MINOR) < (a_iMinor)))
-+ ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) &&
(RHEL_MINOR) < (a_iMinor)))
- #else
- # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
- #endif
-@@ -95,7 +90,7 @@
- */
- #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
- # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax,
a_iMinorMax) \
-- (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax,
a_iMinorMax))
-+ (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) &&
RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax))
- #else
- # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax,
a_iMinorMax) (0)
- #endif
-@@ -173,7 +168,9 @@
- #include
- #include
- #include
-+#if RTLNX_VER_MAX(5,13,0)
- #include
-+#endif
- #if RTLNX_VER_MAX(5,12,0)
- # include
- #endif
-@@ -222,7 +219,7 @@ static inline void drm_gem_object_put(st
-VBVA_ADAPTER_INFORMATION_SIZE)
- #define GUEST_HEAP_SIZE VBVA_ADAPTER_INFORMATION_SIZE
- #define GUEST_HEAP_USABLE_SIZE (VBVA_ADAPTER_INFORMATION_SIZE - \
-- sizeof(HGSMIHOSTFLAGS))
-+ sizeof(struct hgsmi_host_flags))
- #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE
-
- /** How frequently we refresh if the guest is not providing dirty rectangles.
*/
-@@ -232,7 +229,7 @@ static inline void drm_gem_object_put(st
- static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size,
-g
Re: [oe] [meta-oe][PATCH] dlt-daemon: update from 2.18.6 to 2.18.7 - add an upstream proposed patch 317.patch to fix a build failure with enabled systemd binding
Hello, my bad sorry!
I did this change:
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '
systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor
dlt-console ', '', d)} \
- udp-connection dlt-system dlt-filetransfer "
+ udp-connection dlt-system dlt-filetransfer dlt-examples systemd
systemd-watchdog systemd-journal dlt-dbus udp-connection dlt-adaptor
dlt-system dlt-filetransfer dlt-console "
Just to test everything was "buildable" in a quick and dirty way, and my
bad I committed this change...
Resubmitted after removing that line
thanks
Gianfranco
Il giorno gio 1 lug 2021 alle ore 20:56 Khem Raj ha
scritto:
> this perhaps needs some work to get going when systemd is not used in
> DISTRO_FEATURES I am seeing
>
> 00:02:27.216 NOTE: Resolving any missing task queue dependencies
> 00:02:28.129 ERROR: Nothing PROVIDES 'systemd' (but
>
> /mnt/jenkins/workspace/Yocto-world-arm/sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/
> dlt-daemon_2.18.7.bb
> DEPENDS on or otherwise requires it)
> 00:02:28.129 systemd was skipped: missing required distro feature
> 'systemd' (not in DISTRO_FEATURES)
> 00:02:29.201 ERROR: Nothing RPROVIDES 'mosquitto' (but
>
> /mnt/jenkins/workspace/Yocto-world-arm/sources/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/
> mosquitto_2.0.11.bb
> RDEPENDS on or otherwise requires it)
> 00:02:29.201 No eligible RPROVIDERs exist for 'mosquitto'
> 00:02:29.202 NOTE: Runtime target 'mosquitto' is unbuildable, removing...
> 00:02:29.202 Missing or unbuildable dependency chain was: ['mosquitto']
> 00:02:29.277 ERROR: Nothing RPROVIDES 'mosquitto-dev' (but
>
> /mnt/jenkins/workspace/Yocto-world-arm/sources/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/
> mosquitto_2.0.11.bb
> RDEPENDS on or otherwise requires it)
> 00:02:29.277 No eligible RPROVIDERs exist for 'mosquitto-dev'
> 00:02:29.277 NOTE: Runtime target 'mosquitto-dev' is unbuildable,
> removing...
> 00:02:29.277 Missing or unbuildable dependency chain was: ['mosquitto-dev']
> 00:02:29.451 NOTE: Multiple providers are available for runtime ssh
> (dropbear, openssh)
> 00:02:29.451 Consider defining a PREFERRED_RPROVIDER entry to match ssh
> 00:02:31.616 ERROR: Nothing RPROVIDES 'dlt-daemon-dev' (but
>
> /mnt/jenkins/workspace/Yocto-world-arm/sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/
> dlt-daemon_2.18.7.bb
> RDEPENDS on or otherwise requires it)
> 00:02:31.616 No eligible RPROVIDERs exist for 'dlt-daemon-dev'
> 00:02:31.616 NOTE: Runtime target 'dlt-daemon-dev' is unbuildable,
> removing...
> 00:02:31.616 Missing or unbuildable dependency chain was:
> ['dlt-daemon-dev']
> 00:02:31.695 ERROR: Nothing RPROVIDES 'dlt-daemon' (but
>
> /mnt/jenkins/workspace/Yocto-world-arm/sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/
> dlt-daemon_2.18.7.bb
> RDEPENDS on or otherwise requires it)
> 00:02:31.695 No eligible RPROVIDERs exist for 'dlt-daemon'
> 00:02:31.695 NOTE: Runtime target 'dlt-daemon' is unbuildable, removing...
> 00:02:31.695 Missing or unbuildable dependency chain was: ['dlt-daemon']
> 00:02:31.774 ERROR: Nothing RPROVIDES 'libsystemd' (but
>
> /mnt/jenkins/workspace/Yocto-world-arm/sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/
> dlt-daemon_2.18.7.bb
> RDEPENDS on or otherwise requires it)
> 00:02:31.774 NOTE: Runtime target 'libsystemd' is unbuildable, removing...
> 00:02:31.774 Missing or unbuildable dependency chain was: ['libsystemd']
> 00:02:31.917 ERROR: Nothing RPROVIDES 'dlt-daemon-systemd' (but
>
> /mnt/jenkins/workspace/Yocto-world-arm/sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/
> dlt-daemon_2.18.7.bb
> RDEPENDS on or otherwise requires it)
> 00:02:31.917 No eligible RPROVIDERs exist for 'dlt-daemon-systemd'
> 00:02:31.917 NOTE: Runtime target 'dlt-daemon-systemd' is unbuildable,
> removing...
> 00:02:31.917 Missing or unbuildable dependency chain was:
> ['dlt-daemon-systemd']
> 00:02:36.223
>
> On Thu, Jul 1, 2021 at 4:38 AM Gianfranco
> wrote:
> >
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../dlt-daemon/dlt-daemon/317.patch | 43 +++
> > ...-daemon_2.18.6.bb => dlt-daemon_2.18.7.bb} | 9 ++--
> > 2 files changed, 48 insertions(+), 4 deletions(-)
> > create mode 100644
> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
> > rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.6.bb =>
> dlt-daemon_2.18.7.bb} (88%)
> >
> > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
> b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
> > new
[oe] [meta-oe][PATCH] dlt-daemon: update from 2.18.6 to 2.18.7 - add an upstream proposed patch 317.patch to fix a build failure with enabled systemd binding
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/317.patch | 43 +++
...-daemon_2.18.6.bb => dlt-daemon_2.18.7.bb} | 7 +--
2 files changed, 47 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.6.bb =>
dlt-daemon_2.18.7.bb} (93%)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
new file mode 100644
index 0..fe40334b6
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
@@ -0,0 +1,43 @@
+Origin: https://github.com/GENIVI/dlt-daemon/pull/317
+From 55d31216823841a1547fe261cdf8e3b1002d5f94 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Thu, 1 Jul 2021 12:58:20 +0200
+Subject: [PATCH] dlt-control-common.c: Fix build failure due to out-of-bound
+ write -Werror=stringop-truncation
+
+cd /build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/src/console/logstorage &&
/usr/bin/cc -DCONFIGURATION_FILES_DIR=\"/etc\" -DDLT_DAEMON_USE_FIFO_IPC
-DDLT_LIB_USE_FIFO_IPC -DDLT_NETWORK_TRACE_ENABLE -DDLT_SYSTEMD_ENABLE
-DDLT_SYSTEMD_JOURNAL_ENABLE -DDLT_UNIT_TESTS -DDLT_USER_IPC_PATH=\"/tmp\"
-DDLT_USE_IPv6 -DEXTENDED_FILTERING -D_GNU_SOURCE -I/build/dlt-daemon-2.18.7
-I/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/include/dlt
-I/build/dlt-daemon-2.18.7/include/dlt -I/build/dlt-daemon-2.18.7/src/shared
-I/build/dlt-daemon-2.18.7/src/core_dump_handler
-I/build/dlt-daemon-2.18.7/src/offlinelogstorage
-I/build/dlt-daemon-2.18.7/src/lib -I/build/dlt-daemon-2.18.7/src/daemon
-I/build/dlt-daemon-2.18.7/src/console -I/build/dlt-daemon-2.18.7/src/gateway
-I/build/dlt-daemon-2.18.7/systemd/3rdparty -g -O2
-ffile-prefix-map=/build/dlt-daemon-2.18.7=. -fstack-protector-strong -Wformat
-Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Werror -std=gnu99
-Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -o
CMakeFiles/dlt-logstorage-ctrl.dir/__/dlt-control-common.c.o -c
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c
+make[3]: Leaving directory '/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu'
+In file included from /usr/include/string.h:495,
+ from
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:56:
+In function 'strncpy',
+inlined from 'dlt_json_filter_load' at
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:716:13:
+/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
'__builtin_strncpy' specified bound 4 equals destination size
[-Werror=stringop-truncation]
+ 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos
(__dest));
+ | ^~
+In function 'strncpy',
+inlined from 'dlt_json_filter_load' at
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:721:13:
+/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
'__builtin_strncpy' specified bound 4 equals destination size
[-Werror=stringop-truncation]
+ 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos
(__dest));
+ | ^~~~~~
+
+Signed-off-by: Gianfranco Costamagna
+Signed-off-by: Gianfranco Costamagna
+---
+ src/console/dlt-control-common.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/console/dlt-control-common.c
b/src/console/dlt-control-common.c
+index 8a9d29f0..f58d8268 100644
+--- a/src/console/dlt-control-common.c
b/src/console/dlt-control-common.c
+@@ -671,8 +671,8 @@ DltReturnValue dlt_json_filter_load(DltFilter *filter,
const char *filename, int
+ struct json_object *j_payload_max;
+ enum json_tokener_error jerr;
+
+-char app_id[DLT_ID_SIZE] = "";
+-char context_id[DLT_ID_SIZE] = "";
++char app_id[DLT_ID_SIZE + 1] = "";
++char context_id[DLT_ID_SIZE + 1] = "";
+ int32_t log_level = 0;
+ int32_t payload_max = INT32_MAX;
+ int32_t payload_min = 0;
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb
similarity index 93%
rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb
index b3cfb4709..a16e810be 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb
@@ -12,13 +12,14 @@ SECTION = "console/utils"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea"
-DEPENDS = "zlib gzip-native"
+DEPENDS = "zlib gzip-native json-c"
SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
[oe] [meta-oe][PATCH] vboxguestdrivers: add upstream patch (already used in Debian and Ubuntu) to fix a build failure with kernel 5.13
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../40-linux-5.13-support.patch | 276 ++
.../vboxguestdrivers_6.1.22.bb| 1 +
2 files changed, 277 insertions(+)
create mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
new file mode 100644
index 0..e95e24049
--- /dev/null
+++
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
@@ -0,0 +1,276 @@
+Subject: Fix build errors with linux 5.13
+Origin: upstream, https://www.virtualbox.org/browser/vbox/trunk
+Bug: https://bugs.launchpad.net/bugs/1929193
+
+diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h
virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h
+--- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h
2021-04-28 16:24:47.0 +
virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h
2021-06-23 10:08:44.431714404 +
+@@ -46,20 +41,20 @@
+ * Evaluates to true if the linux kernel version is equal or higher to the
+ * one specfied. */
+ #define RTLNX_VER_MIN(a_Major, a_Minor, a_Patch) \
+-(LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch))
++ (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch))
+
+ /** @def RTLNX_VER_MAX
+ * Evaluates to true if the linux kernel version is less to the one specfied
+ * (exclusive). */
+ #define RTLNX_VER_MAX(a_Major, a_Minor, a_Patch) \
+-(LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch))
++ (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch))
+
+ /** @def RTLNX_VER_RANGE
+ * Evaluates to true if the linux kernel version is equal or higher to the
given
+ * minimum version and less (but not equal) to the maximum version
(exclusive). */
+ #define RTLNX_VER_RANGE(a_MajorMin, a_MinorMin, a_PatchMin, a_MajorMax,
a_MinorMax, a_PatchMax) \
+-( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin,
a_PatchMin) \
+- && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax,
a_PatchMax) )
++ ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin,
a_PatchMin) \
++ && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax,
a_PatchMax) )
+
+
+ /** @def RTLNX_RHEL_MIN
+@@ -70,7 +65,7 @@
+ */
+ #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+ # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) \
+- ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) &&
(RHEL_MINOR) >= (a_iMinor)))
++ ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) &&
(RHEL_MINOR) >= (a_iMinor)))
+ #else
+ # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) (0)
+ #endif
+@@ -83,7 +78,7 @@
+ */
+ #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+ # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) \
+- ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) &&
(RHEL_MINOR) < (a_iMinor)))
++ ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) &&
(RHEL_MINOR) < (a_iMinor)))
+ #else
+ # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
+ #endif
+@@ -95,7 +90,7 @@
+ */
+ #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+ # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax,
a_iMinorMax) \
+- (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax,
a_iMinorMax))
++ (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) &&
RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax))
+ #else
+ # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax,
a_iMinorMax) (0)
+ #endif
+@@ -173,7 +168,9 @@
+ #include
+ #include
+ #include
++#if RTLNX_VER_MAX(5,13,0)
+ #include
++#endif
+ #if RTLNX_VER_MAX(5,12,0)
+ # include
+ #endif
+@@ -222,7 +219,7 @@ static inline void drm_gem_object_put(st
+VBVA_ADAPTER_INFORMATION_SIZE)
+ #define GUEST_HEAP_SIZE VBVA_ADAPTER_INFORMATION_SIZE
+ #define GUEST_HEAP_USABLE_SIZE (VBVA_ADAPTER_INFORMATION_SIZE - \
+- sizeof(HGSMIHOSTFLAGS))
++ sizeof(struct hgsmi_host_flags))
+ #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE
+
+ /** How frequently we refresh if the guest is not providing dirty rectangles.
*/
+@@ -232,7 +229,7 @@ static inline void drm_gem_object_put(st
+ static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size,
+gfp_t flags)
+ {
+-return devm_kzalloc(dev, n * size, flags);
++ return devm_kzalloc(dev, n * size, flags);
+ }
+ #endif
+
+@@ -244,7 +241,7 @@ struct vbox_private {
+ u8 __iomem *guest_heap;
+ u8 __iomem *vb
[oe] [meta-oe][PATCH] dlt-daemon: update from 2.18.6 to 2.18.7 - add an upstream proposed patch 317.patch to fix a build failure with enabled systemd binding
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/317.patch | 43 +++
...-daemon_2.18.6.bb => dlt-daemon_2.18.7.bb} | 9 ++--
2 files changed, 48 insertions(+), 4 deletions(-)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.6.bb =>
dlt-daemon_2.18.7.bb} (88%)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
new file mode 100644
index 0..fe40334b6
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
@@ -0,0 +1,43 @@
+Origin: https://github.com/GENIVI/dlt-daemon/pull/317
+From 55d31216823841a1547fe261cdf8e3b1002d5f94 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Thu, 1 Jul 2021 12:58:20 +0200
+Subject: [PATCH] dlt-control-common.c: Fix build failure due to out-of-bound
+ write -Werror=stringop-truncation
+
+cd /build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/src/console/logstorage &&
/usr/bin/cc -DCONFIGURATION_FILES_DIR=\"/etc\" -DDLT_DAEMON_USE_FIFO_IPC
-DDLT_LIB_USE_FIFO_IPC -DDLT_NETWORK_TRACE_ENABLE -DDLT_SYSTEMD_ENABLE
-DDLT_SYSTEMD_JOURNAL_ENABLE -DDLT_UNIT_TESTS -DDLT_USER_IPC_PATH=\"/tmp\"
-DDLT_USE_IPv6 -DEXTENDED_FILTERING -D_GNU_SOURCE -I/build/dlt-daemon-2.18.7
-I/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/include/dlt
-I/build/dlt-daemon-2.18.7/include/dlt -I/build/dlt-daemon-2.18.7/src/shared
-I/build/dlt-daemon-2.18.7/src/core_dump_handler
-I/build/dlt-daemon-2.18.7/src/offlinelogstorage
-I/build/dlt-daemon-2.18.7/src/lib -I/build/dlt-daemon-2.18.7/src/daemon
-I/build/dlt-daemon-2.18.7/src/console -I/build/dlt-daemon-2.18.7/src/gateway
-I/build/dlt-daemon-2.18.7/systemd/3rdparty -g -O2
-ffile-prefix-map=/build/dlt-daemon-2.18.7=. -fstack-protector-strong -Wformat
-Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Werror -std=gnu99
-Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -o
CMakeFiles/dlt-logstorage-ctrl.dir/__/dlt-control-common.c.o -c
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c
+make[3]: Leaving directory '/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu'
+In file included from /usr/include/string.h:495,
+ from
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:56:
+In function 'strncpy',
+inlined from 'dlt_json_filter_load' at
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:716:13:
+/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
'__builtin_strncpy' specified bound 4 equals destination size
[-Werror=stringop-truncation]
+ 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos
(__dest));
+ | ^~
+In function 'strncpy',
+inlined from 'dlt_json_filter_load' at
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:721:13:
+/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
'__builtin_strncpy' specified bound 4 equals destination size
[-Werror=stringop-truncation]
+ 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos
(__dest));
+ | ^~~~~~
+
+Signed-off-by: Gianfranco Costamagna
+Signed-off-by: Gianfranco Costamagna
+---
+ src/console/dlt-control-common.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/console/dlt-control-common.c
b/src/console/dlt-control-common.c
+index 8a9d29f0..f58d8268 100644
+--- a/src/console/dlt-control-common.c
b/src/console/dlt-control-common.c
+@@ -671,8 +671,8 @@ DltReturnValue dlt_json_filter_load(DltFilter *filter,
const char *filename, int
+ struct json_object *j_payload_max;
+ enum json_tokener_error jerr;
+
+-char app_id[DLT_ID_SIZE] = "";
+-char context_id[DLT_ID_SIZE] = "";
++char app_id[DLT_ID_SIZE + 1] = "";
++char context_id[DLT_ID_SIZE + 1] = "";
+ int32_t log_level = 0;
+ int32_t payload_max = INT32_MAX;
+ int32_t payload_min = 0;
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb
similarity index 88%
rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb
index b3cfb4709..c4ad59381 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb
@@ -12,18 +12,19 @@ SECTION = "console/utils"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea"
-DEPENDS = "zlib gzip-native"
+DEPENDS = "zlib gzip-native json-c"
SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
[oe] [meta-oe][PATCH] dlt-daemon: update from 2.18.6 to 2.18.7 - add an upstream proposed patch 317.patch to fix a build failure with enabled systemd binding
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon_2.18.6.bb | 66 ---
1 file changed, 66 deletions(-)
delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
deleted file mode 100644
index b3cfb4709..0
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-SUMMARY = "Diagnostic Log and Trace"
-DESCRIPTION = "This component provides a standardised log and trace interface,
\
-based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \
-This component can be used by GENIVI components and other applications as \
-logging facility providing: \
-- the DLT shared library \
-- the DLT daemon, including startup scripts \
-- the DLT daemon adaptors- the DLT client console utilities \
-- the DLT test applications"
-HOMEPAGE = "https://www.genivi.org/;
-SECTION = "console/utils"
-LICENSE = "MPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea"
-
-DEPENDS = "zlib gzip-native"
-
-SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
-file://0002-Don-t-execute-processes-as-a-specific-user.patch \
-file://0004-Modify-systemd-config-directory.patch \
-"
-SRCREV = "22715aeceaa81ace2c832312529bde3a42d0814f"
-
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd
systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '',
d)} \
- udp-connection dlt-system dlt-filetransfer "
-# dlt-dbus
-
-# General options
-PACKAGECONFIG[dlt-examples] =
"-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd"
-
-# Linux options
-PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd"
-PACKAGECONFIG[systemd-watchdog] =
"-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd"
-PACKAGECONFIG[systemd-journal] =
"-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd"
-PACKAGECONFIG[dlt-dbus] =
"-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib"
-PACKAGECONFIG[udp-connection] =
"-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION=OFF"
-
-# 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-filetransfer] =
"-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF"
-PACKAGECONFIG[dlt-console] =
"-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd"
-
-inherit autotools gettext cmake systemd
-
-EXTRA_OECMAKE += "-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)}"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-SYSTEMD_SERVICE_${PN}-systemd = " \
-${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor',
'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)} \
-"
-SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable"
-
-FILES_${PN}-doc += "${datadir}/dlt-filetransfer"
-
-do_install_append() {
-rm -f ${D}${bindir}/dlt-test-*
-}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#92077):
https://lists.openembedded.org/g/openembedded-devel/message/92077
Mute This Topic: https://lists.openembedded.org/mt/83913559/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.20 -> 6.1.22
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...{vboxguestdrivers_6.1.20.bb => vboxguestdrivers_6.1.22.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.20.bb =>
vboxguestdrivers_6.1.22.bb} (95%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb
similarity index 95%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb
index 9df2e3960..a074d0a55 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb
@@ -15,8 +15,8 @@ SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
file://add__divmoddi4.patch \
"
-SRC_URI[md5sum] = "f2fe05e72c37d40afb36b9fb3aa38b78"
-SRC_URI[sha256sum] =
"e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7"
+SRC_URI[md5sum] = "abb1a20021e5915fe38c666e8c11cf80"
+SRC_URI[sha256sum] =
"99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49"
S ?= "${WORKDIR}/vbox_module"
S_task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91237):
https://lists.openembedded.org/g/openembedded-devel/message/91237
Mute This Topic: https://lists.openembedded.org/mt/82742911/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.18 -> 6.1.20
Drop all patches, now part of upstream codebase
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../vboxguestdrivers/kernel-5.10.patch| 23 ---
...s_6.1.18.bb => vboxguestdrivers_6.1.20.bb} | 5 ++--
2 files changed, 2 insertions(+), 26 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.18.bb =>
vboxguestdrivers_6.1.20.bb} (94%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
deleted file mode 100644
index a6b0a0454..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Origin:
https://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg461494.html
-From 80bfab5ec8575703ef26b442a3af2d030793ebde Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Jan=20R=C4=99korajski?=
-Date: Thu, 24 Dec 2020 23:03:55 +0100
-Subject: [PATCH] - DECLCALLBACK generates incorrect code on ix86, remove it
-
- kernel-5.10.patch | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kernel-5.10.patch b/kernel-5.10.patch
-index b28d6e0..729235d 100644
a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -536,7 +536,7 @@ typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
- * @param uAddr The address to apply the new protection to.
- * @param pvUser The opaque user data.
- */
--static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned
long uAddr, void *pvUser)
-+static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr,
void *pvUser)
- {
- PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
- PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb
similarity index 94%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb
index 1def1a311..9df2e3960 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb
@@ -13,11 +13,10 @@ VBOX_NAME = "VirtualBox-${PV}"
SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
file://Makefile.utils \
-file://kernel-5.10.patch \
file://add__divmoddi4.patch \
"
-SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b"
-SRC_URI[sha256sum] =
"108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"
+SRC_URI[md5sum] = "f2fe05e72c37d40afb36b9fb3aa38b78"
+SRC_URI[sha256sum] =
"e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7"
S ?= "${WORKDIR}/vbox_module"
S_task-patch = "${WORKDIR}/${VBOX_NAME}"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#90952):
https://lists.openembedded.org/g/openembedded-devel/message/90952
Mute This Topic: https://lists.openembedded.org/mt/82245348/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] mosquitto: Upgrade 2.0.7 -> 2.0.8
2.0.8 - 2021-02-25
==
Broker:
- Fix incorrect datatypes in `struct mosquitto_evt_tick`. This changes the
size and offset of two of the members of this struct, and changes the size
of the struct. This is an ABI break, but is considered to be acceptable
because plugins should never be allocating their own instance of this
struct, and currently none of the struct members are used for anything, so a
plugin should not be accessing them. It would also be safe to read/write
from the existing struct parameters.
- Give compile time warning if libwebsockets compiled without external poll
support. Closes #2060.
- Fix memory tracking not being available on FreeBSD or macOS. Closes #2096.
Client library:
- Fix mosquitto_{pub|sub}_topic_check() functions not returning MOSQ_ERR_INVAL
on topic == NULL.
Clients:
- Fix possible loss of data in `mosquitto_pub -l` when sending multiple long
lines. Closes #2078.
Build:
- Provide a mechanism for Docker users to run a broker that doesn't use
authentication, without having to provide their own configuration file.
Closes #2040.
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../mosquitto/{mosquitto_2.0.7.bb => mosquitto_2.0.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.7.bb =>
mosquitto_2.0.8.bb} (95%)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.8.bb
similarity index 95%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.8.bb
index 06220327e..03a829fc8 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.8.bb
@@ -19,8 +19,8 @@ SRC_URI =
"http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
file://1571.patch \
"
-SRC_URI[md5sum] = "56de4e27533ab53697245809feea95bf"
-SRC_URI[sha256sum] =
"a98054f0b8161588975ef24e1d467550d3935f4c16ccee63ecb623248a28356e"
+SRC_URI[md5sum] = "542c30f32c4473b7c50dc2e4a1424cf6"
+SRC_URI[sha256sum] =
"b15da8fc4edcb91d554e1259e220ea0173ef639ceaa4b465e06feb7e125b84bf"
inherit systemd update-rc.d useradd cmake
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#89770):
https://lists.openembedded.org/g/openembedded-devel/message/89770
Mute This Topic: https://lists.openembedded.org/mt/80983412/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] mosquitto: Upgrade 2.0.7 -> 2.0.8
2.0.8 - 2021-02-25
==
Broker:
- Fix incorrect datatypes in `struct mosquitto_evt_tick`. This changes the
size and offset of two of the members of this struct, and changes the size
of the struct. This is an ABI break, but is considered to be acceptable
because plugins should never be allocating their own instance of this
struct, and currently none of the struct members are used for anything, so a
plugin should not be accessing them. It would also be safe to read/write
from the existing struct parameters.
- Give compile time warning if libwebsockets compiled without external poll
support. Closes #2060.
- Fix memory tracking not being available on FreeBSD or macOS. Closes #2096.
Client library:
- Fix mosquitto_{pub|sub}_topic_check() functions not returning MOSQ_ERR_INVAL
on topic == NULL.
Clients:
- Fix possible loss of data in `mosquitto_pub -l` when sending multiple long
lines. Closes #2078.
Build:
- Provide a mechanism for Docker users to run a broker that doesn't use
authentication, without having to provide their own configuration file.
Closes #2040.
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../mosquitto/{mosquitto_2.0.7.bb => mosquitto_2.0.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.7.bb =>
mosquitto_2.0.8.bb} (95%)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.8.bb
similarity index 95%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.8.bb
index 06220327e..03a829fc8 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.8.bb
@@ -19,8 +19,8 @@ SRC_URI =
"http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
file://1571.patch \
"
-SRC_URI[md5sum] = "56de4e27533ab53697245809feea95bf"
-SRC_URI[sha256sum] =
"a98054f0b8161588975ef24e1d467550d3935f4c16ccee63ecb623248a28356e"
+SRC_URI[md5sum] = "542c30f32c4473b7c50dc2e4a1424cf6"
+SRC_URI[sha256sum] =
"b15da8fc4edcb91d554e1259e220ea0173ef639ceaa4b465e06feb7e125b84bf"
inherit systemd update-rc.d useradd cmake
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#89764):
https://lists.openembedded.org/g/openembedded-devel/message/89764
Mute This Topic: https://lists.openembedded.org/mt/80983412/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] mosquitto: Upgrade 1.6.12 -> 2.0.7
_TCP_NODELAY, to allow disabling Nagle's algorithm on client
sockets. Closes #1526.
- Add `mosquitto_ssl_get()` to allow clients to access their SSL structure and
perform additional verification.
- Add MOSQ_OPT_BIND_ADDRESS to allow setting of a bind address independently
of the `mosquitto_connect*()` call.
- Add `MOSQ_OPT_TLS_USE_OS_CERTS` option, to instruct the client to load and
trust OS provided CA certificates for use with TLS connections.
Client library fixes:
- Fix send quota being incorrecly reset on reconnect. Closes #1822.
- Don't use logging until log mutex is initialised. Closes #1819.
- Fix missing mach/mach_time.h header on OS X. Closes #1831.
- Fix connect properties not being sent when the client automatically
reconnects. Closes #1846.
Client features:
- Add timeout return code (27) for `mosquitto_sub -W ` and
`mosquitto_rr -W `. Closes #275.
- Add support for connecting to brokers through Unix domain sockets with the
`--unix` argument.
- Use cJSON library for producing JSON output, where available. Closes #1222.
- Add support for outputting MQTT v5 property information to mosquitto_sub/rr
JSON output. Closes #1416.
- Add `--pretty` option to mosquitto_sub/rr for formatted/unformatted JSON
output.
- Add support for v5 property printing to mosquitto_sub/rr in non-JSON mode.
Closes #1416.
- Add `--nodelay` to all clients to allow them to use the MOSQ_OPT_TCP_NODELAY
option.
- Add `-x` to all clients to all the session-expiry-interval property to be
easily set for MQTT v5 clients.
- Add `--random-filter` to mosquitto_sub, to allow only a certain proportion
of received messages to be printed.
- mosquitto_sub %j and %J timestamps are now in a ISO 8601 compatible format.
- mosquitto_sub now supports extra format specifiers for field width and
precision for some parameters.
- Add `--version` for all clients.
- All clients now load OS provided CA certificates if used with `-L
mqtts://...`, or if port is set to 8883 and no other CA certificates are
used. Closes #1824.
- Add the `--tls-use-os-certs` option to all clients.
Client fixes:
- mosquitto_sub will now exit if all subscriptions were denied.
- mosquitto_pub now sends 0 length files without an error when using `-f`.
- Fix description of `-e` and `-t` arguments in mosquitto_rr. Closes #1881.
- mosquitto_sub will now quit with an error if the %U option is used on
Windows, rather than just quitting. Closes #1908.
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../mosquitto/files/1571.patch | 2 +-
.../mosquitto/files/install-protocol.patch | 14 --
...{mosquitto_1.6.12.bb => mosquitto_2.0.7.bb} | 18 ++
3 files changed, 11 insertions(+), 23 deletions(-)
delete mode 100644
meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_1.6.12.bb =>
mosquitto_2.0.7.bb} (81%)
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
index 93ff6bcfa..37560f30c 100644
--- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
+++ b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
@@ -11,7 +11,7 @@ Signed-off-by: Gianfranco Costamagna
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
-@@ -89,6 +89,8 @@
+@@ -94,6 +94,8 @@
OUTPUT_NAME mosquitto
VERSION ${VERSION}
SOVERSION 1
diff --git
a/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch
b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch
deleted file mode 100644
index 1397fc6a2..0
---
a/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Also install mqtt_protocol.h, as is done in Makefile
-Author: Gianfranco Costamagna
-Bug-Debian: https://bugs.debian.org/951116
-Forwarded: https://github.com/eclipse/mosquitto/pull/1599
-Last-Update: 2020-02-15
-
a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -114,4 +114,4 @@
- install(TARGETS libmosquitto_static ARCHIVE DESTINATION
"${CMAKE_INSTALL_LIBDIR}")
- endif (WITH_STATIC_LIBRARIES)
-
--install(FILES mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+install(FILES mqtt_protocol.h mosquitto.h DESTINATION
"${CMAKE_INSTALL_INCLUDEDIR}")
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.12.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb
similarity index 81%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.12.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb
index 36bfe099f..06220327e 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.12.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb
@@ -6,2
[oe] [meta-oe][PATCH 1/2] vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
Drop kernel 5.10 build fixes patches, now part of upstream codebase
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...-linux-drm-Adjustment-for-Linux-5.10.patch | 321 --
...0drv-linux.c-Changes-to-support-the-.patch | 119 ---
...justment-for-linux-5.10-TASK_SIZE_MA.patch | 46 ---
...s_6.1.16.bb => vboxguestdrivers_6.1.18.bb} | 7 +-
4 files changed, 2 insertions(+), 491 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.16.bb =>
vboxguestdrivers_6.1.18.bb} (88%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
deleted file mode 100644
index a444901f8..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001
-From: vboxsync
-Date: Tue, 15 Dec 2020 22:29:56 +
-Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10.
-
-Upstream-Status: Backport
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@87092
cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-Signed-off-by: Bruce Ashfield
-
- src/VBox/Additions/linux/drm/vbox_drv.h | 10 +-
- src/VBox/Additions/linux/drm/vbox_fb.c | 2 +-
- .../src/VBox/Additions/linux/drm/vbox_mode.c | 2 +-
- src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +--
- 4 files changed, 99 insertions(+), 14 deletions(-)
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h
b/src/VBox/Additions/linux/drm/vbox_drv.h
-index 8c85371749..7937f2f2d2 100644
a/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ b/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -175,6 +175,9 @@
- #include
- #include
- #include
-+#if RTLNX_VER_MIN(5,10,0)
-+# include
-+#endif
-
- #include "vboxvideo_guest.h"
- #include "vboxvideo_vbe.h"
-@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int size, int
align,
- int vbox_gem_create(struct drm_device *dev,
- u32 size, bool iskernel, struct drm_gem_object **obj);
-
--int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr);
-+#define VBOX_MEM_TYPE_VRAM 0x1
-+#define VBOX_MEM_TYPE_SYSTEM 0x2
-+
-+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr);
- int vbox_bo_unpin(struct vbox_bo *bo);
-
- static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait)
-@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo *bo)
- ttm_bo_unreserve(>bo);
- }
-
--void vbox_ttm_placement(struct vbox_bo *bo, int domain);
-+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type);
- int vbox_bo_push_sysram(struct vbox_bo *bo);
- int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c
b/src/VBox/Additions/linux/drm/vbox_fb.c
-index adead98d3d..7182d9da1a 100644
a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -295,7 +295,7 @@ static int vboxfb_create(struct drm_fb_helper *helper,
- if (ret)
- return ret;
-
-- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
-+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, NULL);
- if (ret) {
- vbox_bo_unreserve(bo);
- return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c
b/src/VBox/Additions/linux/drm/vbox_mode.c
-index ce7d135cb6..5557db5ef8 100644
a/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ b/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -227,7 +227,7 @@ static int vbox_crtc_set_base(struct drm_crtc *crtc,
- if (ret)
- return ret;
-
-- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, _addr);
-+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, _addr);
- vbox_bo_unreserve(bo);
- if (ret)
- return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c
b/src/VBox/Additions/linux/drm/vbox_ttm.c
-index bf87aabc05..5eac926a42 100644
a/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -41,6 +41,7 @@
- #define PLACEMENT_FLAGS(placement) ((placement).flags)
- #endif
-
-+
- static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd)
- {
- return container_of(bd, struct vbox_private, ttm.bdev);
-@@ -125,6 +126,7 @@ static bool vbox_ttm_bo_is_vbox_bo(
[oe] [meta-oe][PATCH 2/2] vboxguestdrivers: Add patch proposed upstream to fix a build failure on i386
---
.../vboxguestdrivers/kernel-5.10.patch| 23 +++
.../vboxguestdrivers_6.1.18.bb| 1 +
2 files changed, 24 insertions(+)
create mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
new file mode 100644
index 0..a6b0a0454
--- /dev/null
+++
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
@@ -0,0 +1,23 @@
+Origin:
https://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg461494.html
+From 80bfab5ec8575703ef26b442a3af2d030793ebde Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jan=20R=C4=99korajski?=
+Date: Thu, 24 Dec 2020 23:03:55 +0100
+Subject: [PATCH] - DECLCALLBACK generates incorrect code on ix86, remove it
+
+---
+ kernel-5.10.patch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel-5.10.patch b/kernel-5.10.patch
+index b28d6e0..729235d 100644
+--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+@@ -536,7 +536,7 @@ typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
+ * @param uAddr The address to apply the new protection to.
+ * @param pvUser The opaque user data.
+ */
+-static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned
long uAddr, void *pvUser)
++static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr,
void *pvUser)
+ {
+ PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
+ PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
index ea6a082f6..d620e9893 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
@@ -13,6 +13,7 @@ VBOX_NAME = "VirtualBox-${PV}"
SRC_URI =
"http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
file://Makefile.utils \
+file://kernel-5.10.patch \
"
SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b"
SRC_URI[sha256sum] =
"108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#88954):
https://lists.openembedded.org/g/openembedded-devel/message/88954
Mute This Topic: https://lists.openembedded.org/mt/80017494/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
Hello, I resubmitted with a little patch that fixes part (but not all) the
musl failures.
Just to be clear, this seems to be not a regression, the current master
with 6.1.16 has the very same failures on i386.
The current proposed patchset is not making the situation worse, and
upstream is having a look at the issue.
Gianfranco
Il giorno gio 21 gen 2021 alle ore 09:26 Khem Raj ha
scritto:
> fails on musl/x86
>
> https://errors.yoctoproject.org/Errors/Details/541637/
>
> On Wed, Jan 20, 2021 at 5:01 AM Gianfranco
> wrote:
> >
> > Drop kernel 5.10 build fixes patches, now part of upstream codebase
> >
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > ...-linux-drm-Adjustment-for-Linux-5.10.patch | 321 --
> > ...0drv-linux.c-Changes-to-support-the-.patch | 119 ---
> > ...justment-for-linux-5.10-TASK_SIZE_MA.patch | 46 ---
> > ...s_6.1.16.bb => vboxguestdrivers_6.1.18.bb} | 7 +-
> > 4 files changed, 2 insertions(+), 491 deletions(-)
> > delete mode 100644
> meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
> > delete mode 100644
> meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch
> > delete mode 100644
> meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch
> > rename meta-oe/recipes-support/vboxguestdrivers/{
> vboxguestdrivers_6.1.16.bb => vboxguestdrivers_6.1.18.bb} (88%)
> >
> > diff --git
> a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
> b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
> > deleted file mode 100644
> > index a444901f8..0
> > ---
> a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
> > +++ /dev/null
> > @@ -1,321 +0,0 @@
> > -From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001
> > -From: vboxsync
> > -Date: Tue, 15 Dec 2020 22:29:56 +
> > -Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10.
> > -
> > -Upstream-Status: Backport
> > -
> > -git-svn-id: http://www.virtualbox.org/svn/vbox@87092
> cfe28804-0f27-0410-a406-dd0f0b0b656f
> > -
> > -Signed-off-by: Bruce Ashfield
> > -
> >
> > - src/VBox/Additions/linux/drm/vbox_drv.h | 10 +-
> > - src/VBox/Additions/linux/drm/vbox_fb.c | 2 +-
> > - .../src/VBox/Additions/linux/drm/vbox_mode.c | 2 +-
> > - src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +--
> > - 4 files changed, 99 insertions(+), 14 deletions(-)
> > -
> > -diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h
> b/src/VBox/Additions/linux/drm/vbox_drv.h
> > -index 8c85371749..7937f2f2d2 100644
> > a/src/VBox/Additions/linux/drm/vbox_drv.h
> > -+++ b/src/VBox/Additions/linux/drm/vbox_drv.h
> > -@@ -175,6 +175,9 @@
> > - #include
> > - #include
> > - #include
> > -+#if RTLNX_VER_MIN(5,10,0)
> > -+# include
> > -+#endif
> > -
> > - #include "vboxvideo_guest.h"
> > - #include "vboxvideo_vbe.h"
> > -@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int
> size, int align,
> > - int vbox_gem_create(struct drm_device *dev,
> > - u32 size, bool iskernel, struct drm_gem_object
> **obj);
> > -
> > --int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr);
> > -+#define VBOX_MEM_TYPE_VRAM 0x1
> > -+#define VBOX_MEM_TYPE_SYSTEM 0x2
> > -+
> > -+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr);
> > - int vbox_bo_unpin(struct vbox_bo *bo);
> > -
> > - static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait)
> > -@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo
> *bo)
> > - ttm_bo_unreserve(>bo);
> > - }
> > -
> > --void vbox_ttm_placement(struct vbox_bo *bo, int domain);
> > -+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type);
> > - int vbox_bo_push_sysram(struct vbox_bo *bo);
> > - int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
> > -
> > -diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c
> b/src/VBox/Additions/linux/drm/vbox_fb.c
> > -index adead98d3d..7182d9da1a 100644
> > a/src/VBox/Additions/linux/drm/vbox_fb.c
> > -+++ b/src/VBox/Additions/linux/drm/vbox_
[oe] [meta-oe][PATCH 1/2] vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
Drop kernel 5.10 build fixes patches, now part of upstream codebase
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...-linux-drm-Adjustment-for-Linux-5.10.patch | 321 --
...0drv-linux.c-Changes-to-support-the-.patch | 119 ---
...justment-for-linux-5.10-TASK_SIZE_MA.patch | 46 ---
...s_6.1.16.bb => vboxguestdrivers_6.1.18.bb} | 7 +-
4 files changed, 2 insertions(+), 491 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.16.bb =>
vboxguestdrivers_6.1.18.bb} (88%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
deleted file mode 100644
index a444901f8..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001
-From: vboxsync
-Date: Tue, 15 Dec 2020 22:29:56 +
-Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10.
-
-Upstream-Status: Backport
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@87092
cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-Signed-off-by: Bruce Ashfield
-
- src/VBox/Additions/linux/drm/vbox_drv.h | 10 +-
- src/VBox/Additions/linux/drm/vbox_fb.c | 2 +-
- .../src/VBox/Additions/linux/drm/vbox_mode.c | 2 +-
- src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +--
- 4 files changed, 99 insertions(+), 14 deletions(-)
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h
b/src/VBox/Additions/linux/drm/vbox_drv.h
-index 8c85371749..7937f2f2d2 100644
a/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ b/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -175,6 +175,9 @@
- #include
- #include
- #include
-+#if RTLNX_VER_MIN(5,10,0)
-+# include
-+#endif
-
- #include "vboxvideo_guest.h"
- #include "vboxvideo_vbe.h"
-@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int size, int
align,
- int vbox_gem_create(struct drm_device *dev,
- u32 size, bool iskernel, struct drm_gem_object **obj);
-
--int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr);
-+#define VBOX_MEM_TYPE_VRAM 0x1
-+#define VBOX_MEM_TYPE_SYSTEM 0x2
-+
-+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr);
- int vbox_bo_unpin(struct vbox_bo *bo);
-
- static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait)
-@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo *bo)
- ttm_bo_unreserve(>bo);
- }
-
--void vbox_ttm_placement(struct vbox_bo *bo, int domain);
-+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type);
- int vbox_bo_push_sysram(struct vbox_bo *bo);
- int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c
b/src/VBox/Additions/linux/drm/vbox_fb.c
-index adead98d3d..7182d9da1a 100644
a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -295,7 +295,7 @@ static int vboxfb_create(struct drm_fb_helper *helper,
- if (ret)
- return ret;
-
-- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
-+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, NULL);
- if (ret) {
- vbox_bo_unreserve(bo);
- return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c
b/src/VBox/Additions/linux/drm/vbox_mode.c
-index ce7d135cb6..5557db5ef8 100644
a/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ b/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -227,7 +227,7 @@ static int vbox_crtc_set_base(struct drm_crtc *crtc,
- if (ret)
- return ret;
-
-- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, _addr);
-+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, _addr);
- vbox_bo_unreserve(bo);
- if (ret)
- return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c
b/src/VBox/Additions/linux/drm/vbox_ttm.c
-index bf87aabc05..5eac926a42 100644
a/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -41,6 +41,7 @@
- #define PLACEMENT_FLAGS(placement) ((placement).flags)
- #endif
-
-+
- static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd)
- {
- return container_of(bd, struct vbox_private, ttm.bdev);
-@@ -125,6 +126,7 @@ static bool vbox_ttm_bo_is_vbox_bo(
[oe] [meta-oe][PATCH] vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
Drop kernel 5.10 build fixes patches, now part of upstream codebase
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
...-linux-drm-Adjustment-for-Linux-5.10.patch | 321 --
...0drv-linux.c-Changes-to-support-the-.patch | 119 ---
...justment-for-linux-5.10-TASK_SIZE_MA.patch | 46 ---
...s_6.1.16.bb => vboxguestdrivers_6.1.18.bb} | 7 +-
4 files changed, 2 insertions(+), 491 deletions(-)
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch
delete mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.16.bb =>
vboxguestdrivers_6.1.18.bb} (88%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
deleted file mode 100644
index a444901f8..0
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001
-From: vboxsync
-Date: Tue, 15 Dec 2020 22:29:56 +
-Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10.
-
-Upstream-Status: Backport
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@87092
cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-Signed-off-by: Bruce Ashfield
-
- src/VBox/Additions/linux/drm/vbox_drv.h | 10 +-
- src/VBox/Additions/linux/drm/vbox_fb.c | 2 +-
- .../src/VBox/Additions/linux/drm/vbox_mode.c | 2 +-
- src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +--
- 4 files changed, 99 insertions(+), 14 deletions(-)
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h
b/src/VBox/Additions/linux/drm/vbox_drv.h
-index 8c85371749..7937f2f2d2 100644
a/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ b/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -175,6 +175,9 @@
- #include
- #include
- #include
-+#if RTLNX_VER_MIN(5,10,0)
-+# include
-+#endif
-
- #include "vboxvideo_guest.h"
- #include "vboxvideo_vbe.h"
-@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int size, int
align,
- int vbox_gem_create(struct drm_device *dev,
- u32 size, bool iskernel, struct drm_gem_object **obj);
-
--int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr);
-+#define VBOX_MEM_TYPE_VRAM 0x1
-+#define VBOX_MEM_TYPE_SYSTEM 0x2
-+
-+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr);
- int vbox_bo_unpin(struct vbox_bo *bo);
-
- static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait)
-@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo *bo)
- ttm_bo_unreserve(>bo);
- }
-
--void vbox_ttm_placement(struct vbox_bo *bo, int domain);
-+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type);
- int vbox_bo_push_sysram(struct vbox_bo *bo);
- int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c
b/src/VBox/Additions/linux/drm/vbox_fb.c
-index adead98d3d..7182d9da1a 100644
a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -295,7 +295,7 @@ static int vboxfb_create(struct drm_fb_helper *helper,
- if (ret)
- return ret;
-
-- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
-+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, NULL);
- if (ret) {
- vbox_bo_unreserve(bo);
- return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c
b/src/VBox/Additions/linux/drm/vbox_mode.c
-index ce7d135cb6..5557db5ef8 100644
a/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ b/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -227,7 +227,7 @@ static int vbox_crtc_set_base(struct drm_crtc *crtc,
- if (ret)
- return ret;
-
-- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, _addr);
-+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, _addr);
- vbox_bo_unreserve(bo);
- if (ret)
- return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c
b/src/VBox/Additions/linux/drm/vbox_ttm.c
-index bf87aabc05..5eac926a42 100644
a/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -41,6 +41,7 @@
- #define PLACEMENT_FLAGS(placement) ((placement).flags)
- #endif
-
-+
- static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd)
- {
- return container_of(bd, struct vbox_private, ttm.bdev);
-@@ -125,6 +126,7 @@ static bool vbox_ttm_bo_is_vbox_bo(
[oe] [meta-oe][PATCH] dlt-daemon: update to new release 2.18.6
- drop patches 241 245 275: upstream
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/241.patch | 30
.../dlt-daemon/dlt-daemon/245.patch | 74 ---
.../dlt-daemon/dlt-daemon/275.patch | 38 --
...-daemon_2.18.5.bb => dlt-daemon_2.18.6.bb} | 5 +-
4 files changed, 1 insertion(+), 146 deletions(-)
delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.5.bb =>
dlt-daemon_2.18.6.bb} (96%)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
deleted file mode 100644
index 7d8f22ec7..0
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b8f9919f000e642fc8970d0a42c1bdadf5a9d720 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna
-Date: Mon, 10 Aug 2020 08:30:34 +0200
-Subject: [PATCH] sd-daemon.c: Fix build with newer glibc and musl libc
-
-Reported by Khem Raj on meta-oe list
-
-TOPDIR/build/tmp/work/armv7vet2hf-neon-yoe-linux-musleabi/dlt-daemon/2.18.5-r0/recipe-sysroot/usr/include/sys/fcntl.h:1:2:
error: redirecting incorrect #include to
[-Werror,-W#warnings]
- ^
-1 error generated.
-
-Signed-off-by: Gianfranco Costamagna
-Signed-off-by: Gianfranco Costamagna
- systemd/3rdparty/sd-daemon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemd/3rdparty/sd-daemon.c b/systemd/3rdparty/sd-daemon.c
-index 88936d2..de3f985 100644
a/systemd/3rdparty/sd-daemon.c
-+++ b/systemd/3rdparty/sd-daemon.c
-@@ -35,7 +35,7 @@
- #ifdef __BIONIC__
- #include
- #else
--#include
-+#include
- #endif
- #include
- #include
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
deleted file mode 100644
index 43057489c..0
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 57fd61ea5c58a4f9fcd7140b53ac6cd6e971ef47 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna
-Date: Fri, 31 Jul 2020 15:16:02 +0200
-Subject: [PATCH] dlt_offline: fix build failures with gcc-10
-
-see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
-
-/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_client.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
multiple definition of `g_logstorage_cache_max';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
first defined here
-/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118:
multiple definition of `g_logstorage_cache_size';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118:
first defined here
-/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
multiple definition of `g_logstorage_cache_max';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
first defined here
-/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118:
multiple definition of `g_logstorage_cache_size';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118:
first defined here
-/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
multiple definition of `g_logstorage_cache_max';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
first defined here
-/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118:
multiple definition of `g_logstorage_cache_size';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118:
first defined here
-/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
multiple definition of `g_logstorage_cache_max';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
first d
[oe] [meta-oe][PATCH] dlt-daemon: add upstream patch to fix CVE-2020-29394
More information on: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976228
| A buffer overflow in the dlt_filter_load function in dlt_common.c in
| dlt-daemon 2.8.5 (GENIVI Diagnostic Log and Trace) allows arbitrary
| code execution because fscanf is misused (no limit on the number of
| characters to be read in a format argument).
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/275.patch | 38 +++
.../dlt-daemon/dlt-daemon_2.18.5.bb | 1 +
2 files changed, 39 insertions(+)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
new file mode 100644
index 0..75065eb05
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
@@ -0,0 +1,38 @@
+Upstream-status: Backport
+CVE: CVE-2020-29394
+From 7f5cd5404a03fa330e192084f6bdafb2dc9bdcb7 Mon Sep 17 00:00:00 2001
+From: GwanYeong Kim
+Date: Sat, 28 Nov 2020 12:24:46 +0900
+Subject: [PATCH] dlt_common: Fix buffer overflow in dlt_filter_load
+
+A buffer overflow in the dlt_filter_load function in dlt_common.c in
dlt-daemon allows arbitrary code execution via an unsafe usage of fscanf,
because it does not limit the number of characters to be read in a format
argument.
+
+Fixed: #274
+
+Signed-off-by: GwanYeong Kim
+---
+ src/shared/dlt_common.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
+index 254f4ce4..d15b1cec 100644
+--- a/src/shared/dlt_common.c
b/src/shared/dlt_common.c
+@@ -404,7 +404,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const
char *filename, int verb
+ while (!feof(handle)) {
+ str1[0] = 0;
+
+-if (fscanf(handle, "%s", str1) != 1)
++if (fscanf(handle, "%254s", str1) != 1)
+ break;
+
+ if (str1[0] == 0)
+@@ -419,7 +419,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const
char *filename, int verb
+
+ str1[0] = 0;
+
+-if (fscanf(handle, "%s", str1) != 1)
++if (fscanf(handle, "%254s", str1) != 1)
+ break;
+
+ if (str1[0] == 0)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
index f3fcee4d2..5066e76d3 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
@@ -19,6 +19,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
file://0004-Modify-systemd-config-directory.patch \
file://241.patch \
file://245.patch \
+file://275.patch \
"
SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#88196):
https://lists.openembedded.org/g/openembedded-devel/message/88196
Mute This Topic: https://lists.openembedded.org/mt/78644671/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dlt-daemon: add upstream patch to fix CVE-2020-29394
More information on: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976228
| A buffer overflow in the dlt_filter_load function in dlt_common.c in
| dlt-daemon 2.8.5 (GENIVI Diagnostic Log and Trace) allows arbitrary
| code execution because fscanf is misused (no limit on the number of
| characters to be read in a format argument).
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/275.patch | 36 +++
.../dlt-daemon/dlt-daemon_2.18.5.bb | 1 +
2 files changed, 37 insertions(+)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
new file mode 100644
index 0..4edb62b30
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
@@ -0,0 +1,36 @@
+From 7f5cd5404a03fa330e192084f6bdafb2dc9bdcb7 Mon Sep 17 00:00:00 2001
+From: GwanYeong Kim
+Date: Sat, 28 Nov 2020 12:24:46 +0900
+Subject: [PATCH] dlt_common: Fix buffer overflow in dlt_filter_load
+
+A buffer overflow in the dlt_filter_load function in dlt_common.c in
dlt-daemon allows arbitrary code execution via an unsafe usage of fscanf,
because it does not limit the number of characters to be read in a format
argument.
+
+Fixed: #274
+
+Signed-off-by: GwanYeong Kim
+---
+ src/shared/dlt_common.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
+index 254f4ce4..d15b1cec 100644
+--- a/src/shared/dlt_common.c
b/src/shared/dlt_common.c
+@@ -404,7 +404,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const
char *filename, int verb
+ while (!feof(handle)) {
+ str1[0] = 0;
+
+-if (fscanf(handle, "%s", str1) != 1)
++if (fscanf(handle, "%254s", str1) != 1)
+ break;
+
+ if (str1[0] == 0)
+@@ -419,7 +419,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const
char *filename, int verb
+
+ str1[0] = 0;
+
+-if (fscanf(handle, "%s", str1) != 1)
++if (fscanf(handle, "%254s", str1) != 1)
+ break;
+
+ if (str1[0] == 0)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
index f3fcee4d2..5066e76d3 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
@@ -19,6 +19,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
file://0004-Modify-systemd-config-directory.patch \
file://241.patch \
file://245.patch \
+file://275.patch \
"
SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#88191):
https://lists.openembedded.org/g/openembedded-devel/message/88191
Mute This Topic: https://lists.openembedded.org/mt/78644671/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9
Debased and sent thanks
G.
On Sat, Sep 5, 2020, 09:54 Khem Raj wrote:
> On Sat, Sep 5, 2020 at 12:49 AM Gianfranco
> wrote:
> >
> > cherry-pick upstream fix for pkg-config based detection failure
> >
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../recipes-extended/brotli/brotli/838.patch | 48 +++
> > .../{brotli_1.0.7.bb => brotli_1.0.9.bb} | 7 +--
> > 2 files changed, 52 insertions(+), 3 deletions(-)
> > create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
> > rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb =>
> brotli_1.0.9.bb} (81%)
> >
> > diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch
> b/meta-oe/recipes-extended/brotli/brotli/838.patch
> > new file mode 100644
> > index 0..98b888760
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
> > @@ -0,0 +1,48 @@
> > +Upstream-Status: Backport [https://github.com/google/brotli/pull/838]
>
> I ended up merging your V2, please rebase this on master and resend
> just the delta
>
> > +From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
> > +From: Evgenii Kliuchnikov
> > +Date: Wed, 2 Sep 2020 10:49:49 +0200
> > +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files
> (#740)"
> > +
> > +This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
> > +---
> > + scripts/libbrotlicommon.pc.in | 2 +-
> > + scripts/libbrotlidec.pc.in| 2 +-
> > + scripts/libbrotlienc.pc.in| 2 +-
> > + 3 files changed, 3 insertions(+), 3 deletions(-)
> > +
> > +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/
> libbrotlicommon.pc.in
> > +index 10ca969e..2a8cf7a3 100644
> > +--- a/scripts/libbrotlicommon.pc.in
> > b/scripts/libbrotlicommon.pc.in
> > +@@ -7,5 +7,5 @@ Name: libbrotlicommon
> > + URL: https://github.com/google/brotli
> > + Description: Brotli common dictionary library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlicommon
> > ++Libs: -L${libdir} -lbrotlicommon
> > + Cflags: -I${includedir}
> > +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
> > +index e7c3124f..6f8ef2e4 100644
> > +--- a/scripts/libbrotlidec.pc.in
> > b/scripts/libbrotlidec.pc.in
> > +@@ -7,6 +7,6 @@ Name: libbrotlidec
> > + URL: https://github.com/google/brotli
> > + Description: Brotli decoder library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlidec
> > ++Libs: -L${libdir} -lbrotlidec
> > + Requires.private: libbrotlicommon >= 1.0.2
> > + Cflags: -I${includedir}
> > +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
> > +index 4dd0811b..2098afe2 100644
> > +--- a/scripts/libbrotlienc.pc.in
> > b/scripts/libbrotlienc.pc.in
> > +@@ -7,6 +7,6 @@ Name: libbrotlienc
> > + URL: https://github.com/google/brotli
> > + Description: Brotli encoder library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlienc
> > ++Libs: -L${libdir} -lbrotlienc
> > + Requires.private: libbrotlicommon >= 1.0.2
> > + Cflags: -I${includedir}
> > diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > similarity index 81%
> > rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > index 32f855844..0038ba74d 100644
> > --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > @@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues;
> > LICENSE = "MIT"
> > LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
> >
> > -SRC_URI = "git://github.com/google/brotli.git"
> > -# tag 1.0.7
> > -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> > +SRC_URI = "git://github.com/google/brotli.git \
> > + file://838.patch "
> > +# tag 1.0.9
> > +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
> > S = "${WORKDIR}/git"
> >
> > inherit cmake lib_package
> > --
> > 2.17.1
> >
> >
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86890):
https://lists.openembedded.org/g/openembedded-devel/message/86890
Mute This Topic: https://lists.openembedded.org/mt/76577994/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] brotli: set upstream-status for the patch backported from upstream
Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna --- meta-oe/recipes-extended/brotli/brotli/838.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch b/meta-oe/recipes-extended/brotli/brotli/838.patch index 8ecf2e4c9..98b888760 100644 --- a/meta-oe/recipes-extended/brotli/brotli/838.patch +++ b/meta-oe/recipes-extended/brotli/brotli/838.patch @@ -1,3 +1,4 @@ +Upstream-Status: Backport [https://github.com/google/brotli/pull/838] From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001 From: Evgenii Kliuchnikov Date: Wed, 2 Sep 2020 10:49:49 +0200 -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#86889): https://lists.openembedded.org/g/openembedded-devel/message/86889 Mute This Topic: https://lists.openembedded.org/mt/76647206/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] brotli: update to 1.0.9
cherry-pick upstream fix for pkg-config based detection failure
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../recipes-extended/brotli/brotli/838.patch | 48 +++
.../{brotli_1.0.7.bb => brotli_1.0.9.bb} | 7 +--
2 files changed, 52 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb}
(81%)
diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch
b/meta-oe/recipes-extended/brotli/brotli/838.patch
new file mode 100644
index 0..98b888760
--- /dev/null
+++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
@@ -0,0 +1,48 @@
+Upstream-Status: Backport [https://github.com/google/brotli/pull/838]
+From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
+From: Evgenii Kliuchnikov
+Date: Wed, 2 Sep 2020 10:49:49 +0200
+Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
+
+This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
+---
+ scripts/libbrotlicommon.pc.in | 2 +-
+ scripts/libbrotlidec.pc.in| 2 +-
+ scripts/libbrotlienc.pc.in| 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
+index 10ca969e..2a8cf7a3 100644
+--- a/scripts/libbrotlicommon.pc.in
b/scripts/libbrotlicommon.pc.in
+@@ -7,5 +7,5 @@ Name: libbrotlicommon
+ URL: https://github.com/google/brotli
+ Description: Brotli common dictionary library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlicommon
++Libs: -L${libdir} -lbrotlicommon
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
+index e7c3124f..6f8ef2e4 100644
+--- a/scripts/libbrotlidec.pc.in
b/scripts/libbrotlidec.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlidec
+ URL: https://github.com/google/brotli
+ Description: Brotli decoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlidec
++Libs: -L${libdir} -lbrotlidec
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
+index 4dd0811b..2098afe2 100644
+--- a/scripts/libbrotlienc.pc.in
b/scripts/libbrotlienc.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlienc
+ URL: https://github.com/google/brotli
+ Description: Brotli encoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlienc
++Libs: -L${libdir} -lbrotlienc
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
similarity index 81%
rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
index 32f855844..0038ba74d 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
@@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues;
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
-SRC_URI = "git://github.com/google/brotli.git"
-# tag 1.0.7
-SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
+SRC_URI = "git://github.com/google/brotli.git \
+ file://838.patch "
+# tag 1.0.9
+SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
S = "${WORKDIR}/git"
inherit cmake lib_package
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86886):
https://lists.openembedded.org/g/openembedded-devel/message/86886
Mute This Topic: https://lists.openembedded.org/mt/76577994/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9
This patch is a backport. Resubmitted!
G.
Il giorno sab 5 set 2020 alle ore 03:41 Khem Raj ha
scritto:
> On Fri, Sep 4, 2020 at 3:14 PM Gianfranco
> wrote:
> >
> > cherry-pick upstream fix for pkg-config based detection failure
> >
>
> Is this patch reverted upstream? if so please add appropriate
> Upstream-Status field for it in the patch header.
>
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../recipes-extended/brotli/brotli/838.patch | 47 +++
> > .../{brotli_1.0.7.bb => brotli_1.0.9.bb} | 7 +--
> > 2 files changed, 51 insertions(+), 3 deletions(-)
> > create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
> > rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb =>
> brotli_1.0.9.bb} (81%)
> >
> > diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch
> b/meta-oe/recipes-extended/brotli/brotli/838.patch
> > new file mode 100644
> > index 0..8ecf2e4c9
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
> > @@ -0,0 +1,47 @@
> > +From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
> > +From: Evgenii Kliuchnikov
> > +Date: Wed, 2 Sep 2020 10:49:49 +0200
> > +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files
> (#740)"
> > +
> > +This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
> > +---
> > + scripts/libbrotlicommon.pc.in | 2 +-
> > + scripts/libbrotlidec.pc.in| 2 +-
> > + scripts/libbrotlienc.pc.in| 2 +-
> > + 3 files changed, 3 insertions(+), 3 deletions(-)
> > +
> > +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/
> libbrotlicommon.pc.in
> > +index 10ca969e..2a8cf7a3 100644
> > +--- a/scripts/libbrotlicommon.pc.in
> > b/scripts/libbrotlicommon.pc.in
> > +@@ -7,5 +7,5 @@ Name: libbrotlicommon
> > + URL: https://github.com/google/brotli
> > + Description: Brotli common dictionary library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlicommon
> > ++Libs: -L${libdir} -lbrotlicommon
> > + Cflags: -I${includedir}
> > +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
> > +index e7c3124f..6f8ef2e4 100644
> > +--- a/scripts/libbrotlidec.pc.in
> > b/scripts/libbrotlidec.pc.in
> > +@@ -7,6 +7,6 @@ Name: libbrotlidec
> > + URL: https://github.com/google/brotli
> > + Description: Brotli decoder library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlidec
> > ++Libs: -L${libdir} -lbrotlidec
> > + Requires.private: libbrotlicommon >= 1.0.2
> > + Cflags: -I${includedir}
> > +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
> > +index 4dd0811b..2098afe2 100644
> > +--- a/scripts/libbrotlienc.pc.in
> > b/scripts/libbrotlienc.pc.in
> > +@@ -7,6 +7,6 @@ Name: libbrotlienc
> > + URL: https://github.com/google/brotli
> > + Description: Brotli encoder library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlienc
> > ++Libs: -L${libdir} -lbrotlienc
> > + Requires.private: libbrotlicommon >= 1.0.2
> > + Cflags: -I${includedir}
> > diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > similarity index 81%
> > rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > index 32f855844..0038ba74d 100644
> > --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > @@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues;
> > LICENSE = "MIT"
> > LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
> >
> > -SRC_URI = "git://github.com/google/brotli.git"
> > -# tag 1.0.7
> > -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> > +SRC_URI = "git://github.com/google/brotli.git \
> > + file://838.patch "
> > +# tag 1.0.9
> > +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
> > S = "${WORKDIR}/git"
> >
> > inherit cmake lib_package
> > --
> > 2.17.1
> >
> >
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86887):
https://lists.openembedded.org/g/openembedded-devel/message/86887
Mute This Topic: https://lists.openembedded.org/mt/76577994/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9
fixed and reuploaded thanks!
G.
Il giorno gio 3 set 2020 alle ore 16:52 Khem Raj ha
scritto:
> I am seeing cpprest failure and it seems to be related to this
>
> https://errors.yoctoproject.org/Errors/Details/498414/
>
> Fails with
>
> arm-yoe-linux-gnueabi-g++: error: unrecognized command-line option '-R'
> arm-yoe-linux-gnueabi-g++: error: unrecognized command-line option '-R'
>
> somewhere in log I see.
>
> -R/usr/lib -lbrotlidec -R/usr/lib -lbrotlienc
>
> On Wed, Sep 2, 2020 at 1:03 AM Gianfranco
> wrote:
> >
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb} | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> > rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb =>
> brotli_1.0.9.bb} (91%)
> >
> > diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > similarity index 91%
> > rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > index 32f855844..642e18f4a 100644
> > --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > @@ -7,8 +7,8 @@ LICENSE = "MIT"
> > LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
> >
> > SRC_URI = "git://github.com/google/brotli.git"
> > -# tag 1.0.7
> > -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> > +# tag 1.0.9
> > +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
> > S = "${WORKDIR}/git"
> >
> > inherit cmake lib_package
> > --
> > 2.17.1
> >
> >
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86884):
https://lists.openembedded.org/g/openembedded-devel/message/86884
Mute This Topic: https://lists.openembedded.org/mt/76577994/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] brotli: update to 1.0.9
cherry-pick upstream fix for pkg-config based detection failure
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../recipes-extended/brotli/brotli/838.patch | 47 +++
.../{brotli_1.0.7.bb => brotli_1.0.9.bb} | 7 +--
2 files changed, 51 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb}
(81%)
diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch
b/meta-oe/recipes-extended/brotli/brotli/838.patch
new file mode 100644
index 0..8ecf2e4c9
--- /dev/null
+++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
@@ -0,0 +1,47 @@
+From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
+From: Evgenii Kliuchnikov
+Date: Wed, 2 Sep 2020 10:49:49 +0200
+Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
+
+This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
+---
+ scripts/libbrotlicommon.pc.in | 2 +-
+ scripts/libbrotlidec.pc.in| 2 +-
+ scripts/libbrotlienc.pc.in| 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
+index 10ca969e..2a8cf7a3 100644
+--- a/scripts/libbrotlicommon.pc.in
b/scripts/libbrotlicommon.pc.in
+@@ -7,5 +7,5 @@ Name: libbrotlicommon
+ URL: https://github.com/google/brotli
+ Description: Brotli common dictionary library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlicommon
++Libs: -L${libdir} -lbrotlicommon
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
+index e7c3124f..6f8ef2e4 100644
+--- a/scripts/libbrotlidec.pc.in
b/scripts/libbrotlidec.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlidec
+ URL: https://github.com/google/brotli
+ Description: Brotli decoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlidec
++Libs: -L${libdir} -lbrotlidec
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
+index 4dd0811b..2098afe2 100644
+--- a/scripts/libbrotlienc.pc.in
b/scripts/libbrotlienc.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlienc
+ URL: https://github.com/google/brotli
+ Description: Brotli encoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlienc
++Libs: -L${libdir} -lbrotlienc
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
similarity index 81%
rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
index 32f855844..0038ba74d 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
@@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues;
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
-SRC_URI = "git://github.com/google/brotli.git"
-# tag 1.0.7
-SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
+SRC_URI = "git://github.com/google/brotli.git \
+ file://838.patch "
+# tag 1.0.9
+SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
S = "${WORKDIR}/git"
inherit cmake lib_package
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86883):
https://lists.openembedded.org/g/openembedded-devel/message/86883
Mute This Topic: https://lists.openembedded.org/mt/76577994/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] brotli: update to 1.0.9
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb}
(91%)
diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
similarity index 91%
rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
index 32f855844..642e18f4a 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
@@ -7,8 +7,8 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
SRC_URI = "git://github.com/google/brotli.git"
-# tag 1.0.7
-SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
+# tag 1.0.9
+SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
S = "${WORKDIR}/git"
inherit cmake lib_package
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86785):
https://lists.openembedded.org/g/openembedded-devel/message/86785
Mute This Topic: https://lists.openembedded.org/mt/76577994/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] dlt-daemon: superseed upstream pr #238 patch with pr #245 due to unexpected behaviour
Upstream commented to use the second one
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/{238.patch => 245.patch} | 53 ---
.../dlt-daemon/dlt-daemon_2.18.5.bb | 2 +-
2 files changed, 47 insertions(+), 8 deletions(-)
rename meta-oe/recipes-extended/dlt-daemon/dlt-daemon/{238.patch => 245.patch}
(65%)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
similarity index 65%
rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
index 14c44e6ed..43057489c 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
@@ -1,6 +1,6 @@
-From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
+From 57fd61ea5c58a4f9fcd7140b53ac6cd6e971ef47 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna
-Date: Fri, 31 Jul 2020 15:26:35 +0200
+Date: Fri, 31 Jul 2020 15:16:02 +0200
Subject: [PATCH] dlt_offline: fix build failures with gcc-10
see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
@@ -14,11 +14,26 @@ see bug report:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
multiple definition of `g_logstorage_cache_max';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
first defined here
/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_offline_logstorage.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
multiple definition of `g_logstorage_cache_max';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
first defined here
---
- src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/daemon/dlt_daemon_offline_logstorage.c | 1 +
+ src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
+ src/offlinelogstorage/dlt_offline_logstorage_behavior.c | 1 +
+ tests/gtest_dlt_daemon_offline_log.cpp | 1 +
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+diff --git a/src/daemon/dlt_daemon_offline_logstorage.c
b/src/daemon/dlt_daemon_offline_logstorage.c
+index 0b3c14f..db9637e 100644
+--- a/src/daemon/dlt_daemon_offline_logstorage.c
b/src/daemon/dlt_daemon_offline_logstorage.c
+@@ -56,6 +56,7 @@ DLT_STATIC DltReturnValue dlt_logstorage_split_ecuid(char
*key,
+ return DLT_RETURN_OK;
+ }
+
++unsigned int g_logstorage_cache_max;
+ /**
+ * dlt_logstorage_split_ctid
+ *
diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h
b/src/offlinelogstorage/dlt_offline_logstorage.h
-index b58da70..8ad84b8 100644
+index b58da70..c9bc93b 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage.h
+++ b/src/offlinelogstorage/dlt_offline_logstorage.h
@@ -114,9 +114,9 @@
@@ -26,10 +41,34 @@ index b58da70..8ad84b8 100644
/* logstorage max cache */
-unsigned int g_logstorage_cache_max;
-+static unsigned int g_logstorage_cache_max;
++extern unsigned int g_logstorage_cache_max;
/* current logstorage cache size */
-unsigned int g_logstorage_cache_size;
-+static unsigned int g_logstorage_cache_size;
++extern unsigned int g_logstorage_cache_size;
typedef struct
{
+diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
+index afbf8c4..edef482 100644
+--- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
+@@ -32,6 +32,7 @@
+ #include "dlt_offline_logstorage_behavior.h"
+ #include "dlt_offline_logstorage_behavior_internal.h"
+
++unsigned int g_logstorage_cache_size;
+ /**
+ * dlt_logstorage_log_file_name
+ *
+diff --git a/tests/gtest_dlt_daemon_offline_log.cpp
b/tests/gtest_dlt_daemon_offline_log.cpp
+index b8965de..0bd4d5e 100644
+--- a/tests/gtest_dlt_daemon_offline_log.cpp
b/tests/gtest_dlt_daemon_offline_log.cpp
+@@ -29,6 +29,7 @@ extern "C"
+ #include
+ }
+
++unsigned int g_logstorage_cache_max;
+ /* Begin Method: dlt_logstorage::t_dlt_logstorage_list_add*/
+ TEST(t_dlt_logstorage_list_add, normal)
+ {
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
index 3a2b40515..f3fcee4d2 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
@@ -17,8 +17,8 @@ DEPENDS = "zlib gzip-native"
SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
Re: [oe] [meta-oe][PATCH] dlt-daemon: superseed upstream pr #238 patch with pr #245 due to unexpected behaviour
Yes
I sent a new version.
Sorry
G.
On Sat, Aug 29, 2020, 09:59 Khem Raj wrote:
> On Fri, Aug 28, 2020 at 11:54 PM Gianfranco
> wrote:
> >
> > Upstream commented to use the second one
> >
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../wvdial/wvstreams/ftbfs-gcc-10.patch | 27 ++
> > .../wvdial/wvstreams_4.6.1.bb | 1 +
>
> is this spurious change ?
>
> > .../dlt-daemon/{238.patch => 245.patch} | 53 ---
> > .../dlt-daemon/dlt-daemon_2.18.5.bb | 2 +-
> > 4 files changed, 75 insertions(+), 8 deletions(-)
> > create mode 100644
> meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
> > rename meta-oe/recipes-extended/dlt-daemon/dlt-daemon/{238.patch =>
> 245.patch} (65%)
> >
> > diff --git
> a/meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
> b/meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
> > new file mode 100644
> > index 0..03d2889f1
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
> > @@ -0,0 +1,27 @@
> > +Description: Fix a build failure with gcc-10.
> > + version_major is declared as unsigned int, so "-1" value makes no
> sense here.
> > + Also, we don't want to change the variable to a public interface,
> better just ignore this
> > + debug use-case nobody probably ever used.
> > +Author: Gianfranco Costamagna
> > +Bug-Debian: https://bugs.debian.org/957964
> > +Last-Update: 2020-08-15
> > +
> > +--- wvstreams-4.6.1.orig/xplc/moduleloader.cc
> > wvstreams-4.6.1/xplc/moduleloader.cc
> > +@@ -63,11 +63,11 @@ Module* Module::loadModule(const char* m
> > + }
> > +
> > + switch(moduleinfo->version_major) {
> > +-#ifdef UNSTABLE
> > +- case -1:
> > +-/* nothing to do */
> > +-break;
> > +-#endif
> > ++//#ifdef UNSTABLE
> > ++// case -1:
> > ++///* nothing to do */
> > ++//break;
> > ++//#endif
> > + default:
> > + loaderClose(dlh);
> > + return NULL;
> > diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> > index 20becaf57..15c0a59ee 100644
> > --- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> > +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> > @@ -23,6 +23,7 @@ SRC_URI = "http://${BPN}.
> googlecode.com/files/${BP}.tar.gz
> <http://googlecode.com/files/$%7BBP%7D.tar.gz> \
> > file://openssl-buildfix.patch \
> > file://0001-Forward-port-to-OpenSSL-1.1.x.patch \
> > file://0001-Fix-narrowing-conversion-error.patch \
> > + file://ftbfs-gcc-10.patch \
> > "
> >
> > SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
> > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
> > similarity index 65%
> > rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> > rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
> > index 14c44e6ed..43057489c 100644
> > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> > +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
> > @@ -1,6 +1,6 @@
> > -From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
> > +From 57fd61ea5c58a4f9fcd7140b53ac6cd6e971ef47 Mon Sep 17 00:00:00 2001
> > From: Gianfranco Costamagna
> > -Date: Fri, 31 Jul 2020 15:26:35 +0200
> > +Date: Fri, 31 Jul 2020 15:16:02 +0200
> > Subject: [PATCH] dlt_offline: fix build failures with gcc-10
> >
> > see bug report:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
> > @@ -14,11 +14,26 @@ see bug report:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
> > /usr/bin/ld:
> CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
> multiple definition of `g_logstorage_cache_max';
> CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
> first defined here
> > /usr/bin/ld:
> CMakeFiles/dlt-daemon.dir/dlt_daemon_offline_logstorage.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
> multiple definition of `g_logstorage_cache_max';
> CMakeFiles/dlt-d
[oe] [meta-oe][PATCH] dlt-daemon: superseed upstream pr #238 patch with pr #245 due to unexpected behaviour
Upstream commented to use the second one
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../wvdial/wvstreams/ftbfs-gcc-10.patch | 27 ++
.../wvdial/wvstreams_4.6.1.bb | 1 +
.../dlt-daemon/{238.patch => 245.patch} | 53 ---
.../dlt-daemon/dlt-daemon_2.18.5.bb | 2 +-
4 files changed, 75 insertions(+), 8 deletions(-)
create mode 100644
meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
rename meta-oe/recipes-extended/dlt-daemon/dlt-daemon/{238.patch => 245.patch}
(65%)
diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
b/meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
new file mode 100644
index 0..03d2889f1
--- /dev/null
+++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/ftbfs-gcc-10.patch
@@ -0,0 +1,27 @@
+Description: Fix a build failure with gcc-10.
+ version_major is declared as unsigned int, so "-1" value makes no sense here.
+ Also, we don't want to change the variable to a public interface, better just
ignore this
+ debug use-case nobody probably ever used.
+Author: Gianfranco Costamagna
+Bug-Debian: https://bugs.debian.org/957964
+Last-Update: 2020-08-15
+
+--- wvstreams-4.6.1.orig/xplc/moduleloader.cc
wvstreams-4.6.1/xplc/moduleloader.cc
+@@ -63,11 +63,11 @@ Module* Module::loadModule(const char* m
+ }
+
+ switch(moduleinfo->version_major) {
+-#ifdef UNSTABLE
+- case -1:
+-/* nothing to do */
+-break;
+-#endif
++//#ifdef UNSTABLE
++// case -1:
++///* nothing to do */
++//break;
++//#endif
+ default:
+ loaderClose(dlh);
+ return NULL;
diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
index 20becaf57..15c0a59ee 100644
--- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
+++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
@@ -23,6 +23,7 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
file://openssl-buildfix.patch \
file://0001-Forward-port-to-OpenSSL-1.1.x.patch \
file://0001-Fix-narrowing-conversion-error.patch \
+ file://ftbfs-gcc-10.patch \
"
SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
similarity index 65%
rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
index 14c44e6ed..43057489c 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
@@ -1,6 +1,6 @@
-From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
+From 57fd61ea5c58a4f9fcd7140b53ac6cd6e971ef47 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna
-Date: Fri, 31 Jul 2020 15:26:35 +0200
+Date: Fri, 31 Jul 2020 15:16:02 +0200
Subject: [PATCH] dlt_offline: fix build failures with gcc-10
see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
@@ -14,11 +14,26 @@ see bug report:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
multiple definition of `g_logstorage_cache_max';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
first defined here
/usr/bin/ld:
CMakeFiles/dlt-daemon.dir/dlt_daemon_offline_logstorage.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
multiple definition of `g_logstorage_cache_max';
CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116:
first defined here
---
- src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/daemon/dlt_daemon_offline_logstorage.c | 1 +
+ src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
+ src/offlinelogstorage/dlt_offline_logstorage_behavior.c | 1 +
+ tests/gtest_dlt_daemon_offline_log.cpp | 1 +
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+diff --git a/src/daemon/dlt_daemon_offline_logstorage.c
b/src/daemon/dlt_daemon_offline_logstorage.c
+index 0b3c14f..db9637e 100644
+--- a/src/daemon/dlt_daemon_offline_logstorage.c
b/src/daemon/dlt_daemon_offline_logstorage.c
+@@ -56,6 +56,7 @@ DLT_STATIC DltReturnValue dlt_logstorage_split_ecuid(char
*key,
+ return DLT_RETURN_OK;
+ }
+
++unsigned int g_logstorage_cache_max;
+ /**
+ * dlt_logstorage_split_ctid
+ *
diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h
b/src/offlinelogstorage/dlt_offline_logstorage.
[oe] [meta-oe][PATCH 5/5] dlt-daemon: fix build with upstream-proposed patch for MUSL libc
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/241.patch | 30 +++
.../dlt-daemon/dlt-daemon_2.18.5.bb | 1 +
2 files changed, 31 insertions(+)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
new file mode 100644
index 0..7d8f22ec7
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
@@ -0,0 +1,30 @@
+From b8f9919f000e642fc8970d0a42c1bdadf5a9d720 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Mon, 10 Aug 2020 08:30:34 +0200
+Subject: [PATCH] sd-daemon.c: Fix build with newer glibc and musl libc
+
+Reported by Khem Raj on meta-oe list
+
+TOPDIR/build/tmp/work/armv7vet2hf-neon-yoe-linux-musleabi/dlt-daemon/2.18.5-r0/recipe-sysroot/usr/include/sys/fcntl.h:1:2:
error: redirecting incorrect #include to
[-Werror,-W#warnings]
+ ^
+1 error generated.
+
+Signed-off-by: Gianfranco Costamagna
+Signed-off-by: Gianfranco Costamagna
+---
+ systemd/3rdparty/sd-daemon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/3rdparty/sd-daemon.c b/systemd/3rdparty/sd-daemon.c
+index 88936d2..de3f985 100644
+--- a/systemd/3rdparty/sd-daemon.c
b/systemd/3rdparty/sd-daemon.c
+@@ -35,7 +35,7 @@
+ #ifdef __BIONIC__
+ #include
+ #else
+-#include
++#include
+ #endif
+ #include
+ #include
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
index e7a194ac8..3a2b40515 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
@@ -18,6 +18,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
file://0002-Don-t-execute-processes-as-a-specific-user.patch \
file://0004-Modify-systemd-config-directory.patch \
file://238.patch \
+file://241.patch \
"
SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86218):
https://lists.openembedded.org/g/openembedded-devel/message/86218
Mute This Topic: https://lists.openembedded.org/mt/76099861/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 4/5] dlt-daemon: enable some configurations by default in PACKAGECONFIG
From: Gianfranco
such as udp-connection dlt-system dlt-filetransfer and if systemd is enabled
also:
- systemd
- systemd-watchdog
- systemd-journal
- dlt-examples
- dlt-adaptor
- dlt-console
rationale is:
all of the keys above are not that heavy in building and running,
and dlt-daemon doesn't take more than some seconds to build.
Not building them by default can result in a lot of missing functionalities
to the end user, such as the ability to talk with the dlt-daemon via
bash script or Python.
The end user can still change or disable something if needed.
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
index 2bb210791..e7a194ac8 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
@@ -23,7 +23,10 @@ SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
S = "${WORKDIR}/git"
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES','systemd', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd
systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '',
d)} \
+ udp-connection dlt-system dlt-filetransfer "
+# dlt-dbus
+
# General options
PACKAGECONFIG[dlt-examples] =
"-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86217):
https://lists.openembedded.org/g/openembedded-devel/message/86217
Mute This Topic: https://lists.openembedded.org/mt/76099860/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 3/5] dlt-daemon: fix build failure when dlt-dbus is enabled, due to missing service file.
From: Gianfranco
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
index 74270b579..2bb210791 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
@@ -47,7 +47,8 @@ EXTRA_OECMAKE += "-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-system',
'dlt-system.service', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus',
'dlt-dbus.service', '', d)}"
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
SYSTEMD_SERVICE_${PN}-systemd = " \
${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor',
'dlt-adaptor-udp.service', '', d)} \
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86216):
https://lists.openembedded.org/g/openembedded-devel/message/86216
Mute This Topic: https://lists.openembedded.org/mt/76099859/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 2/5] dlt-daemon: add new dlt-filetransfer PACKAGECONFIG option
From: Gianfranco Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna --- meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb index 3f5089672..74270b579 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb @@ -37,6 +37,7 @@ 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-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" inherit autotools gettext cmake systemd -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#86215): https://lists.openembedded.org/g/openembedded-devel/message/86215 Mute This Topic: https://lists.openembedded.org/mt/76099858/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 1/5] dlt-daemon: update to 2.18.5
From: Gianfranco
- drop patch 204: upstream
- add gcc-10 build fix proposed upstream 238.patch
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../dlt-daemon/dlt-daemon/204.patch | 148 --
.../dlt-daemon/dlt-daemon/238.patch | 35 +
...-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} | 4 +-
3 files changed, 37 insertions(+), 150 deletions(-)
delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.4.bb =>
dlt-daemon_2.18.5.bb} (97%)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
deleted file mode 100644
index f0fc0bcb2..0
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-Upstream-Status: Submitted [https://github.com/GENIVI/dlt-daemon/pull/204]
-From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna
-Date: Sat, 25 Jan 2020 09:08:07 +0100
-Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
- implementation, by adding a missing include for pthread_t reference:
-
-see https://errors.yoctoproject.org/Errors/Details/308000/ for details
-
-Thanks Khem Raj for the report
-
-Signed-off-by: Gianfranco Costamagna
-Signed-off-by: Gianfranco Costamagna
- include/dlt/dlt_user.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
-index 69cb854..766d349 100644
a/include/dlt/dlt_user.h
-+++ b/include/dlt/dlt_user.h
-@@ -74,6 +74,7 @@
- \{
- */
- # include
-+# include
-
- # if !defined (__WIN32__)
- # include
-
-From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna
-Date: Sat, 25 Jan 2020 09:16:14 +0100
-Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
- compiler flags, due to uint being undefined. This is actually an "int" type,
- looking at the test implementation
-
-Signed-off-by: Gianfranco Costamagna
-Signed-off-by: Gianfranco Costamagna
- src/tests/dlt-test-init-free.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c
-index 96b5245..35b8803 100644
a/src/tests/dlt-test-init-free.c
-+++ b/src/tests/dlt-test-init-free.c
-@@ -32,7 +32,7 @@
-
- void exec(const char *cmd, char *buffer, size_t length);
- void printMemoryUsage();
--char *occupyMemory(uint size);
-+char *occupyMemory(int size);
- void do_example_test();
- void do_dlt_test();
-
-@@ -131,7 +131,7 @@ void printMemoryUsage()
- printf("%s", result);
- }
-
--char *occupyMemory(uint size)
-+char *occupyMemory(int size)
- {
- char *buf = (char *)malloc(size * sizeof(char));
-
-
-From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna
-Date: Sat, 25 Jan 2020 09:20:48 +0100
-Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include header, now
- glibc/musl wants poll.h being included directly. This fixes a build failure
- on musl systems with strict c hardening flags
-
-Signed-off-by: Gianfranco Costamagna
-Signed-off-by: Gianfranco Costamagna
- src/console/logstorage/dlt-logstorage-ctrl.c | 2 +-
- src/daemon/dlt_daemon_event_handler.c| 2 +-
- src/daemon/dlt_daemon_event_handler.h| 2 +-
- src/daemon/dlt_daemon_event_handler_types.h | 2 +-
- src/lib/dlt_user.c | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c
b/src/console/logstorage/dlt-logstorage-ctrl.c
-index 525c137..6614f44 100644
a/src/console/logstorage/dlt-logstorage-ctrl.c
-+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
-@@ -61,7 +61,7 @@
- #include
- #include
-
--#include
-+#include
-
- #if defined(__linux__)
- # include "sd-daemon.h"
-diff --git a/src/daemon/dlt_daemon_event_handler.c
b/src/daemon/dlt_daemon_event_handler.c
-index 1611f7b..0d463da 100644
a/src/daemon/dlt_daemon_event_handler.c
-+++ b/src/daemon/dlt_daemon_event_handler.c
-@@ -30,7 +30,7 @@
- #include
- #include
-
--#include
-+#include
- #include
-
- #include "dlt_common.h"
-diff --git a/src/daemon/dlt_daemon_event_handler.h
b/src/daemon/dlt_daemon_event_handler.h
-index eb96101..bd550d3 100644
a/src/daemon/dlt_daemon_event_handler.h
-+++ b/src/daemon/dlt_daemon_event_handler.h
-@@ -25,7 +25,7 @@
- * \file dlt_daemon_event_handler.h
- */
-
--#include
-+#include
-
- #include "dlt_daemon_connection_types.h"
- #include "dlt_daemon_event_handler_types.h"
-diff --git a/src/daemon/dlt_daemon_event_handler_types.h
b/src/daemon/dlt_daemon_event_handler_types.h
-index 370e503..0b16d08 10
Re: [oe] [meta-oe][PATCH 1/4] dlt-daemon: update to 2.18.5
Reproduced with systemd enabled.
Will craft a patch and resubmit next week also upstream
G.
On Mon, Aug 3, 2020, 04:00 Khem Raj wrote:
>
>
> On Sun, Aug 2, 2020 at 3:05 PM Gianfranco Costamagna <
> costamagna.gianfra...@gmail.com> wrote:
>
>> Hello
>>
>> I tried to reproduce by running everything on master (master-next for
>> meta-oe) and bitbake dlt-daemon with MACHINE set to raspberrypi4 or qemux86
>> and DISTRO=poky-tiny.
>> I also tried with and without systemd.
>>
>> It builds just fine.
>> Do you have a way to share bblayers.conf and local.conf files please?
>>
>
> It’s perhaps revealed with glibc upgrade patch that I have staged in
> yoe/mut branch on yoe distro I will look a bit as well
>
>
>> Thanks
>>
>> Gianfranco
>>
>> On Sun, Aug 2, 2020, 09:01 Khem Raj wrote:
>>
>>> This fails on musl
>>>
>>> http://errors.yoctoproject.org/Errors/Details/427081/
>>>
>>> On Fri, Jul 31, 2020 at 7:43 AM Gianfranco
>>> wrote:
>>> >
>>> > - drop patch 204: upstream
>>> > - add gcc-10 build fix proposed upstream 238.patch
>>> >
>>> > Signed-off-by: Gianfranco Costamagna
>>> > Signed-off-by: Gianfranco Costamagna
>>> > ---
>>> > .../dlt-daemon/dlt-daemon/204.patch | 148 --
>>> > .../dlt-daemon/dlt-daemon/238.patch | 35 +
>>> > ...-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} | 4 +-
>>> > 3 files changed, 37 insertions(+), 150 deletions(-)
>>> > delete mode 100644
>>> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>>> > create mode 100644
>>> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
>>> > rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.4.bb =>
>>> dlt-daemon_2.18.5.bb} (97%)
>>> >
>>> > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>>> b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>>> > deleted file mode 100644
>>> > index f0fc0bcb2..0
>>> > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>>> > +++ /dev/null
>>> > @@ -1,148 +0,0 @@
>>> > -Upstream-Status: Submitted [
>>> https://github.com/GENIVI/dlt-daemon/pull/204]
>>> > -From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
>>> > -From: Gianfranco Costamagna
>>> > -Date: Sat, 25 Jan 2020 09:08:07 +0100
>>> > -Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
>>> > - implementation, by adding a missing include for pthread_t reference:
>>> > -
>>> > -see https://errors.yoctoproject.org/Errors/Details/308000/ for
>>> details
>>> > -
>>> > -Thanks Khem Raj for the report
>>> > -
>>> > -Signed-off-by: Gianfranco Costamagna
>>> > -Signed-off-by: Gianfranco Costamagna
>>> >
>>> > - include/dlt/dlt_user.h | 1 +
>>> > - 1 file changed, 1 insertion(+)
>>> > -
>>> > -diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
>>> > -index 69cb854..766d349 100644
>>> > a/include/dlt/dlt_user.h
>>> > -+++ b/include/dlt/dlt_user.h
>>> > -@@ -74,6 +74,7 @@
>>> > - \{
>>> > - */
>>> > - # include
>>> > -+# include
>>> > -
>>> > - # if !defined (__WIN32__)
>>> > - # include
>>> > -
>>> > -From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
>>> > -From: Gianfranco Costamagna
>>> > -Date: Sat, 25 Jan 2020 09:16:14 +0100
>>> > -Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
>>> > - compiler flags, due to uint being undefined. This is actually an
>>> "int" type,
>>> > - looking at the test implementation
>>> > -
>>> > -Signed-off-by: Gianfranco Costamagna
>>> > -Signed-off-by: Gianfranco Costamagna
>>> >
>>> > - src/tests/dlt-test-init-free.c | 4 ++--
>>> > - 1 file changed, 2 insertions(+), 2 deletions(-)
>>> > -
>>> > -diff --git a/src/tests/dlt-test-init-free.c
>>> b/src/tests/dlt-test-init-free.c
>>> > -index 96b5245..35b8803 100644
>>> > a/src/tests/dlt-test-init-free.c
>>> > -+++ b/src/tests/dlt-test-init-free.c
>>> > -@@
Re: [oe] [meta-oe][PATCH 1/4] dlt-daemon: update to 2.18.5
Hello
I tried to reproduce by running everything on master (master-next for
meta-oe) and bitbake dlt-daemon with MACHINE set to raspberrypi4 or qemux86
and DISTRO=poky-tiny.
I also tried with and without systemd.
It builds just fine.
Do you have a way to share bblayers.conf and local.conf files please?
Thanks
Gianfranco
On Sun, Aug 2, 2020, 09:01 Khem Raj wrote:
> This fails on musl
>
> http://errors.yoctoproject.org/Errors/Details/427081/
>
> On Fri, Jul 31, 2020 at 7:43 AM Gianfranco
> wrote:
> >
> > - drop patch 204: upstream
> > - add gcc-10 build fix proposed upstream 238.patch
> >
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../dlt-daemon/dlt-daemon/204.patch | 148 --
> > .../dlt-daemon/dlt-daemon/238.patch | 35 +
> > ...-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} | 4 +-
> > 3 files changed, 37 insertions(+), 150 deletions(-)
> > delete mode 100644
> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
> > create mode 100644
> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> > rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.4.bb =>
> dlt-daemon_2.18.5.bb} (97%)
> >
> > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
> b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
> > deleted file mode 100644
> > index f0fc0bcb2..0
> > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
> > +++ /dev/null
> > @@ -1,148 +0,0 @@
> > -Upstream-Status: Submitted [
> https://github.com/GENIVI/dlt-daemon/pull/204]
> > -From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
> > -From: Gianfranco Costamagna
> > -Date: Sat, 25 Jan 2020 09:08:07 +0100
> > -Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
> > - implementation, by adding a missing include for pthread_t reference:
> > -
> > -see https://errors.yoctoproject.org/Errors/Details/308000/ for details
> > -
> > -Thanks Khem Raj for the report
> > -
> > -Signed-off-by: Gianfranco Costamagna
> > -Signed-off-by: Gianfranco Costamagna
> >
> > - include/dlt/dlt_user.h | 1 +
> > - 1 file changed, 1 insertion(+)
> > -
> > -diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
> > -index 69cb854..766d349 100644
> > a/include/dlt/dlt_user.h
> > -+++ b/include/dlt/dlt_user.h
> > -@@ -74,6 +74,7 @@
> > - \{
> > - */
> > - # include
> > -+# include
> > -
> > - # if !defined (__WIN32__)
> > - # include
> > -
> > -From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
> > -From: Gianfranco Costamagna
> > -Date: Sat, 25 Jan 2020 09:16:14 +0100
> > -Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
> > - compiler flags, due to uint being undefined. This is actually an "int"
> type,
> > - looking at the test implementation
> > -
> > -Signed-off-by: Gianfranco Costamagna
> > -Signed-off-by: Gianfranco Costamagna
> >
> > - src/tests/dlt-test-init-free.c | 4 ++--
> > - 1 file changed, 2 insertions(+), 2 deletions(-)
> > -
> > -diff --git a/src/tests/dlt-test-init-free.c
> b/src/tests/dlt-test-init-free.c
> > -index 96b5245..35b8803 100644
> > a/src/tests/dlt-test-init-free.c
> > -+++ b/src/tests/dlt-test-init-free.c
> > -@@ -32,7 +32,7 @@
> > -
> > - void exec(const char *cmd, char *buffer, size_t length);
> > - void printMemoryUsage();
> > --char *occupyMemory(uint size);
> > -+char *occupyMemory(int size);
> > - void do_example_test();
> > - void do_dlt_test();
> > -
> > -@@ -131,7 +131,7 @@ void printMemoryUsage()
> > - printf("%s", result);
> > - }
> > -
> > --char *occupyMemory(uint size)
> > -+char *occupyMemory(int size)
> > - {
> > - char *buf = (char *)malloc(size * sizeof(char));
> > -
> > -
> > -From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001
> > -From: Gianfranco Costamagna
> > -Date: Sat, 25 Jan 2020 09:20:48 +0100
> > -Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include
> header, now
> > - glibc/musl wants poll.h being included directly. This fixes a build
> failure
> > - on musl systems with strict c hardening flags
> > -
> > -Signed-off-by: Gianfranco Costamagna
> > -Signed-off-by: Gianfranco Costamagna
> >
> > - src/console/logstorage/dlt-logstorag
[oe] [meta-oe][PATCH 4/4] dlt-daemon: enable some configurations by default in PACKAGECONFIG
such as udp-connection dlt-system dlt-filetransfer and if systemd is enabled
also:
- systemd
- systemd-watchdog
- systemd-journal
- dlt-examples
- dlt-adaptor
- dlt-console
rationale is:
all of the keys above are not that heavy in building and running,
and dlt-daemon doesn't take more than some seconds to build.
Not building them by default can result in a lot of missing functionalities
to the end user, such as the ability to talk with the dlt-daemon via
bash script or Python.
The end user can still change or disable something if needed.
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
index 2bb210791..e7a194ac8 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
@@ -23,7 +23,10 @@ SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
S = "${WORKDIR}/git"
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES','systemd', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd
systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '',
d)} \
+ udp-connection dlt-system dlt-filetransfer "
+# dlt-dbus
+
# General options
PACKAGECONFIG[dlt-examples] =
"-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86095):
https://lists.openembedded.org/g/openembedded-devel/message/86095
Mute This Topic: https://lists.openembedded.org/mt/75908507/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
