Re: [oe] [meta-oe][PATCH] lvm2: restore Upstream-Status
Thanks for taking care of this On Thu, May 30, 2024 at 1:34 PM Martin Jansa via lists.openembedded.org wrote: > * accidentally removed in: > > https://git.openembedded.org/meta-openembedded/diff/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch?id=cc4e9fbd823a9af1f6b8f622ce86d62172ee9ade > > * fixes: > ERROR: QA Issue: Missing Upstream-Status in patch > > TOPDIR/meta-oe/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch > Please add according to > https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status > . [patch-status] > > Signed-off-by: Martin Jansa > --- > .../lvm2/files/0001-implement-libc-specific-reopen_stream.patch | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git > a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch > b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch > index a064516e32..e11ac5ac08 100644 > --- > a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch > +++ > b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch > @@ -13,6 +13,8 @@ > http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch > > Signed-off-by: Khem Raj > Signed-off-by: Dengke Du > + > +Upstream-Status: Pending > --- > lib/log/log.c | 6 ++ > tools/lvmcmdline.c | 6 +++--- > -- > 2.45.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110649): https://lists.openembedded.org/g/openembedded-devel/message/110649 Mute This Topic: https://lists.openembedded.org/mt/106396150/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] lvm2: restore Upstream-Status
* accidentally removed in: https://git.openembedded.org/meta-openembedded/diff/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch?id=cc4e9fbd823a9af1f6b8f622ce86d62172ee9ade * fixes: ERROR: QA Issue: Missing Upstream-Status in patch TOPDIR/meta-oe/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch Please add according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status . [patch-status] Signed-off-by: Martin Jansa --- .../lvm2/files/0001-implement-libc-specific-reopen_stream.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch index a064516e32..e11ac5ac08 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch @@ -13,6 +13,8 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch Signed-off-by: Khem Raj Signed-off-by: Dengke Du + +Upstream-Status: Pending --- lib/log/log.c | 6 ++ tools/lvmcmdline.c | 6 +++--- -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110648): https://lists.openembedded.org/g/openembedded-devel/message/110648 Mute This Topic: https://lists.openembedded.org/mt/106396150/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] lvm2: remove subitted patch
This causes: ERROR: QA Issue: Missing Upstream-Status in patch TOPDIR/meta-oe/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch Please add according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status . [patch-status] On Tue, May 28, 2024 at 10:17 AM Markus Volk via lists.openembedded.org wrote: > > devmapper update also updated lvm2. Thus build fails with: > patching file daemons/lvmdbusd/utils.py > Hunk #1 FAILED at 778. > 1 out of 1 hunk FAILED -- rejects in file daemons/lvmdbusd/utils.py > > - Drop the submitted patch > - Move PV to lvm2.inc to ensure we keep it in sync for libdevmapper and lvm2 > - refresh patches > > Signed-off-by: Markus Volk > --- > .../0001-Avoid-bashisms-in-init-scripts.patch | 17 +- > .../files/0001-configure.ac-check-egrep.patch | 12 +++ > ...mplement-libc-specific-reopen_stream.patch | 31 +-- > .../0001-include-libgen.h-for-basename.patch | 9 ++ > ...tweak-MODPROBE_CMD-for-cross-compile.patch | 11 +++ > .../lvm2/files/0005-do-not-build-manual.patch | 15 - > ...lvm2-monitor.service-after-tmp.mount.patch | 7 ++--- > .../lvm2/files/reproducible-build.patch | 15 ++--- > ...ibdevmapper_2.03.24.bb => libdevmapper.bb} | 0 > .../lvm2/{lvm2_2.03.22.bb => lvm2.bb} | 1 - > meta-oe/recipes-support/lvm2/lvm2.inc | 1 + > ...findmnt-bin-lsblk-bin-sort-not-found.patch | 11 +++ > ...1-lvmdbusd-create-dirs-for-lock-file.patch | 29 - > .../lvm2/lvm2/tweak-for-lvmdbusd.patch| 13 +--- > 14 files changed, 67 insertions(+), 105 deletions(-) > rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.24.bb => > libdevmapper.bb} (100%) > rename meta-oe/recipes-support/lvm2/{lvm2_2.03.22.bb => lvm2.bb} (98%) > delete mode 100644 > meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch > > diff --git > a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch > > b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch > index 3c4a3a151..fb58793a1 100644 > --- > a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch > +++ > b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch > @@ -1,7 +1,7 @@ > -From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001 > +From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001 > From: Peter Kjellerstedt > Date: Mon, 26 Nov 2018 14:53:09 +0800 > -Subject: [PATCH 1/3] Avoid bashisms in init scripts > +Subject: [PATCH] Avoid bashisms in init scripts > > Upstream-Status: Inappropriate > > @@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia > 5 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/scripts/blk_availability_init_red_hat.in > b/scripts/blk_availability_init_red_hat.in > -index 347c395..b2e9cf9 100644 > +index 347c39574..b2e9cf932 100644 > --- a/scripts/blk_availability_init_red_hat.in > +++ b/scripts/blk_availability_init_red_hat.in > @@ -1,4 +1,4 @@ > @@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644 > ;; > esac > diff --git a/scripts/cmirrord_init_red_hat.in > b/scripts/cmirrord_init_red_hat.in > -index c82f8f5..a3a321d 100755 > +index c82f8f547..a3a321d9c 100755 > --- a/scripts/cmirrord_init_red_hat.in > +++ b/scripts/cmirrord_init_red_hat.in > @@ -1,4 +1,4 @@ > @@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755 > esac > > diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in > b/scripts/lvm2_lvmpolld_init_red_hat.in > -index 176ff5d..825f6ad 100644 > +index 176ff5dcb..825f6ad84 100644 > --- a/scripts/lvm2_lvmpolld_init_red_hat.in > +++ b/scripts/lvm2_lvmpolld_init_red_hat.in > @@ -1,4 +1,4 @@ > @@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644 > esac > > diff --git a/scripts/lvm2_monitoring_init_red_hat.in > b/scripts/lvm2_monitoring_init_red_hat.in > -index 95e4125..dff89cd 100644 > +index 95e4125a0..dff89cd38 100644 > --- a/scripts/lvm2_monitoring_init_red_hat.in > +++ b/scripts/lvm2_monitoring_init_red_hat.in > @@ -1,4 +1,4 @@ > @@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644 > esac > > diff --git a/scripts/lvm2_monitoring_init_rhel4 > b/scripts/lvm2_monitoring_init_rhel4 > -index 8eb06c5..2e8d0f7 100644 > +index 8eb06c509..2e8d0f71e 100644 > --- a/scripts/lvm2_monitoring_init_rhel4 > +++ b/scripts/lvm2_monitoring_init_rhel4 > @@ -1,4 +1,4 @@ > @@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644 > ;; > esac > > --- > -2.7.4 > - > diff --git > a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch > b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch > index 474c2f8ac..f4b0f913d 100644 > --- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch > +++ b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch > @@ -1,4 +1,7 @@ > -configure.ac: check egrep > +From
[oe] [meta-python][PATCH v2] python3-flask: add ptest
* test added to the fast list Signed-off-by: Jan Vermaete --- .../conf/include/ptest-packagelists-meta-python.inc | 1 + .../recipes-devtools/python/python3-flask/run-ptest | 3 +++ .../recipes-devtools/python/python3-flask_3.0.2.bb| 11 ++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-flask/run-ptest diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc index e07aaf3c0..2e701dc15 100644 --- a/meta-python/conf/include/ptest-packagelists-meta-python.inc +++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc @@ -19,6 +19,7 @@ PTESTS_FAST_META_PYTHON = "\ python3-click \ python3-dominate \ python3-execnet \ +python3-flask \ python3-flexcache \ python3-flexparser \ python3-freezegun \ diff --git a/meta-python/recipes-devtools/python/python3-flask/run-ptest b/meta-python/recipes-devtools/python/python3-flask/run-ptest new file mode 100644 index 0..8d2017d39 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-flask/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb b/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb index 300ca99dd..99524b437 100644 --- a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb @@ -8,10 +8,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" SRC_URI[sha256sum] = "822c03f4b799204250a7ee84b1eddc40665395333973dfb9deebfe425fefcb7d" +SRC_URI += " \ +file://run-ptest \ +" + UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask; UPSTREAM_CHECK_REGEX = "/Flask/(?P(\d+[\.\-_]*)+)" -inherit pypi python_setuptools_build_meta +inherit pypi python_setuptools_build_meta ptest CLEANBROKEN = "1" @@ -23,3 +27,8 @@ RDEPENDS:${PN} = " \ python3-profile \ python3-werkzeug \ " + +do_install_ptest() { +install -d ${D}${PTEST_PATH}/tests +cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110646): https://lists.openembedded.org/g/openembedded-devel/message/110646 Mute This Topic: https://lists.openembedded.org/mt/106395318/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [PATCH] nodejs-oe-cache: fix offline install of dependencies
Hi, Op 21-05-2024 om 21:33 schreef Ferry Toth: Hi, Op 14-05-2024 om 19:39 schreef Geoff Parker: Thanks Khem for the link to openembedded-contrib and information on how scarthgap updates are staged. However, I'm not seeing the nodejs-os-cache commit in the stable/scarthgap-nut branch which is needed to fix nodejs builds on scarthgap also. Are recent fixes in meta-openembedded master backported also? cc: Armin On Mon, May 13, 2024 at 9:48 AM Khem Raj wrote: On Sun, May 12, 2024 at 11:57 PM Geoff Parker via lists.openembedded.org wrote: When is the expected next update to the scarthgap branch? I've watched the patch move from master-next to master, but there does not seem to be a visible scarthgap-next branch to watch. Indeed Usually there is a monthly release update to stable branches that Armin queues up in contrib repo e.g. https://git.openembedded.org/meta-openembedded-contrib/log/?h=stable/scarthgap-nut Not there yet Thanks, it landed in scarthgap. eventually when this branch is gone through some level of testing, it is proposed to upstream branch via scarthgap-next in main repo. I am guessing this patch is badly needed to get many nodejs modules to build. Tested-by: Ferry Toth [scarthgap, nodejs-module-libiio] -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110645): https://lists.openembedded.org/g/openembedded-devel/message/110645 Mute This Topic: https://lists.openembedded.org/mt/105884883/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-python][PATCH] python3-flask: add ptest
On Thu, May 30, 2024 at 12:13 PM Jan Vermaete via lists.openembedded.org wrote: > > Question: should I add to the list in > conf/include/ptest-packagelists-meta-python.inc? Or will the > maintainer do this? > It took about 60sec in qemu on a slow machine. yes please add it to fast section, > > On Thu, May 30, 2024 at 9:07 PM Jan Vermaete via > lists.openembedded.org > wrote: > > > > Signed-off-by: Jan Vermaete > > --- > > .../recipes-devtools/python/python3-flask/run-ptest | 3 +++ > > .../recipes-devtools/python/python3-flask_3.0.2.bb| 11 ++- > > 2 files changed, 13 insertions(+), 1 deletion(-) > > create mode 100644 > > meta-python/recipes-devtools/python/python3-flask/run-ptest > > > > diff --git a/meta-python/recipes-devtools/python/python3-flask/run-ptest > > b/meta-python/recipes-devtools/python/python3-flask/run-ptest > > new file mode 100644 > > index 0..8d2017d39 > > --- /dev/null > > +++ b/meta-python/recipes-devtools/python/python3-flask/run-ptest > > @@ -0,0 +1,3 @@ > > +#!/bin/sh > > + > > +pytest --automake > > diff --git a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb > > b/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb > > index 300ca99dd..99524b437 100644 > > --- a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb > > +++ b/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb > > @@ -8,10 +8,14 @@ LIC_FILES_CHKSUM = > > "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" > > > > SRC_URI[sha256sum] = > > "822c03f4b799204250a7ee84b1eddc40665395333973dfb9deebfe425fefcb7d" > > > > +SRC_URI += " \ > > +file://run-ptest \ > > +" > > + > > UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask; > > UPSTREAM_CHECK_REGEX = "/Flask/(?P(\d+[\.\-_]*)+)" > > > > -inherit pypi python_setuptools_build_meta > > +inherit pypi python_setuptools_build_meta ptest > > > > CLEANBROKEN = "1" > > > > @@ -23,3 +27,8 @@ RDEPENDS:${PN} = " \ > > python3-profile \ > > python3-werkzeug \ > > " > > + > > +do_install_ptest() { > > +install -d ${D}${PTEST_PATH}/tests > > +cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ > > +} > > -- > > 2.39.2 > > > > > > > > > > > -- > Jan Vermaete > “Success is a self-correcting phenomenom.” -- Gary Hamel > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110644): https://lists.openembedded.org/g/openembedded-devel/message/110644 Mute This Topic: https://lists.openembedded.org/mt/106394805/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] catch2: Upgrade to 3.x release series
On Thu, May 30, 2024 at 12:05 PM Theodore A. Roth wrote: > > FYI: Updating catch2 to v3 breaks the ptest build for libgpiod-1.6.4. > > I needed to disable ptests to get it to work for our builds. > The real fix would be to port the libgpiod-1.6.4 code to catch2 v3, but we > want to migrate to libgpiod-2.x soon anyways. > Yes, I see it break ptest builds as well that's why I have withheld it for now. > Just giving folks using libgpiod-1.6.4 a heads up on what I found. Thanks > > Ted Roth > > On Tue, May 28, 2024 at 7:03 PM Khem Raj via lists.openembedded.org > wrote: >> >> It supports C++20 better and newer compilers e.g. clang19 >> works better with 3.x series. >> >> Signed-off-by: Khem Raj >> --- >> .../catch2/{catch2_2.13.10.bb => catch2_3.6.0.bb} | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> rename meta-oe/recipes-test/catch2/{catch2_2.13.10.bb => catch2_3.6.0.bb} >> (87%) >> >> diff --git a/meta-oe/recipes-test/catch2/catch2_2.13.10.bb >> b/meta-oe/recipes-test/catch2/catch2_3.6.0.bb >> similarity index 87% >> rename from meta-oe/recipes-test/catch2/catch2_2.13.10.bb >> rename to meta-oe/recipes-test/catch2/catch2_3.6.0.bb >> index f8080c8f97..52045bd144 100644 >> --- a/meta-oe/recipes-test/catch2/catch2_2.13.10.bb >> +++ b/meta-oe/recipes-test/catch2/catch2_3.6.0.bb >> @@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2; >> LICENSE = "BSL-1.0" >> LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" >> >> -SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x;protocol=https" >> -SRCREV = "182c910b4b63ff587a3440e08f84f70497e49a81" >> +SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https" >> +SRCREV = "4e8d92bf02f7d1c8006a0e7a5ecabd8e62d98502" >> >> S = "${WORKDIR}/git" >> >> -- >> 2.45.1 >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110643): https://lists.openembedded.org/g/openembedded-devel/message/110643 Mute This Topic: https://lists.openembedded.org/mt/106361394/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-python][PATCH] python3-flask: add ptest
Question: should I add to the list in conf/include/ptest-packagelists-meta-python.inc? Or will the maintainer do this? It took about 60sec in qemu on a slow machine. On Thu, May 30, 2024 at 9:07 PM Jan Vermaete via lists.openembedded.org wrote: > > Signed-off-by: Jan Vermaete > --- > .../recipes-devtools/python/python3-flask/run-ptest | 3 +++ > .../recipes-devtools/python/python3-flask_3.0.2.bb| 11 ++- > 2 files changed, 13 insertions(+), 1 deletion(-) > create mode 100644 > meta-python/recipes-devtools/python/python3-flask/run-ptest > > diff --git a/meta-python/recipes-devtools/python/python3-flask/run-ptest > b/meta-python/recipes-devtools/python/python3-flask/run-ptest > new file mode 100644 > index 0..8d2017d39 > --- /dev/null > +++ b/meta-python/recipes-devtools/python/python3-flask/run-ptest > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +pytest --automake > diff --git a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb > b/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb > index 300ca99dd..99524b437 100644 > --- a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb > +++ b/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb > @@ -8,10 +8,14 @@ LIC_FILES_CHKSUM = > "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" > > SRC_URI[sha256sum] = > "822c03f4b799204250a7ee84b1eddc40665395333973dfb9deebfe425fefcb7d" > > +SRC_URI += " \ > +file://run-ptest \ > +" > + > UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask; > UPSTREAM_CHECK_REGEX = "/Flask/(?P(\d+[\.\-_]*)+)" > > -inherit pypi python_setuptools_build_meta > +inherit pypi python_setuptools_build_meta ptest > > CLEANBROKEN = "1" > > @@ -23,3 +27,8 @@ RDEPENDS:${PN} = " \ > python3-profile \ > python3-werkzeug \ > " > + > +do_install_ptest() { > +install -d ${D}${PTEST_PATH}/tests > +cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ > +} > -- > 2.39.2 > > > > -- Jan Vermaete “Success is a self-correcting phenomenom.” -- Gary Hamel -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110642): https://lists.openembedded.org/g/openembedded-devel/message/110642 Mute This Topic: https://lists.openembedded.org/mt/106394805/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-flask: add ptest
Signed-off-by: Jan Vermaete --- .../recipes-devtools/python/python3-flask/run-ptest | 3 +++ .../recipes-devtools/python/python3-flask_3.0.2.bb| 11 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-flask/run-ptest diff --git a/meta-python/recipes-devtools/python/python3-flask/run-ptest b/meta-python/recipes-devtools/python/python3-flask/run-ptest new file mode 100644 index 0..8d2017d39 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-flask/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb b/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb index 300ca99dd..99524b437 100644 --- a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb @@ -8,10 +8,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" SRC_URI[sha256sum] = "822c03f4b799204250a7ee84b1eddc40665395333973dfb9deebfe425fefcb7d" +SRC_URI += " \ +file://run-ptest \ +" + UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask; UPSTREAM_CHECK_REGEX = "/Flask/(?P(\d+[\.\-_]*)+)" -inherit pypi python_setuptools_build_meta +inherit pypi python_setuptools_build_meta ptest CLEANBROKEN = "1" @@ -23,3 +27,8 @@ RDEPENDS:${PN} = " \ python3-profile \ python3-werkzeug \ " + +do_install_ptest() { +install -d ${D}${PTEST_PATH}/tests +cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110641): https://lists.openembedded.org/g/openembedded-devel/message/110641 Mute This Topic: https://lists.openembedded.org/mt/106394805/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-python][PATCH] python3-dasbus: Add new recipe
Please ignore this one. The correct one will be send soon. Sorry On Thu, May 30, 2024 at 9:04 PM Jan Vermaete via lists.openembedded.org wrote: > > From: Mingli Yu > > Dasbus is a DBus library written in Python 3, based on GLib > and inspired by pydbus. > > Signed-off-by: Mingli Yu > Signed-off-by: Khem Raj > --- > .../recipes-devtools/python/python3-dasbus_1.7.bb | 15 +++ > 1 file changed, 15 insertions(+) > create mode 100644 meta-python/recipes-devtools/python/python3-dasbus_1.7.bb > > diff --git a/meta-python/recipes-devtools/python/python3-dasbus_1.7.bb > b/meta-python/recipes-devtools/python/python3-dasbus_1.7.bb > new file mode 100644 > index 0..3efa96171 > --- /dev/null > +++ b/meta-python/recipes-devtools/python/python3-dasbus_1.7.bb > @@ -0,0 +1,15 @@ > +SUMMARY = "Dasbus is a DBus library written in Python 3, based on GLib and > inspired by pydbus." > +HOMEPAGE = "https://dasbus.readthedocs.io; > +SECTION = "devel" > +LICENSE = "LGPL-2.1-or-later" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" > + > +SRC_URI = > "git://github.com/dasbus-project/dasbus.git;protocol=https;branch=master \ > +" > +SRCREV = "413cf9a0b7c231468f1d28d9a29dd8dd8bda15c5" > + > +S = "${WORKDIR}/git" > + > +inherit setuptools3 > + > +RDEPENDS:${PN} = "python3-pygobject" > -- > 2.39.2 > > > > -- Jan Vermaete “Success is a self-correcting phenomenom.” -- Gary Hamel -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110640): https://lists.openembedded.org/g/openembedded-devel/message/110640 Mute This Topic: https://lists.openembedded.org/mt/106345708/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] catch2: Upgrade to 3.x release series
FYI: Updating catch2 to v3 breaks the ptest build for libgpiod-1.6.4. I needed to disable ptests to get it to work for our builds. The real fix would be to port the libgpiod-1.6.4 code to catch2 v3, but we want to migrate to libgpiod-2.x soon anyways. Just giving folks using libgpiod-1.6.4 a heads up on what I found. Ted Roth On Tue, May 28, 2024 at 7:03 PM Khem Raj via lists.openembedded.org wrote: > It supports C++20 better and newer compilers e.g. clang19 > works better with 3.x series. > > Signed-off-by: Khem Raj > --- > .../catch2/{catch2_2.13.10.bb => catch2_3.6.0.bb} | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta-oe/recipes-test/catch2/{catch2_2.13.10.bb => catch2_3.6.0.bb} > (87%) > > diff --git a/meta-oe/recipes-test/catch2/catch2_2.13.10.bb > b/meta-oe/recipes-test/catch2/catch2_3.6.0.bb > similarity index 87% > rename from meta-oe/recipes-test/catch2/catch2_2.13.10.bb > rename to meta-oe/recipes-test/catch2/catch2_3.6.0.bb > index f8080c8f97..52045bd144 100644 > --- a/meta-oe/recipes-test/catch2/catch2_2.13.10.bb > +++ b/meta-oe/recipes-test/catch2/catch2_3.6.0.bb > @@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2; > LICENSE = "BSL-1.0" > LIC_FILES_CHKSUM = > "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" > > -SRC_URI = "git:// > github.com/catchorg/Catch2.git;branch=v2.x;protocol=https" > -SRCREV = "182c910b4b63ff587a3440e08f84f70497e49a81" > +SRC_URI = "git:// > github.com/catchorg/Catch2.git;branch=devel;protocol=https" > +SRCREV = "4e8d92bf02f7d1c8006a0e7a5ecabd8e62d98502" > > S = "${WORKDIR}/git" > > -- > 2.45.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110639): https://lists.openembedded.org/g/openembedded-devel/message/110639 Mute This Topic: https://lists.openembedded.org/mt/106361394/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-dasbus: Add new recipe
From: Mingli Yu Dasbus is a DBus library written in Python 3, based on GLib and inspired by pydbus. Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-dasbus_1.7.bb | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-dasbus_1.7.bb diff --git a/meta-python/recipes-devtools/python/python3-dasbus_1.7.bb b/meta-python/recipes-devtools/python/python3-dasbus_1.7.bb new file mode 100644 index 0..3efa96171 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-dasbus_1.7.bb @@ -0,0 +1,15 @@ +SUMMARY = "Dasbus is a DBus library written in Python 3, based on GLib and inspired by pydbus." +HOMEPAGE = "https://dasbus.readthedocs.io; +SECTION = "devel" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +SRC_URI = "git://github.com/dasbus-project/dasbus.git;protocol=https;branch=master \ +" +SRCREV = "413cf9a0b7c231468f1d28d9a29dd8dd8bda15c5" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +RDEPENDS:${PN} = "python3-pygobject" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110638): https://lists.openembedded.org/g/openembedded-devel/message/110638 Mute This Topic: https://lists.openembedded.org/mt/106345708/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] pv: Update from 1.6.20 to 1.7.0
My apologies. I had built and tested on kirkstone but didn’t realize that there is a patch file in master branch’s recipe that is not present in kirkstone. That patch file is not required in 1.7.0; I’ll fix this and send a v2 with testing info. Best Regards, Chaitanya INTERNAL - NI CONFIDENTIAL From: Khem Raj Date: Thursday, May 30, 2024 at 12:51 PM To: Chaitanya Vadrevu Cc: openembedded-devel@lists.openembedded.org Subject: Re: [oe] [meta-oe][PATCH] pv: Update from 1.6.20 to 1.7.0 On Thu, May 30, 2024 at 8:34 AM Chaitanya Vadrevu via lists.openembedded.org wrote: > > Signed-off-by: Chaitanya Vadrevu > --- > meta-oe/recipes-support/pv/{pv_1.6.20.bb => pv_1.7.0.bb} | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > rename meta-oe/recipes-support/pv/{pv_1.6.20.bb => pv_1.7.0.bb} (91%) > how did you test it ? Its good to mention that when sending patches, it fails to even patch https://errors.yoctoproject.org/Errors/Details/784500/ > diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb > b/meta-oe/recipes-support/pv/pv_1.7.0.bb > similarity index 91% > rename from meta-oe/recipes-support/pv/pv_1.6.20.bb > rename to meta-oe/recipes-support/pv/pv_1.7.0.bb > index 6a739af927..f6f0045c2a 100644 > --- a/meta-oe/recipes-support/pv/pv_1.6.20.bb > +++ b/meta-oe/recipes-support/pv/pv_1.7.0.bb > @@ -8,7 +8,7 @@ SRC_URI = > "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ > > file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch > \ > file://run-ptest \ > " > -SRC_URI[sha256sum] = > "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" > +SRC_URI[sha256sum] = > "1372b41053881a05e2df10cb054304decc0233261c0aa0e96185842fa5a422ad" > > UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml; > UPSTREAM_CHECK_REGEX = "pv-(?P\d+(\.\d+)+).tar.bz2" > -- > 2.34.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110637): https://lists.openembedded.org/g/openembedded-devel/message/110637 Mute This Topic: https://lists.openembedded.org/mt/106390746/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] pv: Update from 1.6.20 to 1.7.0
On Thu, May 30, 2024 at 8:34 AM Chaitanya Vadrevu via lists.openembedded.org wrote: > > Signed-off-by: Chaitanya Vadrevu > --- > meta-oe/recipes-support/pv/{pv_1.6.20.bb => pv_1.7.0.bb} | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > rename meta-oe/recipes-support/pv/{pv_1.6.20.bb => pv_1.7.0.bb} (91%) > how did you test it ? Its good to mention that when sending patches, it fails to even patch https://errors.yoctoproject.org/Errors/Details/784500/ > diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb > b/meta-oe/recipes-support/pv/pv_1.7.0.bb > similarity index 91% > rename from meta-oe/recipes-support/pv/pv_1.6.20.bb > rename to meta-oe/recipes-support/pv/pv_1.7.0.bb > index 6a739af927..f6f0045c2a 100644 > --- a/meta-oe/recipes-support/pv/pv_1.6.20.bb > +++ b/meta-oe/recipes-support/pv/pv_1.7.0.bb > @@ -8,7 +8,7 @@ SRC_URI = > "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ > > file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \ > file://run-ptest \ > " > -SRC_URI[sha256sum] = > "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" > +SRC_URI[sha256sum] = > "1372b41053881a05e2df10cb054304decc0233261c0aa0e96185842fa5a422ad" > > UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml; > UPSTREAM_CHECK_REGEX = "pv-(?P\d+(\.\d+)+).tar.bz2" > -- > 2.34.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110636): https://lists.openembedded.org/g/openembedded-devel/message/110636 Mute This Topic: https://lists.openembedded.org/mt/106390746/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] cabextract: add utility to extract Microsft cabinet files
On Thu, 30 May 2024 at 18:10, Khem Raj wrote: > > fails to build. > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3893/steps/14/logs/stdio So, compiling to the host architecture works (bitbake cabextract-native works), but cross-compiling to the host architecture doesn't seem to work; | /usr/src/debug/cabextract/1.11/src/cabextract.c:499:(.text.startup+0x103d): undefined reference to `rpl_fnmatch' This should be fixed by https://lore.kernel.org/openembedded-core/20240530164355.3294714-1-dmitry.barysh...@linaro.org/ > > On Wed, May 29, 2024 at 2:02 AM Dmitry Baryshkov via > lists.openembedded.org > wrote: > > > > WoA firmware, fonts and some other useful files are being distributed as > > a Microsoft cabinet files. Add recipes for the cabextract utility, which > > is used to extract such files. > > > > Cabextract can either use a bundled source tree for libmspack library or > > an externally provided library. Package the library separately in order > > to be able to share it with the meta-security layer. > > > > Cc: Armin Kuster > > Signed-off-by: Dmitry Baryshkov > > --- > > .../cabextract/cabextract_1.11.bb | 18 ++ > > .../cabextract/libmspack_0.11alpha.bb | 16 > > 2 files changed, 34 insertions(+) > > create mode 100644 meta-oe/recipes-support/cabextract/cabextract_1.11.bb > > create mode 100644 > > meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb > > > > diff --git a/meta-oe/recipes-support/cabextract/cabextract_1.11.bb > > b/meta-oe/recipes-support/cabextract/cabextract_1.11.bb > > new file mode 100644 > > index ..4d0354b0 > > --- /dev/null > > +++ b/meta-oe/recipes-support/cabextract/cabextract_1.11.bb > > @@ -0,0 +1,18 @@ > > +SUMMARY = "Software for extracting Microsoft cabinet files" > > +DESCRIPTION = "tool for extracting Microsoft cabinet files" > > +HOMEPAGE = "http://www.cabextract.org.uk/; > > +SECTION = "console/utils" > > + > > +LICENSE = "GPL-3.0-or-later" > > +LIC_FILES_CHKSUM = > > "file://src/cabextract.c;beginline=4;endline=11;md5=b0a10c6d3843f262114e7ecf91fc7e78" > > + > > +SRC_URI = "https://www.cabextract.org.uk/cabextract-${PV}.tar.gz; > > +SRC_URI[sha256sum] = > > "b5546db1155e4c718ff3d4b278573604f30dd64c3c5bfd4657cd089b823a3ac6" > > + > > +DEPENDS = "libmspack" > > + > > +EXTRA_OECONF = "--with-external-libmspack" > > + > > +inherit autotools pkgconfig > > + > > +BBCLASSEXTEND += "native nativesdk" > > diff --git a/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb > > b/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb > > new file mode 100644 > > index ..169a5f271be9 > > --- /dev/null > > +++ b/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb > > @@ -0,0 +1,16 @@ > > +SUMMARY = "A library for Microsoft compression formats" > > +DESCRIPTION = "The library provides compressors and decompressors,\ > > +archivers and dearchivers for Microsoft compression formats: CAB, CHM, > > WIM,\ > > +LIT, HLP, KWAJ and SZDD." > > +HOMEPAGE = "http://www.cabextract.org.uk/libmspack/; > > +SECTION = "lib" > > +LICENSE = "LGPL-2.1-only" > > + > > +LIC_FILES_CHKSUM = > > "file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" > > + > > +SRC_URI = "https://www.cabextract.org.uk/libmspack/libmspack-${PV}.tar.gz; > > +SRC_URI[sha256sum] = > > "70dd1fb2f0aecc36791b71a1e1840e62173079eadaa081192d1c323a0eeea21b" > > + > > +inherit autotools > > + > > +BBCLASSEXTEND += "native nativesdk" > > -- > > 2.39.2 > > > > > > > > -- With best wishes Dmitry -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110635): https://lists.openembedded.org/g/openembedded-devel/message/110635 Mute This Topic: https://lists.openembedded.org/mt/106365503/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [scarthgap][PATCH] libdeflate: fix build with -mcpu=cortex-a76+crypto without -march=armv8.2-a+crypto
On 5/29/24 9:16 AM, Martin Jansa via lists.openembedded.org wrote: * fixes: https://github.com/ebiggers/libdeflate/issues/369 Signed-off-by: Martin Jansa Signed-off-by: Khem Raj I have this already backported to scarthgap-nut thanks, Armin --- ...e-explicit-armv8.2-a-on-gcc-13.2-and.patch | 57 +++ .../libdeflate/libdeflate_1.20.bb | 5 +- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch b/meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch new file mode 100644 index 00..e87972af27 --- /dev/null +++ b/meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch @@ -0,0 +1,57 @@ +From 684ebc7f8eb44558219d4b5be52add1250b3c0ca Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Tue, 30 Apr 2024 11:27:55 -0700 +Subject: [PATCH] lib/arm: don't use explicit armv8.2-a on gcc 13.2 and later + +Resolves https://github.com/ebiggers/libdeflate/issues/369 +--- +Upstream-Status: Backport [https://github.com/ebiggers/libdeflate/pull/370] + + lib/arm/adler32_impl.h | 10 ++ + lib/arm/crc32_impl.h | 10 ++ + 2 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/lib/arm/adler32_impl.h b/lib/arm/adler32_impl.h +index 6453b8e..6144afb 100644 +--- a/lib/arm/adler32_impl.h b/lib/arm/adler32_impl.h +@@ -214,11 +214,13 @@ adler32_arm_neon(u32 adler, const u8 *p, size_t len) + # ifdef __clang__ + #define ATTRIBUTES_target_attribute("dotprod") +/* +-* With gcc, arch=armv8.2-a is needed for dotprod intrinsics, unless the +-* default target is armv8.3-a or later in which case it must be omitted. +-* armv8.3-a or later can be detected by checking for __ARM_FEATURE_JCVT. ++* With gcc 13.1 and earlier (before gcc commit 73d3bc348190 or 9aac37ab8a7b, ++* "aarch64: Remove architecture dependencies from intrinsics"), ++* arch=armv8.2-a is needed for the dotprod intrinsics, unless the default ++* target is armv8.3-a or later in which case it must be omitted. armv8.3-a ++* or later can be detected by checking for __ARM_FEATURE_JCVT. + */ +-# elif defined(__ARM_FEATURE_JCVT) ++# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT) + #define ATTRIBUTES_target_attribute("+dotprod") + # else + #define ATTRIBUTES_target_attribute("arch=armv8.2-a+dotprod") +diff --git a/lib/arm/crc32_impl.h b/lib/arm/crc32_impl.h +index 3c4bec7..5363041 100644 +--- a/lib/arm/crc32_impl.h b/lib/arm/crc32_impl.h +@@ -551,11 +551,13 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + # ifdef __clang__ + #define ATTRIBUTES_target_attribute("aes,crc,sha3") +/* +-* With gcc, arch=armv8.2-a is needed for the sha3 intrinsics, unless the +-* default target is armv8.3-a or later in which case it must be omitted. +-* armv8.3-a or later can be detected by checking for __ARM_FEATURE_JCVT. ++* With gcc 13.1 and earlier (before gcc commit 73d3bc348190 or 9aac37ab8a7b, ++* "aarch64: Remove architecture dependencies from intrinsics"), ++* arch=armv8.2-a is needed for the sha3 intrinsics, unless the default ++* target is armv8.3-a or later in which case it must be omitted. armv8.3-a ++* or later can be detected by checking for __ARM_FEATURE_JCVT. + */ +-# elif defined(__ARM_FEATURE_JCVT) ++# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT) + #define ATTRIBUTES_target_attribute("+crypto,+crc,+sha3") + # else + #define ATTRIBUTES _target_attribute("arch=armv8.2-a+crypto+crc+sha3") diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb index f0a966f2b4..e3de8aca62 100644 --- a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb +++ b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb @@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7b6977026437092191e9da699ed9f780" DEPENDS += "gzip zlib" -SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master" +SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master \ +file://0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch \ +" S = "${WORKDIR}/git" SRCREV = "275aa5141db6eda3587214e0f1d3a134768f557d" inherit cmake pkgconfig - -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110634): https://lists.openembedded.org/g/openembedded-devel/message/110634 Mute This Topic: https://lists.openembedded.org/mt/106368430/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe:
[oe] [meta-oe][v2][scarthgap][PATCH] pcapplusplus: Fix build with gcc14
From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Armin Kuster v2] Scarthgap has the same error as master: initialize timespec variable. pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::' is used uninitialized [-Werror=uninitialized] |23 | timespec nsec_time; | | ^ | cc1plus: all warnings being treated as errors --- .../0001-initialize-timespec-variable.patch | 35 +++ ...e-m_ExternalRawData-in-IDnsResource-.patch | 34 ++ .../pcapplusplus/pcapplusplus_23.09.bb| 5 ++- 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch create mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch new file mode 100644 index 00..f2e210fc67 --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch @@ -0,0 +1,35 @@ +From 298dec6f87061914c85049faca3d0ff3310d1794 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 May 2024 12:15:30 -0700 +Subject: [PATCH] initialize timespec variable + +Fixes build warnings with GCC14 + +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp: In constructor 'pcpp::RawPacket::RawPacket(const uint8_t*, int, timeval, bool, pcpp::LinkLayerType)': +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::' is used uninitialized [-Werror=uninitialized] + 23 | timespec nsec_time; + | ^ +cc1plus: all warnings being treated as errors + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1389] +Signed-off-by: Khem Raj +--- + Packet++/src/RawPacket.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp +index 8ad52d52..07dbbbe2 100644 +--- a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp +@@ -20,7 +20,7 @@ void RawPacket::init(bool deleteRawDataAtDestructor) + + RawPacket::RawPacket(const uint8_t* pRawData, int rawDataLen, timeval timestamp, bool deleteRawDataAtDestructor, LinkLayerType layerType) + { +- timespec nsec_time; ++ timespec nsec_time = {}; + TIMEVAL_TO_TIMESPEC(, _time); + init(deleteRawDataAtDestructor); + setRawData(pRawData, rawDataLen, nsec_time, layerType); +-- +2.45.0 + diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch new file mode 100644 index 00..b6389e0e3f --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch @@ -0,0 +1,34 @@ +From 742f564ee80749e9f1f3363092775545e37c0f87 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 9 May 2024 17:02:09 -0700 +Subject: [PATCH] packet++: Initialize m_ExternalRawData in IDnsResource + constructor + +Fixes following warning with GCC-14 + +Packet++/src/DnsResource.cpp:29:24: error: '*this.pcpp::IDnsResource::m_ExternalRawData' may be used uninitialized [-Werror=maybe-uninitialized] + 29 | return m_ExternalRawData; + |^ + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1391] +Signed-off-by: Khem Raj +--- + Packet++/src/DnsResource.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp +index fec1bf05..c1f97041 100644 +--- a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp +@@ -10,7 +10,7 @@ namespace pcpp + { + + IDnsResource::IDnsResource(DnsLayer* dnsLayer, size_t offsetInLayer) +- : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr) ++ : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr), m_ExternalRawData(nullptr) + { + char decodedName[4096]; + m_NameLength = decodeName((const char*)getRawData(), decodedName); +-- +2.45.0 + diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb index 39c6942c83..9db0222172 100644 --- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb @@ -7,7 +7,10 @@ LIC_FILES_CHKSUM =
Re: [oe] [meta-oe][scarthgap][PATCH] pcapplusplus: Fix build with gcc14
On 5/30/24 11:58 AM, Khem Raj wrote: On Thu, May 30, 2024 at 8:55 AM akuster808 wrote: On 5/30/24 8:40 AM, Martin Jansa wrote: Why is this needed in scarthgap? GCC upgrade won't be backported there I believe and it doesn't have native/nativesdk to be useful on hosts with gcc-14. My scarthgap build fails with the same error: /builds/stable/build/tmp/work/core2-32-poky-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::' is used uninitialized [-Werror=uninitialized] |23 | timespec nsec_time; | | ^ | cc1plus: all warnings being treated as errors Pkg builds after patch is applied. Should I add a note to this in the backport? I think the preset for this fix was GCC-14 but this fix was general. So backport is fine and perhaps adding context is ok too. Upto you. Context sounds good. thanks, - armin BR, Armin On Thu, May 30, 2024 at 2:35 PM Armin Kuster via lists.openembedded.org wrote: From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- .../0001-initialize-timespec-variable.patch | 35 +++ ...e-m_ExternalRawData-in-IDnsResource-.patch | 34 ++ .../pcapplusplus/pcapplusplus_23.09.bb| 5 ++- 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch create mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch new file mode 100644 index 00..f2e210fc67 --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch @@ -0,0 +1,35 @@ +From 298dec6f87061914c85049faca3d0ff3310d1794 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 May 2024 12:15:30 -0700 +Subject: [PATCH] initialize timespec variable + +Fixes build warnings with GCC14 + +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp: In constructor 'pcpp::RawPacket::RawPacket(const uint8_t*, int, timeval, bool, pcpp::LinkLayerType)': +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::' is used uninitialized [-Werror=uninitialized] + 23 | timespec nsec_time; + | ^ +cc1plus: all warnings being treated as errors + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1389] +Signed-off-by: Khem Raj +--- + Packet++/src/RawPacket.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp +index 8ad52d52..07dbbbe2 100644 +--- a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp +@@ -20,7 +20,7 @@ void RawPacket::init(bool deleteRawDataAtDestructor) + + RawPacket::RawPacket(const uint8_t* pRawData, int rawDataLen, timeval timestamp, bool deleteRawDataAtDestructor, LinkLayerType layerType) + { +- timespec nsec_time; ++ timespec nsec_time = {}; + TIMEVAL_TO_TIMESPEC(, _time); + init(deleteRawDataAtDestructor); + setRawData(pRawData, rawDataLen, nsec_time, layerType); +-- +2.45.0 + diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch new file mode 100644 index 00..b6389e0e3f --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch @@ -0,0 +1,34 @@ +From 742f564ee80749e9f1f3363092775545e37c0f87 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 9 May 2024 17:02:09 -0700 +Subject: [PATCH] packet++: Initialize m_ExternalRawData in IDnsResource + constructor + +Fixes following warning with GCC-14 + +Packet++/src/DnsResource.cpp:29:24: error: '*this.pcpp::IDnsResource::m_ExternalRawData' may be used uninitialized [-Werror=maybe-uninitialized] + 29 | return m_ExternalRawData; + |^ + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1391] +Signed-off-by: Khem Raj +--- + Packet++/src/DnsResource.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp +index fec1bf05..c1f97041 100644 +--- a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp +@@ -10,7 +10,7 @@ namespace pcpp + { + + IDnsResource::IDnsResource(DnsLayer* dnsLayer, size_t offsetInLayer) +- :
Re: [oe] [meta-oe][scarthgap][PATCH] pcapplusplus: Fix build with gcc14
On Thu, May 30, 2024 at 8:55 AM akuster808 wrote: > > > > On 5/30/24 8:40 AM, Martin Jansa wrote: > > Why is this needed in scarthgap? GCC upgrade won't be backported there > > I believe and it doesn't have native/nativesdk to be useful on hosts > > with gcc-14. > > My scarthgap build fails with the same error: > > > /builds/stable/build/tmp/work/core2-32-poky-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: > error: 'nsec_time.timespec::' is used uninitialized > [-Werror=uninitialized] > |23 | timespec nsec_time; > | | ^ > | cc1plus: all warnings being treated as errors > > Pkg builds after patch is applied. Should I add a note to this in the > backport? I think the preset for this fix was GCC-14 but this fix was general. So backport is fine and perhaps adding context is ok too. Upto you. > > BR, > Armin > > > > > On Thu, May 30, 2024 at 2:35 PM Armin Kuster via > > lists.openembedded.org > > wrote: > >> From: Khem Raj > >> > >> Signed-off-by: Khem Raj > >> Signed-off-by: Armin Kuster > >> --- > >> .../0001-initialize-timespec-variable.patch | 35 +++ > >> ...e-m_ExternalRawData-in-IDnsResource-.patch | 34 ++ > >> .../pcapplusplus/pcapplusplus_23.09.bb| 5 ++- > >> 3 files changed, 73 insertions(+), 1 deletion(-) > >> create mode 100644 > >> meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch > >> create mode 100644 > >> meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch > >> > >> diff --git > >> a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch > >> > >> b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch > >> new file mode 100644 > >> index 00..f2e210fc67 > >> --- /dev/null > >> +++ > >> b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch > >> @@ -0,0 +1,35 @@ > >> +From 298dec6f87061914c85049faca3d0ff3310d1794 Mon Sep 17 00:00:00 2001 > >> +From: Khem Raj > >> +Date: Mon, 6 May 2024 12:15:30 -0700 > >> +Subject: [PATCH] initialize timespec variable > >> + > >> +Fixes build warnings with GCC14 > >> + > >> +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp: > >> In constructor 'pcpp::RawPacket::RawPacket(const uint8_t*, int, timeval, > >> bool, pcpp::LinkLayerType)': > >> +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: > >> error: 'nsec_time.timespec::' is used uninitialized > >> [-Werror=uninitialized] > >> + 23 | timespec nsec_time; > >> + | ^ > >> +cc1plus: all warnings being treated as errors > >> + > >> +Upstream-Status: Submitted > >> [https://github.com/seladb/PcapPlusPlus/pull/1389] > >> +Signed-off-by: Khem Raj > >> +--- > >> + Packet++/src/RawPacket.cpp | 2 +- > >> + 1 file changed, 1 insertion(+), 1 deletion(-) > >> + > >> +diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp > >> +index 8ad52d52..07dbbbe2 100644 > >> +--- a/Packet++/src/RawPacket.cpp > >> b/Packet++/src/RawPacket.cpp > >> +@@ -20,7 +20,7 @@ void RawPacket::init(bool deleteRawDataAtDestructor) > >> + > >> + RawPacket::RawPacket(const uint8_t* pRawData, int rawDataLen, timeval > >> timestamp, bool deleteRawDataAtDestructor, LinkLayerType layerType) > >> + { > >> +- timespec nsec_time; > >> ++ timespec nsec_time = {}; > >> + TIMEVAL_TO_TIMESPEC(, _time); > >> + init(deleteRawDataAtDestructor); > >> + setRawData(pRawData, rawDataLen, nsec_time, layerType); > >> +-- > >> +2.45.0 > >> + > >> diff --git > >> a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch > >> > >> b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch > >> new file mode 100644 > >> index 00..b6389e0e3f > >> --- /dev/null > >> +++ > >> b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch > >> @@ -0,0 +1,34 @@ > >> +From 742f564ee80749e9f1f3363092775545e37c0f87 Mon Sep 17 00:00:00 2001 > >> +From: Khem Raj > >> +Date: Thu, 9 May 2024 17:02:09 -0700 > >> +Subject: [PATCH] packet++: Initialize m_ExternalRawData in IDnsResource > >> + constructor > >> + > >> +Fixes following warning with GCC-14 > >> + > >> +Packet++/src/DnsResource.cpp:29:24: error: > >> '*this.pcpp::IDnsResource::m_ExternalRawData' may be used uninitialized > >> [-Werror=maybe-uninitialized] > >> + 29 | return m_ExternalRawData; > >> + |^ > >> + > >> +Upstream-Status: Submitted > >> [https://github.com/seladb/PcapPlusPlus/pull/1391] >
Re: [oe] [meta-oe][scarthgap][PATCH] pcapplusplus: Fix build with gcc14
On 5/30/24 8:40 AM, Martin Jansa wrote: Why is this needed in scarthgap? GCC upgrade won't be backported there I believe and it doesn't have native/nativesdk to be useful on hosts with gcc-14. My scarthgap build fails with the same error: /builds/stable/build/tmp/work/core2-32-poky-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::' is used uninitialized [-Werror=uninitialized] | 23 | timespec nsec_time; | | ^ | cc1plus: all warnings being treated as errors Pkg builds after patch is applied. Should I add a note to this in the backport? BR, Armin On Thu, May 30, 2024 at 2:35 PM Armin Kuster via lists.openembedded.org wrote: From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- .../0001-initialize-timespec-variable.patch | 35 +++ ...e-m_ExternalRawData-in-IDnsResource-.patch | 34 ++ .../pcapplusplus/pcapplusplus_23.09.bb| 5 ++- 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch create mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch new file mode 100644 index 00..f2e210fc67 --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch @@ -0,0 +1,35 @@ +From 298dec6f87061914c85049faca3d0ff3310d1794 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 May 2024 12:15:30 -0700 +Subject: [PATCH] initialize timespec variable + +Fixes build warnings with GCC14 + +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp: In constructor 'pcpp::RawPacket::RawPacket(const uint8_t*, int, timeval, bool, pcpp::LinkLayerType)': +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::' is used uninitialized [-Werror=uninitialized] + 23 | timespec nsec_time; + | ^ +cc1plus: all warnings being treated as errors + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1389] +Signed-off-by: Khem Raj +--- + Packet++/src/RawPacket.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp +index 8ad52d52..07dbbbe2 100644 +--- a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp +@@ -20,7 +20,7 @@ void RawPacket::init(bool deleteRawDataAtDestructor) + + RawPacket::RawPacket(const uint8_t* pRawData, int rawDataLen, timeval timestamp, bool deleteRawDataAtDestructor, LinkLayerType layerType) + { +- timespec nsec_time; ++ timespec nsec_time = {}; + TIMEVAL_TO_TIMESPEC(, _time); + init(deleteRawDataAtDestructor); + setRawData(pRawData, rawDataLen, nsec_time, layerType); +-- +2.45.0 + diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch new file mode 100644 index 00..b6389e0e3f --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch @@ -0,0 +1,34 @@ +From 742f564ee80749e9f1f3363092775545e37c0f87 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 9 May 2024 17:02:09 -0700 +Subject: [PATCH] packet++: Initialize m_ExternalRawData in IDnsResource + constructor + +Fixes following warning with GCC-14 + +Packet++/src/DnsResource.cpp:29:24: error: '*this.pcpp::IDnsResource::m_ExternalRawData' may be used uninitialized [-Werror=maybe-uninitialized] + 29 | return m_ExternalRawData; + |^ + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1391] +Signed-off-by: Khem Raj +--- + Packet++/src/DnsResource.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp +index fec1bf05..c1f97041 100644 +--- a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp +@@ -10,7 +10,7 @@ namespace pcpp + { + + IDnsResource::IDnsResource(DnsLayer* dnsLayer, size_t offsetInLayer) +- : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr) ++ : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr), m_ExternalRawData(nullptr) + { + char decodedName[4096]; + m_NameLength = decodeName((const
[oe] [meta-oe][PATCH] pv: Update from 1.6.20 to 1.7.0
Signed-off-by: Chaitanya Vadrevu --- meta-oe/recipes-support/pv/{pv_1.6.20.bb => pv_1.7.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/pv/{pv_1.6.20.bb => pv_1.7.0.bb} (91%) diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.7.0.bb similarity index 91% rename from meta-oe/recipes-support/pv/pv_1.6.20.bb rename to meta-oe/recipes-support/pv/pv_1.7.0.bb index 6a739af927..f6f0045c2a 100644 --- a/meta-oe/recipes-support/pv/pv_1.6.20.bb +++ b/meta-oe/recipes-support/pv/pv_1.7.0.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" +SRC_URI[sha256sum] = "1372b41053881a05e2df10cb054304decc0233261c0aa0e96185842fa5a422ad" UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml; UPSTREAM_CHECK_REGEX = "pv-(?P\d+(\.\d+)+).tar.bz2" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110629): https://lists.openembedded.org/g/openembedded-devel/message/110629 Mute This Topic: https://lists.openembedded.org/mt/106390746/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] cabextract: add utility to extract Microsft cabinet files
fails to build. https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3893/steps/14/logs/stdio On Wed, May 29, 2024 at 2:02 AM Dmitry Baryshkov via lists.openembedded.org wrote: > > WoA firmware, fonts and some other useful files are being distributed as > a Microsoft cabinet files. Add recipes for the cabextract utility, which > is used to extract such files. > > Cabextract can either use a bundled source tree for libmspack library or > an externally provided library. Package the library separately in order > to be able to share it with the meta-security layer. > > Cc: Armin Kuster > Signed-off-by: Dmitry Baryshkov > --- > .../cabextract/cabextract_1.11.bb | 18 ++ > .../cabextract/libmspack_0.11alpha.bb | 16 > 2 files changed, 34 insertions(+) > create mode 100644 meta-oe/recipes-support/cabextract/cabextract_1.11.bb > create mode 100644 meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb > > diff --git a/meta-oe/recipes-support/cabextract/cabextract_1.11.bb > b/meta-oe/recipes-support/cabextract/cabextract_1.11.bb > new file mode 100644 > index ..4d0354b0 > --- /dev/null > +++ b/meta-oe/recipes-support/cabextract/cabextract_1.11.bb > @@ -0,0 +1,18 @@ > +SUMMARY = "Software for extracting Microsoft cabinet files" > +DESCRIPTION = "tool for extracting Microsoft cabinet files" > +HOMEPAGE = "http://www.cabextract.org.uk/; > +SECTION = "console/utils" > + > +LICENSE = "GPL-3.0-or-later" > +LIC_FILES_CHKSUM = > "file://src/cabextract.c;beginline=4;endline=11;md5=b0a10c6d3843f262114e7ecf91fc7e78" > + > +SRC_URI = "https://www.cabextract.org.uk/cabextract-${PV}.tar.gz; > +SRC_URI[sha256sum] = > "b5546db1155e4c718ff3d4b278573604f30dd64c3c5bfd4657cd089b823a3ac6" > + > +DEPENDS = "libmspack" > + > +EXTRA_OECONF = "--with-external-libmspack" > + > +inherit autotools pkgconfig > + > +BBCLASSEXTEND += "native nativesdk" > diff --git a/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb > b/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb > new file mode 100644 > index ..169a5f271be9 > --- /dev/null > +++ b/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb > @@ -0,0 +1,16 @@ > +SUMMARY = "A library for Microsoft compression formats" > +DESCRIPTION = "The library provides compressors and decompressors,\ > +archivers and dearchivers for Microsoft compression formats: CAB, CHM, WIM,\ > +LIT, HLP, KWAJ and SZDD." > +HOMEPAGE = "http://www.cabextract.org.uk/libmspack/; > +SECTION = "lib" > +LICENSE = "LGPL-2.1-only" > + > +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" > + > +SRC_URI = "https://www.cabextract.org.uk/libmspack/libmspack-${PV}.tar.gz; > +SRC_URI[sha256sum] = > "70dd1fb2f0aecc36791b71a1e1840e62173079eadaa081192d1c323a0eeea21b" > + > +inherit autotools > + > +BBCLASSEXTEND += "native nativesdk" > -- > 2.39.2 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110628): https://lists.openembedded.org/g/openembedded-devel/message/110628 Mute This Topic: https://lists.openembedded.org/mt/106365503/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][scarthgap][PATCH] pcapplusplus: Fix build with gcc14
Why is this needed in scarthgap? GCC upgrade won't be backported there I believe and it doesn't have native/nativesdk to be useful on hosts with gcc-14. On Thu, May 30, 2024 at 2:35 PM Armin Kuster via lists.openembedded.org wrote: > > From: Khem Raj > > Signed-off-by: Khem Raj > Signed-off-by: Armin Kuster > --- > .../0001-initialize-timespec-variable.patch | 35 +++ > ...e-m_ExternalRawData-in-IDnsResource-.patch | 34 ++ > .../pcapplusplus/pcapplusplus_23.09.bb| 5 ++- > 3 files changed, 73 insertions(+), 1 deletion(-) > create mode 100644 > meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch > create mode 100644 > meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch > > diff --git > a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch > > b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch > new file mode 100644 > index 00..f2e210fc67 > --- /dev/null > +++ > b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch > @@ -0,0 +1,35 @@ > +From 298dec6f87061914c85049faca3d0ff3310d1794 Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Mon, 6 May 2024 12:15:30 -0700 > +Subject: [PATCH] initialize timespec variable > + > +Fixes build warnings with GCC14 > + > +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp: > In constructor 'pcpp::RawPacket::RawPacket(const uint8_t*, int, timeval, > bool, pcpp::LinkLayerType)': > +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: > error: 'nsec_time.timespec::' is used uninitialized > [-Werror=uninitialized] > + 23 | timespec nsec_time; > + | ^ > +cc1plus: all warnings being treated as errors > + > +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1389] > +Signed-off-by: Khem Raj > +--- > + Packet++/src/RawPacket.cpp | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp > +index 8ad52d52..07dbbbe2 100644 > +--- a/Packet++/src/RawPacket.cpp > b/Packet++/src/RawPacket.cpp > +@@ -20,7 +20,7 @@ void RawPacket::init(bool deleteRawDataAtDestructor) > + > + RawPacket::RawPacket(const uint8_t* pRawData, int rawDataLen, timeval > timestamp, bool deleteRawDataAtDestructor, LinkLayerType layerType) > + { > +- timespec nsec_time; > ++ timespec nsec_time = {}; > + TIMEVAL_TO_TIMESPEC(, _time); > + init(deleteRawDataAtDestructor); > + setRawData(pRawData, rawDataLen, nsec_time, layerType); > +-- > +2.45.0 > + > diff --git > a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch > > b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch > new file mode 100644 > index 00..b6389e0e3f > --- /dev/null > +++ > b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch > @@ -0,0 +1,34 @@ > +From 742f564ee80749e9f1f3363092775545e37c0f87 Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Thu, 9 May 2024 17:02:09 -0700 > +Subject: [PATCH] packet++: Initialize m_ExternalRawData in IDnsResource > + constructor > + > +Fixes following warning with GCC-14 > + > +Packet++/src/DnsResource.cpp:29:24: error: > '*this.pcpp::IDnsResource::m_ExternalRawData' may be used uninitialized > [-Werror=maybe-uninitialized] > + 29 | return m_ExternalRawData; > + |^ > + > +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1391] > +Signed-off-by: Khem Raj > +--- > + Packet++/src/DnsResource.cpp | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp > +index fec1bf05..c1f97041 100644 > +--- a/Packet++/src/DnsResource.cpp > b/Packet++/src/DnsResource.cpp > +@@ -10,7 +10,7 @@ namespace pcpp > + { > + > + IDnsResource::IDnsResource(DnsLayer* dnsLayer, size_t offsetInLayer) > +- : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), > m_NextResource(nullptr) > ++ : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), > m_NextResource(nullptr), m_ExternalRawData(nullptr) > + { > + char decodedName[4096]; > + m_NameLength = decodeName((const char*)getRawData(), decodedName); > +-- > +2.45.0 > + > diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb > b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb > index 39c6942c83..9db0222172 100644 > ---
[oe] [meta-oe][scarthgap][PATCH] pcapplusplus: Fix build with gcc14
From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- .../0001-initialize-timespec-variable.patch | 35 +++ ...e-m_ExternalRawData-in-IDnsResource-.patch | 34 ++ .../pcapplusplus/pcapplusplus_23.09.bb| 5 ++- 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch create mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch new file mode 100644 index 00..f2e210fc67 --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch @@ -0,0 +1,35 @@ +From 298dec6f87061914c85049faca3d0ff3310d1794 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 May 2024 12:15:30 -0700 +Subject: [PATCH] initialize timespec variable + +Fixes build warnings with GCC14 + +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp: In constructor 'pcpp::RawPacket::RawPacket(const uint8_t*, int, timeval, bool, pcpp::LinkLayerType)': +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::' is used uninitialized [-Werror=uninitialized] + 23 | timespec nsec_time; + | ^ +cc1plus: all warnings being treated as errors + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1389] +Signed-off-by: Khem Raj +--- + Packet++/src/RawPacket.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp +index 8ad52d52..07dbbbe2 100644 +--- a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp +@@ -20,7 +20,7 @@ void RawPacket::init(bool deleteRawDataAtDestructor) + + RawPacket::RawPacket(const uint8_t* pRawData, int rawDataLen, timeval timestamp, bool deleteRawDataAtDestructor, LinkLayerType layerType) + { +- timespec nsec_time; ++ timespec nsec_time = {}; + TIMEVAL_TO_TIMESPEC(, _time); + init(deleteRawDataAtDestructor); + setRawData(pRawData, rawDataLen, nsec_time, layerType); +-- +2.45.0 + diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch new file mode 100644 index 00..b6389e0e3f --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch @@ -0,0 +1,34 @@ +From 742f564ee80749e9f1f3363092775545e37c0f87 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 9 May 2024 17:02:09 -0700 +Subject: [PATCH] packet++: Initialize m_ExternalRawData in IDnsResource + constructor + +Fixes following warning with GCC-14 + +Packet++/src/DnsResource.cpp:29:24: error: '*this.pcpp::IDnsResource::m_ExternalRawData' may be used uninitialized [-Werror=maybe-uninitialized] + 29 | return m_ExternalRawData; + |^ + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1391] +Signed-off-by: Khem Raj +--- + Packet++/src/DnsResource.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp +index fec1bf05..c1f97041 100644 +--- a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp +@@ -10,7 +10,7 @@ namespace pcpp + { + + IDnsResource::IDnsResource(DnsLayer* dnsLayer, size_t offsetInLayer) +- : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr) ++ : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr), m_ExternalRawData(nullptr) + { + char decodedName[4096]; + m_NameLength = decodeName((const char*)getRawData(), decodedName); +-- +2.45.0 + diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb index 39c6942c83..9db0222172 100644 --- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb @@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" DEPENDS = "libpcap" -SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master" +SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master \ + file://0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch \ +
Re: [oe] [meta-oe][PATCH v2] android-tools-configfs: Fix build-time warning about S being non-existent
Hi, I believe similar recipe updates in e.g. oe-core also update do_install() and friends to reference S again instead of UNPACKDIR, i.e. something like the following should also be done to be consistent (sorry for the formatting): do_install() { install -d ${D}${bindir} -install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} -install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir} -install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir} +install -m 0755 ${S}/android-gadget-setup ${D}${bindir} +install -m 0755 ${S}/android-gadget-start ${D}${bindir} +install -m 0755 ${S}/android-gadget-cleanup ${D}${bindir} -if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then +if [ -r ${S}/android-gadget-setup.machine ] ; then install -d ${D}${sysconfdir} - install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir} + install -m 0644 ${S}/android-gadget-setup.machine ${D}${sysconfdir} fi install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d -install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d +install -m 0644 ${S}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d } Cheers, Andre' -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110625): https://lists.openembedded.org/g/openembedded-devel/message/110625 Mute This Topic: https://lists.openembedded.org/mt/106351864/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [PATCH 18/23] mongodb: skip until python 3.12 fixes are available.
Hello It seems to compile with this patch diff --git a/buildscripts/moduleconfig.py b/buildscripts/moduleconfig.py index b4d0bba0490..73c0f1a03fa 100644 --- a/buildscripts/moduleconfig.py +++ b/buildscripts/moduleconfig.py @@ -27,7 +27,7 @@ MongoDB SConscript files do. __all__ = ('discover_modules', 'discover_module_directories', 'configure_modules', 'register_module_test') # pylint: disable=undefined-all-variable -import imp +import importlib import inspect import os @@ -71,7 +71,7 @@ def discover_modules(module_root, allowed_modules): print("adding module: %s" % (name)) fp = open(build_py, "r") try: - module = imp.load_module("module_" + name, fp, build_py, + module = importlib.import_module("module_" + name, fp, build_py, (".py", "r", imp.PY_SOURCE)) if getattr(module, "name", None) is None: module.name = name -- 2.34.1 I'm not that confident about it but if it helps :) Best regards, Vincent -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110624): https://lists.openembedded.org/g/openembedded-devel/message/110624 Mute This Topic: https://lists.openembedded.org/mt/103445578/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] android-tools: fix adb OpenSSL patch (really make compatible with >= v1.1)
As per the inlined patch commit message, gcc 14 is highlighting a few issues with the existing patch and it doesn't compile. Update the patch to fix. Note there are two recipes for android-tools in this layer - the recipe here and another one in meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools. A patch for the alternative android-tools version had already been posted, so this patch only deals with the remaining one. Signed-off-by: André Draszik --- .../android-tools/core/adb_libssl_11.diff | 68 ++- 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff index 177d69a97a3e..5ba576fe84d4 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff @@ -1,29 +1,54 @@ -Description: adb: Make compatible with openssl 1.1 - OpenSSL version 1.1 brought some API changes which broke the build here, - fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead. -Author: Chirayu Desai +Date: Mon, 27 May 2024 10:54:08 +0100 +Subject: [PATCH] adb: (really) make compatible with openssl 1.1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Upstream-Status: Pending +Compiling using gcc 14 results in the following: + +| .../android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:23: error: passing argument 2 of 'RSA_get0_key' from incompatible pointer type [-Wincompatible-pointer-types] +|86 | RSA_get0_key(rsa, , , NULL); +| | ^~ +| | | +| | BIGNUM ** {aka struct bignum_st **} +| .../android-tools/5.1.1.r37/recipe-sysroot/usr/include/openssl/rsa.h:229:56: note: expected 'const BIGNUM **' {aka 'const struct bignum_st **'} but argument is of type 'BIGNUM **' {aka 'struct bignum_st **'} +| 229 | const BIGNUM **n, const BIGNUM **e, +| | ~~~^ +| .../android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:27: error: passing argument 3 of 'RSA_get0_key' from incompatible pointer type [-Wincompatible-pointer-types] +|86 | RSA_get0_key(rsa, , , NULL); +| | ^~ +| | | +| | BIGNUM ** {aka struct bignum_st **} +| .../android-tools/5.1.1.r37/recipe-sysroot/usr/include/openssl/rsa.h:229:74: note: expected 'const BIGNUM **' {aka 'const struct bignum_st **'} but argument is of type 'BIGNUM **' {aka 'struct bignum_st **'} +| 229 | const BIGNUM **n, const BIGNUM **e, +| | ~~~^ + +Update the code to correct usage of the OpenSSL APIs. - system/core/adb/adb_auth_host.c |5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) +Signed-off-by: André Draszik +--- +Upstream-Status: Inappropriate (ancient version of android-tools) +--- + adb/adb_auth_host.c | 7 +++ + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/adb/adb_auth_host.c b/adb/adb_auth_host.c +index dd839001b5a3..a24e9bd89a7a 100644 --- a/adb/adb_auth_host.c +++ b/adb/adb_auth_host.c -@@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, +@@ -73,7 +73,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey) + BIGNUM* rr = BN_new(); + BIGNUM* r = BN_new(); BIGNUM* rem = BN_new(); - BIGNUM* n = BN_new(); +-BIGNUM* n = BN_new(); ++const BIGNUM* n = NULL, *e = NULL; BIGNUM* n0inv = BN_new(); -+BIGNUM* e = BN_new(); if (RSA_size(rsa) != RSANUMBYTES) { - ret = 0; -@@ -82,7 +83,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, +@@ -82,7 +82,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey) } BN_set_bit(r32, 32); @@ -32,7 +57,7 @@ Upstream-Status: Pending BN_set_bit(r, RSANUMWORDS * 32); BN_mod_sqr(rr, r, n, ctx); BN_div(NULL, rem, n, r32, ctx); -@@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, +@@ -96,11 +96,10 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey) BN_div(n, rem, n, r32, ctx); pkey->n[i] = BN_get_word(rem); } @@ -41,3 +66,10 @@ Upstream-Status: Pending out: BN_free(n0inv); +-BN_free(n); + BN_free(rem); + BN_free(r); + BN_free(rr); +-- +2.45.1.288.g0e0cd299f1-goog + -- 2.45.1.288.g0e0cd299f1-goog -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110623): https://lists.openembedded.org/g/openembedded-devel/message/110623 Mute This Topic: