[oe][meta-oe][kirkstone][PATCH 1/1] indent: fix CVE-2023-40305
From: Yogita Urade GNU indent 2.2.13 has a heap-based buffer overflow in search_brace in indent.c via a crafted file. Reference: https://savannah.gnu.org/bugs/index.php?64503 Signed-off-by: Yogita Urade --- .../indent/indent/CVE-2023-40305_0001.patch | 4196 .../indent/indent/CVE-2023-40305_0002.patch | 4254 + .../recipes-extended/indent/indent_2.2.12.bb |2 + 3 files changed, 8452 insertions(+) create mode 100644 meta-oe/recipes-extended/indent/indent/CVE-2023-40305_0001.patch create mode 100644 meta-oe/recipes-extended/indent/indent/CVE-2023-40305_0002.patch diff --git a/meta-oe/recipes-extended/indent/indent/CVE-2023-40305_0001.patch b/meta-oe/recipes-extended/indent/indent/CVE-2023-40305_0001.patch new file mode 100644 index 00..367202e3c5 --- /dev/null +++ b/meta-oe/recipes-extended/indent/indent/CVE-2023-40305_0001.patch @@ -0,0 +1,4196 @@ +From df4ab2d19e247d059e0025789ba513418073ab6f Mon Sep 17 00:00:00 2001 +From: Petr Písař +Date: Thu, 19 Oct 2023 07:36:32 + +Subject: [PATCH] Fix an out-of-buffer read in search_brace()/lexi() on an + condition without parentheses followed with an overlong comment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reproducer: + +$ hexdump -C /tmp/short + 69 66 20 30 3b 65 6c 73 65 2f 2a 0a 0a 0a 0a 0a |if 0;else/*.| +0010 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a || +* +0800 0a 0a 2a 2f 78 0a |..*/x.| +0806 + +$ valgrind -- ./indent -o /dev/null /tmp/short +[...] +==21830== Invalid read of size 1 +==21830==at 0x40586A: lexi (lexi.c:251) +==21830==by 0x40198C: search_brace (indent.c:387) +==21830==by 0x401CC2: indent_main_loop (indent.c:548) +==21830==by 0x402298: indent (indent.c:758) +==21830==by 0x402941: indent_single_file (indent.c:1003) +==21830==by 0x402A0F: indent_all (indent.c:1041) +==21830==by 0x402BC5: main (indent.c:1122) +==21830== Address 0x4ab2210 is 0 bytes inside a block of size 2,048 free'd +==21830==at 0x4847A40: realloc (vg_replace_malloc.c:1649) +==21830==by 0x408BC0: xrealloc (globs.c:64) +==21830==by 0x40BF03: need_chars (handletoken.c:89) +==21830==by 0x401433: sw_buffer (indent.c:149) +==21830==by 0x401973: search_brace (indent.c:380) +==21830==by 0x401CC2: indent_main_loop (indent.c:548) +==21830==by 0x402298: indent (indent.c:758) +==21830==by 0x402941: indent_single_file (indent.c:1003) +==21830==by 0x402A0F: indent_all (indent.c:1041) +==21830==by 0x402BC5: main (indent.c:1122) +==21830== Block was alloc'd at +==21830==at 0x4847A40: realloc (vg_replace_malloc.c:1649) +==21830==by 0x408BC0: xrealloc (globs.c:64) +==21830==by 0x40BF03: need_chars (handletoken.c:89) +==21830==by 0x401696: search_brace (indent.c:281) +==21830==by 0x401CC2: indent_main_loop (indent.c:548) +==21830==by 0x402298: indent (indent.c:758) +==21830==by 0x402941: indent_single_file (indent.c:1003) +==21830==by 0x402A0F: indent_all (indent.c:1041) +==21830==by 0x402BC5: main (indent.c:1122) + +The cause was that need_chars(_com, ...) could reallocate save_com.ptr +pointer keeping a dangling copy of that pointer saved to buf_ptr +a line above. + +Related to CVE-2023-40305 + +Signed-off-by: Petr Písař + +CVE: CVE-2023-40305 + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/indent.git/commit/?id=df4ab2d19e247d059e0025789ba513418073ab6f] + +Signed-off-by: Yogita Urade +--- + regression/TEST |3 +- + regression/input/comment-heap-overread.c| 2040 ++ + regression/standard/comment-heap-overread.c | 2042 +++ + src/indent.c|2 +- + 4 files changed, 4085 insertions(+), 2 deletions(-) + create mode 100644 regression/input/comment-heap-overread.c + create mode 100644 regression/standard/comment-heap-overread.c + +diff --git a/regression/TEST b/regression/TEST +index 56f41d9..a7a6747 100755 +--- a/regression/TEST b/regression/TEST +@@ -37,7 +37,8 @@ BUGS="case-label.c one-line-1.c one-line-2.c one-line-3.c \ + one-line-4.c struct-decl.c sizeof-in-while.c line-break-comment.c \ + macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c \ + bug-gnu-33364.c float-constant-suffix.c block-comments.c \ +-no-forced-nl-in-block-init.c hexadecimal_float.c" ++no-forced-nl-in-block-init.c hexadecimal_float.c \ ++comment-heap-overread.c" + + INDENTSRC="args.c backup.h backup.c dirent_def.h globs.c indent.h \ + indent.c indent_globs.h io.c lexi.c memcpy.c parse.c pr_comment.c \ +diff --git a/regression/input/comment-heap-overread.c b/regression/input/comment-heap-overread.c +new file mode 100644 +index 000..5b0b172 +--- /dev/null b/regression/input/comment-heap-overread.c +@@ -0,0 +1,2040 @@
[oe][meta-oe][dunfell][PATCH] libssh2: Backport fix for CVE-2020-22218
From: Vijay Anusuri Bug: https://github.com/libssh2/libssh2/pull/476 Upstream-Status: Backport [https://github.com/libssh2/libssh2/commit/642eec48ff3adfdb7a9e562b6d7fc865d1733f45 & https://github.com/libssh2/libssh2/commit/0b44e558f311671f6e6d14c559bc1c9bda59b8df] Signed-off-by: Vijay Anusuri --- .../libssh2/files/CVE-2020-22218.patch| 39 +++ .../recipes-support/libssh2/libssh2_1.9.0.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta-oe/recipes-support/libssh2/files/CVE-2020-22218.patch diff --git a/meta-oe/recipes-support/libssh2/files/CVE-2020-22218.patch b/meta-oe/recipes-support/libssh2/files/CVE-2020-22218.patch new file mode 100644 index 0..49dbde737 --- /dev/null +++ b/meta-oe/recipes-support/libssh2/files/CVE-2020-22218.patch @@ -0,0 +1,39 @@ +From 642eec48ff3adfdb7a9e562b6d7fc865d1733f45 Mon Sep 17 00:00:00 2001 +From: lutianxiong +Date: Fri, 29 May 2020 01:25:40 +0800 +Subject: [PATCH] transport.c: fix use-of-uninitialized-value (#476) + +file:transport.c + +notes: +return error if malloc(0) + +credit: +lutianxiong + +Bug: https://github.com/libssh2/libssh2/pull/476 +Upstream-Status: Backport [https://github.com/libssh2/libssh2/commit/642eec48ff3adfdb7a9e562b6d7fc865d1733f45 +& +https://github.com/libssh2/libssh2/commit/0b44e558f311671f6e6d14c559bc1c9bda59b8df] +CVE: CVE-2020-22218 +Signed-off-by: Vijay Anusuri +--- + src/transport.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/transport.c b/src/transport.c +index 45e445c..35e7df3 100644 +--- a/src/transport.c b/src/transport.c +@@ -465,7 +465,7 @@ int _libssh2_transport_read(LIBSSH2_SESSION * session) + * or less (including length, padding length, payload, + * padding, and MAC.)." + */ +-if(total_num > LIBSSH2_PACKET_MAXPAYLOAD) { ++if(total_num > LIBSSH2_PACKET_MAXPAYLOAD || total_num == 0) { + return LIBSSH2_ERROR_OUT_OF_BOUNDARY; + } + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index c1f337a44..e11e66376 100644 --- a/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://CVE-2019-17498.patch \ + file://CVE-2020-22218.patch \ " SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105608): https://lists.openembedded.org/g/openembedded-devel/message/105608 Mute This Topic: https://lists.openembedded.org/mt/102075624/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 v3] dnf-plugin-tui: create symlinks from /usr/ to /.
On Thu, Oct 19, 2023 at 8:25 PM wangmy wrote: > > > Sounds a bit like the symlink creation should be moved into base-files... > Yes, we also think that it should be moved into base-files. Right until then I will install this patch. > > -- > Best Regards > --- > Wang Mingyu > Development Dept.I > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, > Nanjing, 210012, China > TEL: +86+25-86630566-8568 > COINS: 79988548 > FAX: +86+25-83317685 > MAIL: wan...@fujitsu.com > http://www.fujitsu.com/cn/fnst/ > > > -Original Message- > > From: Ross Burton > > Sent: Thursday, October 19, 2023 5:05 PM > > To: Wang, Mingyu/王 鸣瑜 > > Cc: openembedded-devel@lists.openembedded.org > > Subject: Re: [oe] [meta-oe] [PATCH v3] dnf-plugin-tui: create symlinks from > > /usr/ > > to /. > > > > On 19 Oct 2023, at 07:51, Mingyu Wang (Fujitsu) > > wrote: > > > > > >> Isn’t this what create_merged_usr_symlinks in image.bbclass does? > > >> Why does a DNF plugin need to do this, and not anything else? > > > Because dnf-plugin-tui is used to created rootfs in any nativesdk > > > environment. > > > It is not in a bitbake environment, so image.bbclass cannot be used. > > > > Sounds a bit like the symlink creation should be moved into base-files... > > > > Ross > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105607): https://lists.openembedded.org/g/openembedded-devel/message/105607 Mute This Topic: https://lists.openembedded.org/mt/102013374/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 v3] dnf-plugin-tui: create symlinks from /usr/ to /.
> Sounds a bit like the symlink creation should be moved into base-files... Yes, we also think that it should be moved into base-files. -- Best Regards --- Wang Mingyu Development Dept.I Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China TEL: +86+25-86630566-8568 COINS: 79988548 FAX: +86+25-83317685 MAIL: wan...@fujitsu.com http://www.fujitsu.com/cn/fnst/ > -Original Message- > From: Ross Burton > Sent: Thursday, October 19, 2023 5:05 PM > To: Wang, Mingyu/王 鸣瑜 > Cc: openembedded-devel@lists.openembedded.org > Subject: Re: [oe] [meta-oe] [PATCH v3] dnf-plugin-tui: create symlinks from > /usr/ > to /. > > On 19 Oct 2023, at 07:51, Mingyu Wang (Fujitsu) > wrote: > > > >> Isn’t this what create_merged_usr_symlinks in image.bbclass does? > >> Why does a DNF plugin need to do this, and not anything else? > > Because dnf-plugin-tui is used to created rootfs in any nativesdk > > environment. > > It is not in a bitbake environment, so image.bbclass cannot be used. > > Sounds a bit like the symlink creation should be moved into base-files... > > Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105606): https://lists.openembedded.org/g/openembedded-devel/message/105606 Mute This Topic: https://lists.openembedded.org/mt/102013374/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-perl][PATCH 1/2] po4a: remove old recipe
Turns out the query was flawed, no recipes DEPENDS on po4a, but instead po4a-native: https://layers.openembedded.org/layerindex/branch/master/recipes/?q=depends%3Apo4a-native Strangely enough, this highlights a recipe in oe-core: dos2unix https://git.openembedded.org/openembedded-core/tree/meta/recipes-support/dos2unix/dos2unix_7.5.1.bb?h=master#n25 On Wed, Oct 18, 2023 at 6:13 PM Tim Orling via lists.openembedded.org wrote: > po4a has been failing AUH upgrades for a long time now. > The latest attempt to get ptests working for it can be found at: > > https://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/po4a_0.69%2bptest > > If you care about this recipe, please continue the effort above and get > ptests functional. > > According to the layerindex, the po4a recipe is not depended upon by any > other known recipes: > > https://layers.openembedded.org/layerindex/branch/master/recipes/?q=depends%3Apo4a > > (debsums in meta-oe dynamic-layers will be removed in another commit) > > Signed-off-by: Tim Orling > --- > .../packagegroups/packagegroup-meta-perl.bb | 1 - > meta-perl/recipes-perl/po4a/po4a_0.49.bb | 33 --- > 2 files changed, 34 deletions(-) > delete mode 100644 meta-perl/recipes-perl/po4a/po4a_0.49.bb > > diff --git a/meta-perl/recipes-core/packagegroups/ > packagegroup-meta-perl.bb b/meta-perl/recipes-core/packagegroups/ > packagegroup-meta-perl.bb > index 187424b44..2672ab584 100644 > --- a/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb > +++ b/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb > @@ -79,7 +79,6 @@ RDEPENDS:packagegroup-meta-perl = "\ > libtest-nowarnings-perl \ > libtest-warn-perl \ > libunicode-linebreak-perl \ > -po4a \ > " > > RDEPENDS:packagegroup-meta-perl-extended = "\ > diff --git a/meta-perl/recipes-perl/po4a/po4a_0.49.bb > b/meta-perl/recipes-perl/po4a/po4a_0.49.bb > deleted file mode 100644 > index 679ea0fb4..0 > --- a/meta-perl/recipes-perl/po4a/po4a_0.49.bb > +++ /dev/null > @@ -1,33 +0,0 @@ > -SUMMARY = "PO for anything" > -DESCRIPTION = "The po4a (PO for anything) project goal is to ease > translations \ > -(and more interestingly, the maintenance of translations) using gettext > tools \ > -on areas where they were not expected like documentation." > -HOMEPAGE = "https://po4a.alioth.debian.org; > -LICENSE = "GPL-2.0-only" > -LIC_FILES_CHKSUM = "file://COPYING;md5=a96fc9b4cc36d80659e694ea109f0325" > - > -SRC_URI = "git:// > github.com/mquinson/po4a.git;protocol=https;branch=master" > - > -# v0.49 > -SRCREV = "79ed87a577a543538fe39c7b60079981f5997072" > - > -S = "${WORKDIR}/git" > - > -DEPENDS = " \ > -libmodule-build-perl-native \ > -libtext-wrapi18n-perl \ > -libterm-readkey-perl \ > -liblocale-gettext-perl \ > -libunicode-linebreak-perl \ > -" > - > -RRECOMMENDS:${PN} = " \ > -libtext-wrapi18n-perl \ > -libterm-readkey-perl \ > -liblocale-gettext-perl \ > -libunicode-linebreak-perl \ > -" > - > -inherit cpan_build > - > -BBCLASSEXTEND = "native" > -- > 2.34.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105605): https://lists.openembedded.org/g/openembedded-devel/message/105605 Mute This Topic: https://lists.openembedded.org/mt/102052086/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-networking][PATCH] samba.bb : Disable ad-dc by default
When this feature is enabled by default in packageconfig this implies a dependency to python3-dnspython which is in meta-python. Disable ac-dc PACKAGECONFIG by default to avoid adding a layer dependency only for this feature. Signed-off-by: Fabien Thomas Reviewed-by: Yoann Congal --- meta-networking/recipes-connectivity/samba/samba_4.18.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb b/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb index dc9bc1a7f..f80742640 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb @@ -74,7 +74,7 @@ export WAF_NO_PREFORK="yes" # Use krb5. Build active domain controller. # PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ - acl cups ad-dc ldap mitkrb5 \ + acl cups ldap mitkrb5 \ " PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105604): https://lists.openembedded.org/g/openembedded-devel/message/105604 Mute This Topic: https://lists.openembedded.org/mt/102062311/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [OE-core] Detecting unimplemented ptests with heuristics
Hi Yoann On 19.10.23 at 10:00, Yoann Congal wrote: Hi everyone, We recently implemented a way to detect recipes for upstream code that contain unit tests but does not implement ptests. Those recipes make good candidates for increasing the ptests coverage. This is implemented as a QA check. The check is disabled by default since it generates a lot of warning at build. In order to activate it (in local.conf for exemple) : WARN_QA += "unimplemented-ptest" The warnings looks like: WARNING: time-1.9-r0 do_patch: QA Issue: time: autotools-based tests detected [unimplemented-ptest] I've generated the list for the unimplemented ptests for oe-core and for meta-openembedded: 329 unimplemented-ptests_oe-core.log: https://gist.github.com/ycongal-smile/dd51b0e450a8f0083e9d5cc10eeeb060#file-unimplemented-ptests_oe-core-log 1080 unimplemented-ptests_meta-openembedded.log: https://gist.github.com/ycongal-smile/dd51b0e450a8f0083e9d5cc10eeeb060#file-unimplemented-ptests_meta-openembedded-log Thanks, indeed, I "own" recipes that were flagged :) Maybe, you could find a way to notify the maintainers of such recipes, as in the AUH upgrade status reports (https://lists.openembedded.org/g/openembedded-core/message/188589 for example). Cheers Michael. -- Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105603): https://lists.openembedded.org/g/openembedded-devel/message/105603 Mute This Topic: https://lists.openembedded.org/mt/102062196/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/1] nodejs: upgrade 18.17.1 -> 20.5.1
On Wed, Oct 18, 2023 at 8:40 PM Khem Raj wrote: > On Wed, Oct 18, 2023 at 4:19 PM Tim Orling wrote: > > > > > > > > On Wed, Oct 18, 2023 at 1:41 PM Martin Jansa > wrote: > >> > >> I've narrowed this down to simple reproducer with webpack creating pack > with "hello world" as shown in: > >> https://github.com/shr-project/com.webos.app.minimal/tree/recipes > >> > >> Then with this reproducer I've bisected it to nodejs-20.3.0 with libuv > upgrade 1.45.0 which brings support for io_uring which doesn't work with > pseudo in: > >> > https://github.com/libuv/libuv/pull/3952/commits/26c79a942b92573a1388c0ee8a6ad4397f009318 > >> > >> Now we have 3 options: > >> > >> 1) either every use of nodejs-native where io_uring might be used (like > in webpack) needs to export UV_USE_IO_URING=0 before using node, but be > aware that the PR says it's only temporary and this variable might be > removed in future. Unfortunately many people are lucky enough not to know > what pseudo even is, so they might not realize that host-user-contamination > QA issues or "KeyError: 'getpwuid(): uid not found" might be related to > this (and they probably won't find this e-mail as well). > >> > >> 2) revert the io_uring changes from bundled libuv, I've already > verified this with nodejs-20.3.0, for 20.8.1 it would need couple more > commits to be reverted as 20.8.1 uses even newer libuv-1.46.0. The changes > are massive and it will be PIA to update them for every nodejs release, > patch for keeping UV_USE_IO_URING support after it's removed from upstream > libuv will be much smaller, but PIA to use UV_USE_IO_URING whenever using > nodejs-native during build. > >> > >> 3) fix pseudo to correctly work with io_uring calls, definitely best > long-term solution as more and more tools will now switch to io_uring, but > without active maintainer of pseudo it might be _very_ difficult to > implement this and there aren't many people willing to touch this beast. > >> > >> Any opinions? > >> > > > > I would advise we not be overly aggressive about updates for important > tools like NodeJS and Django. > > > > I don't think many consumers are building products on the latest > greatest NodeJS release (which this isn't, latest is 21), many may not even > be on the latest LTS (18 vs.16). While we can have a floating "latest" > recipe, we should keep an LTS recipe. > > We tried to do this for Django in meta-python, but later commits wiped > out the comments and the upstream check. > > > https://git.openembedded.org/meta-openembedded/commit/meta-python/recipes-devtools/python?id=961755a7bd17f7347f7dd0f2de3d2400a9c36f09 > > > > 20.x is next LTS and we already branched nanbield with 18.x, for > master and upcoming yocto LTS release in April 2024, I would like to > see up move to 20.x and figure out > problems during this time early enough so we can stick to 20.x for > yocto LTS. Unless we run into blocker issues. > > For anyone else trying to catch up, in the "Active LTS Start" column you can see when a given release will become an LTS: https://github.com/nodejs/Release It is also in the release announcement for 21: https://nodejs.org/en/blog/announcements/v21-release-announce "Node.js 21 will replace Node.js 20 as our ‘Current’ release line when Node.js 20 enters long-term support (LTS) later this month. As per the release schedule, Node.js 21 will be ‘Current' release for the next 6 months, until April 2024" Unfortunately, the nodejs landing page doesn't have any indication. https://nodejs.org/en > > >> On Mon, Oct 2, 2023 at 7:08 PM Martin Jansa via lists.openembedded.org > wrote: > >>> > >>> On Thu, Sep 28, 2023 at 11:13 AM Polampalli, Archana via > lists.openembedded.org windriver@lists.openembedded.org> wrote: > > Update to latest release of latest LTS 20 release > > * node v20 introduces several new features and fixes many bugs > and CVEs as shown in [1] > > * Refresh 0001-liftoff-Correct-function-signatures.patch against > 20.5.1 > > * License-Update: > - Change zlib version 1.2.13, October 13th, 2022 to version > 1.2.13.1, October xxth, 2022 [2] > - Change Copyright 2023 from Ada authors to Yagiz Nizipli and > Daniel Lemire [4] > > * Remove big-endian.patch as it is merged in v20.x [5] [6] > > * Remove below list of patches since mips32 is deleted from v8 as > part of update V8 to 10.7.193.13 [7] [8] > - mips-less-memory.patch > - 0001-mips-Use-32bit-cast-for-operand-on-mips32.patch > > * Update Using-native-binaries.patch for node_js2c, it resolved > below do_compile error [9] > Error: > /bin/sh: line 1: > build/tmp/work/core2-64-poky-linux/nodejs/20.5.1/node-v20.5.1/out/Release/node_js2c: > No such file or directory > > * Remove obsolete dtrace & etw configure options (we had: > --without-) from the recipe [10] > >>> > >>> > >>> FYI: (in case someone else
Re: [oe] [meta-java][master][PATCH] meta-java: Adapt LICENSE as SPDX identifiers
On Thu, Oct 19, 2023 at 03:04 PM, Jermain Horsman wrote: > > On Wed, Oct 18, 2023 at 12:44 PM, akash hadke wrote: > > >> diff --git a/recipes-core/cacao/cacao_git.bb >> b/recipes-core/cacao/cacao_git.bb >> index fef7f34..80129b1 100644 >> --- a/recipes-core/cacao/cacao_git.bb >> +++ b/recipes-core/cacao/cacao_git.bb >> @@ -1,6 +1,6 @@ >> SUMMARY = "CacaoVM for use as OpenEmbedded's Java VM" >> HOMEPAGE = " http://www.cacaojvm.org/; >> -LICENSE = "GPL-2.0" >> +LICENSE = "GPL-2.0-only" >> LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" >> SECTION = "interpreters" > > You might want to double check the source, > a quick look at e.g. https://bitbucket.org/cacaovm/cacao/src/master/COPYING > : > > This program is free software; you can redistribute it and/or modify > it under the terms of the GNU General Public License as published by > the Free Software Foundation; either version 2 of the License, or > (at your option) any later version. > > shows this should be 'GPL-2.0-or-later' instead. I only executed poky/scripts/contrib/convert-spdx-licenses.py script to update the LICENSEs as per kirkstone. I did not check the source. If you want I can share a separate patch to update LICENSE for this specific component. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105601): https://lists.openembedded.org/g/openembedded-devel/message/105601 Mute This Topic: https://lists.openembedded.org/mt/102036346/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 2/2] debsums: remove old recipe
On Wed, Oct 18, 2023 at 08:30:27PM -0700, Khem Raj wrote: > Adding Tom since he added it back in 2017. > > On Wed, Oct 18, 2023 at 6:14 PM Tim Orling wrote: > > > > The debsums recipe has not been substantially touched since 2020 > > when it was moved to dynamic-layers. > > > > In meta-openembedded ecosystem, it is the only known recipe that > > depends on po4a, which is being removed in a separate commit. > > > > According to the layerindex, no known recipes depend on debsums: > > https://layers.openembedded.org/layerindex/branch/master/recipes/?q=depends%3Adebsums > > > > Signed-off-by: Tim Orling Thanks for checking. We no longer have a use case for this recipe. Acked-by: Tom Rini -- Tom signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105600): https://lists.openembedded.org/g/openembedded-devel/message/105600 Mute This Topic: https://lists.openembedded.org/mt/102052093/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][kirkstone][PATCH] libcroco: Delete the recipe
Delete libcroco recipe as it got added by mistake from commit https://git.openembedded.org/meta-openembedded/commit/?h=kirkstone-next=522603beb6d88ad6ea443806bb986096d5b766e6 Actual recipe is present in poky. https://git.yoctoproject.org/poky/tree/meta/recipes-support/libcroco/libcroco_0.6.13.bb?h=kirkstone Signed-off-by: Akash Hadke --- .../libcroco/libcroco/CVE-2020-12825.patch| 190 -- .../libcroco/libcroco_0.6.13.bb | 22 -- 2 files changed, 212 deletions(-) delete mode 100644 meta/recipes-support/libcroco/libcroco/CVE-2020-12825.patch delete mode 100644 meta/recipes-support/libcroco/libcroco_0.6.13.bb diff --git a/meta/recipes-support/libcroco/libcroco/CVE-2020-12825.patch b/meta/recipes-support/libcroco/libcroco/CVE-2020-12825.patch deleted file mode 100644 index 8e58f7309..0 --- a/meta/recipes-support/libcroco/libcroco/CVE-2020-12825.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 203d62efefe6f79080863dda61593003b4c31f25 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Thu, 13 Aug 2020 20:03:05 -0500 -Subject: [PATCH] libcroco parser: limit recursion in block and any productions - -If we don't have any limits, we can recurse forever and overflow the -stack. - -This is for CVE-2020-12825: Stack overflow in cr_parser_parse_any_core -in cr-parser.c. - -Bug: https://gitlab.gnome.org/Archive/libcroco/-/issues/8 -Patch from https://gitlab.gnome.org/Archive/libcroco/-/merge_requests/5 - -CVE: CVE-2020-12825 -Upstream Status: Backport [https://gitlab.com/inkscape/inkscape/-/commit/203d62efefe6f79080863dda61593003b4c31f25.patch] - src/cr-parser.c | 44 --- - 1 file changed, 29 insertions(+), 15 deletions(-) - -diff --git a/src/cr-parser.c b/src/cr-parser.c -index d85e71f0fc..cd7b6ebd4a 100644 a/src/cr-parser.c -+++ b/src/cr-parser.c -@@ -136,6 +136,8 @@ struct _CRParserPriv { - - #define CHARS_TAB_SIZE 12 - -+#define RECURSIVE_CALLERS_LIMIT 100 -+ - /** - * IS_NUM: - *@a_char: the char to test. -@@ -343,9 +345,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this); - - static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this); - --static enum CRStatus cr_parser_parse_any_core (CRParser * a_this); -+static enum CRStatus cr_parser_parse_any_core (CRParser * a_this, -+ guint n_calls); - --static enum CRStatus cr_parser_parse_block_core (CRParser * a_this); -+static enum CRStatus cr_parser_parse_block_core (CRParser * a_this, -+ guint n_calls); - - static enum CRStatus cr_parser_parse_value_core (CRParser * a_this); - -@@ -783,7 +787,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) - cr_parser_try_to_skip_spaces_and_comments (a_this); - - do { --status = cr_parser_parse_any_core (a_this); -+status = cr_parser_parse_any_core (a_this, 0); - } while (status == CR_OK); - - status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, -@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) - cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, - token); - token = NULL; --status = cr_parser_parse_block_core (a_this); -+status = cr_parser_parse_block_core (a_this, 0); - CHECK_PARSING_STATUS (status, - FALSE); - goto done; -@@ -929,11 +933,11 @@ cr_parser_parse_selector_core (CRParser * a_this) - - RECORD_INITIAL_POS (a_this, _pos); - --status = cr_parser_parse_any_core (a_this); -+status = cr_parser_parse_any_core (a_this, 0); - CHECK_PARSING_STATUS (status, FALSE); - - do { --status = cr_parser_parse_any_core (a_this); -+status = cr_parser_parse_any_core (a_this, 0); - - } while (status == CR_OK); - -@@ -955,10 +959,12 @@ cr_parser_parse_selector_core (CRParser * a_this) - *in chapter 4.1 of the css2 spec. - *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*; - *@param a_this the current instance of #CRParser. -+ *@param n_calls used to limit recursion depth - *FIXME: code this function. - */ - static enum CRStatus --cr_parser_parse_block_core (CRParser * a_this) -+cr_parser_parse_block_core (CRParser * a_this, -+guint n_calls) - { - CRToken *token = NULL; - CRInputPos init_pos; -@@ -966,6 +972,9 @@ cr_parser_parse_block_core (CRParser * a_this) - - g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR); - -+if (n_calls > RECURSIVE_CALLERS_LIMIT) -+return CR_ERROR; -+ - RECORD_INITIAL_POS (a_this, _pos); - - status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, ); -@@ -995,13 +1004,13 @@ cr_parser_parse_block_core (CRParser *
[oe] [PATCH] edid-decode: Upgrade to latest master
Upgrade to latest master, which contains these additional commits: 5920bf2a756b edid-decode: improve GTF/CVT failure messages e59b8a2ffd69 edid-decode: check for VICs in ascending order 5f723267e04d edid-decode: downgrade the 'out-of-range' failure to a warning a31e68043878 edid-decode: add HDMI Forum EDID updates 2f19bd0c1d9b edid-decode: update HDR10+ DB e48fb384fff4 edid-decode: add Filmmaker Mode, fix Dolby PQ v2 calculations 2d44e1b01c7e edid-decode: fix HDMI video/audio latency calculation d740dde3540a edid-decode: update to CTA-861-I 915b0ce5329f edid-decode: print human-readable CTA infoframe types Signed-off-by: Fabio Estevam --- meta-oe/recipes-support/edid-decode/edid-decode_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb index c1f512160d61..48b52eefcaa1 100644 --- a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb +++ b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb @@ -7,7 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" -SRCREV = "e052f5f9fdf74ca11aa1a8edfa62eff8d0aa3d0d" +SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" PV = "0.0+git${SRCPV}" S = "${WORKDIR}/git" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105598): https://lists.openembedded.org/g/openembedded-devel/message/105598 Mute This Topic: https://lists.openembedded.org/mt/102057695/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-java][master][PATCH] meta-java: Adapt LICENSE as SPDX identifiers
On Wed, Oct 18, 2023 at 12:44 PM, akash hadke wrote: > diff --git a/recipes-core/cacao/cacao_git.bb b/recipes-core/cacao/cacao_git.bb > index fef7f34..80129b1 100644 > --- a/recipes-core/cacao/cacao_git.bb > +++ b/recipes-core/cacao/cacao_git.bb > @@ -1,6 +1,6 @@ > SUMMARY = "CacaoVM for use as OpenEmbedded's Java VM" > HOMEPAGE = "http://www.cacaojvm.org/; > -LICENSE = "GPL-2.0" > +LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" > SECTION = "interpreters" > You might want to double check the source, a quick look at e.g. https://bitbucket.org/cacaovm/cacao/src/master/COPYING: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. shows this should be 'GPL-2.0-or-later' instead. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105597): https://lists.openembedded.org/g/openembedded-devel/message/105597 Mute This Topic: https://lists.openembedded.org/mt/102036346/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 v3] dnf-plugin-tui: create symlinks from /usr/ to /.
On 19 Oct 2023, at 07:51, Mingyu Wang (Fujitsu) wrote: > >> Isn’t this what create_merged_usr_symlinks in image.bbclass does? Why does >> a DNF plugin need to do this, and not anything else? > Because dnf-plugin-tui is used to created rootfs in any nativesdk environment. > It is not in a bitbake environment, so image.bbclass cannot be used. Sounds a bit like the symlink creation should be moved into base-files... Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105596): https://lists.openembedded.org/g/openembedded-devel/message/105596 Mute This Topic: https://lists.openembedded.org/mt/102013374/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] c-ares: upgrade 1.19.1 -> 1.20.1
From: Wang Mingyu License-Update:Update from 1989 MIT license text to modern MIT license text Changelog: === -Resolve use-after-free issue when TCP connection is terminated before a response is returned -Reduce number of queries for a load test case to prevent overloading some build systems -Fix fuzz test build target Signed-off-by: Wang Mingyu --- .../c-ares/{c-ares_1.19.1.bb => c-ares_1.20.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/c-ares/{c-ares_1.19.1.bb => c-ares_1.20.1.bb} (78%) diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.19.1.bb b/meta-oe/recipes-support/c-ares/c-ares_1.20.1.bb similarity index 78% rename from meta-oe/recipes-support/c-ares/c-ares_1.19.1.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.20.1.bb index 1440d72711..85379dc40d 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.19.1.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.20.1.bb @@ -3,10 +3,10 @@ SUMMARY = "c-ares is a C library that resolves names asynchronously." HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/; SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https" -SRCREV = "6360e96b5cf8e5980c887ce58ef727e53d77243a" +SRCREV = "e8fe27eaa841ed32a4f82bef7a72c4e04e7f86a7" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105595): https://lists.openembedded.org/g/openembedded-devel/message/105595 Mute This Topic: https://lists.openembedded.org/mt/102056685/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-webserver][PATCH] netdata: Upgrade 1.36.1 -> 1.43.0
From: Sam Van Den Berge libyaml dependency now required. See: 6ee42875c: Bundle libyaml json-c also seems required now. If I don't enable it, I get compile errors. compression and https options got renamed upstream to lz4 and openssl. See: c74bf56ee: Code reorg and cleanup - enrichment of /api/v2 Signed-off-by: Sam Van Den Berge --- .../netdata/{netdata_1.36.1.bb => netdata_1.43.0.bb} | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) rename meta-webserver/recipes-webadmin/netdata/{netdata_1.36.1.bb => netdata_1.43.0.bb} (88%) diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.36.1.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.43.0.bb similarity index 88% rename from meta-webserver/recipes-webadmin/netdata/netdata_1.36.1.bb rename to meta-webserver/recipes-webadmin/netdata/netdata_1.43.0.bb index 52d99e770..07ee03d86 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_1.36.1.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.43.0.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://github.com/netdata/netdata/; LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -DEPENDS += "libuv util-linux zlib" +DEPENDS += "libuv util-linux zlib libyaml json-c" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ " -SRC_URI[sha256sum] = "f4a1233112b55e07e2862ffda0416255f0aa4c8e2b16929b76fa7ad6b69fd931" +SRC_URI[sha256sum] = "d3c66273d8eb62290d412c870dcde45ea214ad187df9d5350f682d9e6d19d426" # default netdata.conf for netdata configuration SRC_URI += "file://netdata.conf" @@ -41,10 +41,10 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" -PACKAGECONFIG ??= "https" -PACKAGECONFIG[cloud] = "--enable-cloud, --disable-cloud, json-c" -PACKAGECONFIG[compression] = "--enable-compression, --disable-compression, lz4" -PACKAGECONFIG[https] = "--enable-https, --disable-https, openssl" +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[cloud] = "--enable-cloud, --disable-cloud," +PACKAGECONFIG[lz4] = "--enable-lz4, --disable-lz4, lz4" +PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl" # ebpf doesn't compile (or detect) the cross compilation well EXTRA_OECONF += "--disable-ebpf" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105594): https://lists.openembedded.org/g/openembedded-devel/message/105594 Mute This Topic: https://lists.openembedded.org/mt/102056243/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] Detecting unimplemented ptests with heuristics
Hi everyone, We recently implemented a way to detect recipes for upstream code that contain unit tests but does not implement ptests. Those recipes make good candidates for increasing the ptests coverage. This is implemented as a QA check. The check is disabled by default since it generates a lot of warning at build. In order to activate it (in local.conf for exemple) : WARN_QA += "unimplemented-ptest" The warnings looks like: WARNING: time-1.9-r0 do_patch: QA Issue: time: autotools-based tests detected [unimplemented-ptest] I've generated the list for the unimplemented ptests for oe-core and for meta-openembedded: 329 unimplemented-ptests_oe-core.log: https://gist.github.com/ycongal-smile/dd51b0e450a8f0083e9d5cc10eeeb060#file-unimplemented-ptests_oe-core-log 1080 unimplemented-ptests_meta-openembedded.log: https://gist.github.com/ycongal-smile/dd51b0e450a8f0083e9d5cc10eeeb060#file-unimplemented-ptests_meta-openembedded-log Those were generated with : bitbake --runall patch world ... without the meta-openembedded layers for oe-core. For meta-openembedded, I have excluded OE-core recipes from world with: EXCLUDE_FROM_WORLD:layer-core = '1' EXCLUDE_FROM_WORLD:layer-yoctobsp = '1' EXCLUDE_FROM_WORLD:layer-yocto = '1' For the curious, the code is here: https://git.yoctoproject.org/poky/tree/meta/classes-global/insane.bbclass?id=07546cc63f5e2a1a74bd7f5cac6ad1c9948264d4#n1351 And the doc was sent here: https://lists.yoctoproject.org/g/docs/message/4335 Regards, -- Yoann Congal Smile ECS - Tech Expert -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105593): https://lists.openembedded.org/g/openembedded-devel/message/105593 Mute This Topic: https://lists.openembedded.org/mt/102056220/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] nodejs: update to latest v20 version 20.8.1
On Wed, Oct 18, 2023 at 12:28 PM Martin Jansa wrote: > > * updates to latest v20 version > This version brings a fix to CVE-2023-44487 and a number of other ones, so from the security standpoint it is something to bring in. Cheers, Marta -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105592): https://lists.openembedded.org/g/openembedded-devel/message/105592 Mute This Topic: https://lists.openembedded.org/mt/102036217/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 v3] dnf-plugin-tui: create symlinks from /usr/ to /.
> Isn’t this what create_merged_usr_symlinks in image.bbclass does? Why does > a DNF plugin need to do this, and not anything else? Because dnf-plugin-tui is used to created rootfs in any nativesdk environment. It is not in a bitbake environment, so image.bbclass cannot be used. -- Best Regards --- Wang Mingyu Development Dept.I Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China TEL: +86+25-86630566-8568 COINS: 79988548 FAX: +86+25-83317685 MAIL: wan...@fujitsu.com http://www.fujitsu.com/cn/fnst/ > -Original Message- > From: Ross Burton > Sent: Tuesday, October 17, 2023 5:51 PM > To: Wang, Mingyu/王 鸣瑜 > Cc: openembedded-devel@lists.openembedded.org > Subject: Re: [oe] [meta-oe] [PATCH v3] dnf-plugin-tui: create symlinks from > /usr/ > to /. > > Isn’t this what create_merged_usr_symlinks in image.bbclass does? Why does > a DNF plugin need to do this, and not anything else? > > Ross > > > On 17 Oct 2023, at 08:23, wangmy via lists.openembedded.org > wrote: > > > > From Poky 4.3, by default, usrmerge has been enabled. > > Some important binaries have been installed to /usr/sbin instead of > > /sbin such as init. So it is necessary to create symlinks from /usr/ > > to /, such as /usr/sbin to /sbin, /usr/bin to /bin. > > > > Signed-off-by: Wang Mingyu > > --- > > meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git > > a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb > > b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb > > index 94023922a2..0709019056 100644 > > --- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb > > +++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb > > @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" > > LIC_FILES_CHKSUM = > "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > > > SRC_URI = > "git://github.com/ubinux/dnf-plugin-tui.git;branch=master;protocol=https" > > -SRCREV = "83917a3935ac7ce1d8d96e914d96a6679319a336" > > +SRCREV = "baac322a8a6d57e62c703f6ed523152baec18b4f" > > PV = "1.3" > > > > SRC_URI:append:class-target = " file://oe-remote.repo.sample" > > -- > > 2.34.1 > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105591): https://lists.openembedded.org/g/openembedded-devel/message/105591 Mute This Topic: https://lists.openembedded.org/mt/102013374/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] opencv: refresh protobuf-v22 compatibility patch with backported version
* as a bonus it fixes building with tests PACKAGECONFIG enabled as reported in: https://github.com/openembedded/meta-openembedded/commit/225ce6a14a8110ab6b573b4dc9f5297a03d17e0f#r129831882 Signed-off-by: Martin Jansa --- .../opencv/fix-build-with-protobuf-v22.patch | 385 -- 1 file changed, 88 insertions(+), 297 deletions(-) diff --git a/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch b/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch index 536060cfd9..265d723c6e 100644 --- a/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch +++ b/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch @@ -1,19 +1,60 @@ -From 5e4150826fea6f37276f348c65d94ce4847d1211 Mon Sep 17 00:00:00 2001 +From 75f7475fcfb35cbe4d8f5ccf5c4ac8bc78f2dc30 Mon Sep 17 00:00:00 2001 From: Kumataro -Date: Sat, 7 Oct 2023 10:11:25 +0900 -Subject: [PATCH] 3rdparty: supporting protobuf v22 and later +Date: Thu, 19 Oct 2023 14:45:08 +0900 +Subject: [PATCH] Merge pull request #24372 from Kumataro:fix24369 -Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/24372] +Supporting protobuf v22 and later(with abseil-cpp/C++17) #24372 + +fix https://github.com/opencv/opencv/issues/24369 +related https://github.com/opencv/opencv/issues/23791 + +1. This patch supports external protobuf v22 and later, it required abseil-cpp and c++17. +Even if the built-in protobuf is upgraded to v22 or later, +the dependency on abseil-cpp and the requirement for C++17 will continue. +2. Some test for caffe required patched protobuf, so this patch disable them. + +This patch is tested by following libraries. +- Protobuf:/usr/local/lib/libprotobuf.so (4.24.4) +- abseil-cpp:YES (20230125) + +See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request + +- [x] I agree to contribute to the project under Apache 2 License. +- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV +- [x] The PR is proposed to the proper branch +- [x] There is a reference to the original bug report and related work +- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable + Patch to opencv_extra has the same branch name. +- [x] The feature is well documented and sample code can be built with the project CMake + +Upstream-Status: Backport [https://github.com/opencv/opencv/commit/6e4280ea81b59c6dca45bb9801b758377beead55] --- - cmake/OpenCVFindProtobuf.cmake | 37 ++ - modules/dnn/CMakeLists.txt | 9 + - 2 files changed, 46 insertions(+) + cmake/OpenCVFindProtobuf.cmake | 35 +++- + modules/dnn/CMakeLists.txt | 6 ++ + modules/dnn/test/test_layers.cpp | 24 ++ + 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index 8835347d1d..9bd5c28db8 100644 +index 8835347d1d..5b1e17529f 100644 --- a/cmake/OpenCVFindProtobuf.cmake +++ b/cmake/OpenCVFindProtobuf.cmake -@@ -67,6 +67,38 @@ else() +@@ -30,8 +30,14 @@ if(BUILD_PROTOBUF) + set(Protobuf_LIBRARIES "libprotobuf") + set(HAVE_PROTOBUF TRUE) + else() ++ # we still need this for command PROTOBUF_GENERATE_CPP. ++ set(protobuf_MODULE_COMPATIBLE ON) ++ + unset(Protobuf_VERSION CACHE) +- find_package(Protobuf QUIET) ++ find_package(Protobuf QUIET CONFIG) ++ if(NOT Protobuf_FOUND) ++find_package(Protobuf QUIET) ++ endif() + + # Backwards compatibility + # Define camel case versions of input variables +@@ -67,6 +73,20 @@ else() endif() endif() @@ -21,82 +62,49 @@ index 8835347d1d..9bd5c28db8 100644 +# In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp. +# Details: https://protobuf.dev/news/2022-08-03/ +# And if std::text_view is in abseil-cpp requests C++17 and later. -+if(HAVE_PROTOBUF) -+if("${Protobuf_VERSION}" MATCHES [[[0-9]+.([0-9]+).[0-9]+]]) -+string(COMPARE GREATER_EQUAL "${CMAKE_MATCH_1}" "22" REQUEST_ABSL) -+ -+if(REQUEST_ABSL) -+string(COMPARE GREATER_EQUAL "${CMAKE_CXX_STANDARD}" "17" USED_AFTER_CXX17) -+if(NOT USED_AFTER_CXX17) -+message("CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}") -+message("protobuf : ${Protobuf_VERSION}") -+message(FATAL_ERROR "protobuf(v22 and later) and abseil-cpp request CMAKE_CXX_STANDARD=17 and later.") -+endif() -+ -+ocv_check_modules(ABSL_STRINGS absl_strings) -+if(NOT ABSL_STRINGS_FOUND) -+message(FATAL_ERROR "protobuf(v22 and later) requests abseil-cpp(strings), but missing.") -+endif() -+ -+ocv_check_modules(ABSL_LOG absl_log) -+if(NOT