Re: [oe] [PATCH] nodejs-oe-cache: fix offline install of dependencies
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. > > 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 > > eventually when this branch is gone through some level of testing, it > is proposed to upstream > branch via scarthgap-next in main repo. > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110399): https://lists.openembedded.org/g/openembedded-devel/message/110399 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] [PATCH] nodejs-oe-cache: fix offline install of dependencies
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. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110334): https://lists.openembedded.org/g/openembedded-devel/message/110334 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] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 2/2] python3-pycurl: extend for native and nativesdk
From: Geoff Parker Signed-off-by: Geoff Parker --- meta-python/recipes-devtools/python/python3-pycurl_7.45.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pycurl_7.45.2.bb b/meta-python/recipes-devtools/python/python3-pycurl_7.45.2.bb index fb2a41d26..a6863e21f 100644 --- a/meta-python/recipes-devtools/python/python3-pycurl_7.45.2.bb +++ b/meta-python/recipes-devtools/python/python3-pycurl_7.45.2.bb @@ -17,3 +17,5 @@ SRC_URI[sha256sum] = "5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d2 DEPENDS = "curl" inherit pypi setuptools3 + +BBCLASSEXTEND += "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#109925): https://lists.openembedded.org/g/openembedded-devel/message/109925 Mute This Topic: https://lists.openembedded.org/mt/105470005/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 1/2] python3-tornado: extend for native and nativesdk
From: Geoff Parker Signed-off-by: Geoff Parker --- meta-python/recipes-devtools/python/python3-tornado_6.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-tornado_6.4.bb b/meta-python/recipes-devtools/python/python3-tornado_6.4.bb index e3d0209e1..08c8672eb 100644 --- a/meta-python/recipes-devtools/python/python3-tornado_6.4.bb +++ b/meta-python/recipes-devtools/python/python3-tornado_6.4.bb @@ -37,3 +37,5 @@ PACKAGES =+ "\ FILES:${PN}-test = " \ ${libdir}/${PYTHON_DIR}/site-packages/*/test \ " + +BBCLASSEXTEND += "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#109924): https://lists.openembedded.org/g/openembedded-devel/message/109924 Mute This Topic: https://lists.openembedded.org/mt/105470003/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-java][PATCH] layer.conf: Mark as compatible with scarthgap
From: Geoff Parker LAYERSERIES_COMPAT: replace nanbield with scarthgap for Yocto 5.0 Signed-off-by: Geoff Parker --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index b6bf909..71d6a10 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-java" BBFILE_PATTERN_meta-java := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-java = "10" -LAYERSERIES_COMPAT_meta-java = "nanbield" +LAYERSERIES_COMPAT_meta-java = "scarthgap" LAYERDEPENDS_meta-java += "openembedded-layer" LICENSE_PATH += "${LAYERDIR}/licenses" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#109413): https://lists.openembedded.org/g/openembedded-devel/message/109413 Mute This Topic: https://lists.openembedded.org/mt/105011412/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-platformdirs: add nativesdk to BBCLASSEXTEND
From: Geoff Parker Signed-off-by: Geoff Parker --- .../recipes-devtools/python/python3-platformdirs_3.5.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-platformdirs_3.5.1.bb b/meta-python/recipes-devtools/python/python3-platformdirs_3.5.1.bb index 4fefe565f..c5c3d9fe6 100644 --- a/meta-python/recipes-devtools/python/python3-platformdirs_3.5.1.bb +++ b/meta-python/recipes-devtools/python/python3-platformdirs_3.5.1.bb @@ -32,4 +32,4 @@ do_install_ptest() { cp -rf ${S}/tests ${D}${PTEST_PATH}/ } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#103105): https://lists.openembedded.org/g/openembedded-devel/message/103105 Mute This Topic: https://lists.openembedded.org/mt/99326983/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-pillow: add tk to RDEPENDS ptest pkg only if x11 in DISTRO_FEATURES
From: Geoff Parker commit 7b0e71e00 ("python3-pillow: add ptest support", 2023-01-31) added tk to RDEPENDS:${PN}-ptest. Which cause this error on non x11 builds: ERROR: Nothing RPROVIDES 'tk' (but meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb RDEPENDS on or otherwise requires it) tk was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES) NOTE: Runtime target 'tk' is unbuildable, removing... Missing or unbuildable dependency chain was: ['tk'] NOTE: Runtime target 'iotmanager' is unbuildable, removing... Missing or unbuildable dependency chain was: ['iotmanager', 'python3-pillow', 'tk'] ERROR: Required build target 'update-runtime' has no buildable providers. Missing or unbuildable dependency chain was: ['update-runtime', 'runtime-image', 'iotmanager', 'python3-pillow', 'tk'] Add tk dependency only if DISTRO_FEATURES includes x11 Signed-off-by: Geoff Parker --- meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb b/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb index 68c81029c..9f1cc9eac 100644 --- a/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb @@ -43,7 +43,7 @@ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ ${PYTHON_PN}-pytest-timeout \ ${PYTHON_PN}-resource \ -tk \ +${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'tk', '', d)} \ " CVE_PRODUCT = "pillow" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100940): https://lists.openembedded.org/g/openembedded-devel/message/100940 Mute This Topic: https://lists.openembedded.org/mt/96778780/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] Kirkstone merge request: Jan 8th
Hi Khem, Stephanie's patch worked for me. On Mon, Jan 9, 2023 at 5:04 PM Khem Raj wrote: > > Can you try > https://patchwork.yoctoproject.org/project/oe/patch/20230110002358.GC1773006@codepurple/ > > On Mon, Jan 9, 2023 at 3:31 PM Geoff Parker wrote: > > > > Since the merge of > > .../recipes-support/multipath-tools/multipath-tools_0.8.4.bb CVE fix, > > I've been getting build failures on my kirkstone builds due to this > > do_package_qa Error. > > > > ERROR: multipath-tools-0.8.4-r0 do_package_qa: QA Issue: non > > -dev/-dbg/nativesdk- package multipath-tools-libs contains symlink .so > > '/usr/lib/libdmmp.so' > > non -dev/-dbg/nativesdk- package multipath-tools-libs contains symlink > > .so '/usr/lib/libmpathcmd.so' > > non -dev/-dbg/nativesdk- package multipath-tools-libs contains symlink > > .so '/usr/lib/libmultipath.so' > > non -dev/-dbg/nativesdk- package multipath-tools-libs contains symlink > > .so '/usr/lib/libmpathpersist.so' [dev-so] > > ERROR: multipath-tools-0.8.4-r0 do_package_qa: Fatal QA errors were > > found, failing task. > > > > The only ways I've been able to resolve the QA Error is to either > > revert the multipath-tools CVE fix commit, or add > > 'INSANE_SKIP:${PN}-libs = "dev-so" ' to a .bbappend. > > > > I'm happy to send a patch for the INSSANE_SKIP work-around, but I'm > > not sure this is a proper fix to this or not. > > > > On Sun, Jan 8, 2023 at 7:54 AM Khem Raj wrote: > > > > > > merged thanks. > > > > > > On Sun, Jan 8, 2023 at 7:32 AM akuster808 wrote: > > > > > > > > The following changes since commit > > > > a8055484f2829e8dfd03d5c8520b2c611aa7ebd2: > > > > > > > >dool: Add patch to fix rebuild (2022-12-11 16:18:53 -0500) > > > > > > > > are available in the Git repository at: > > > > > > > >https://git.openembedded.org/meta-openembedded kirkstone-next > > > > > > > > for you to fetch changes up to a9c25bef8882a69fd35ea7dbac3d978ce440fe06: > > > > > > > >mariadb: Upgrade to 10.7.7 (2023-01-04 11:46:45 -0500) > > > > > > > > > > > > Archana Polampalli (1): > > > >Nodejs: Fixed python3 DeprecationWarning > > > > > > > > Mingli Yu (3): > > > >php: Upgrade to 8.1.12 > > > >mariadb: not use qemu to run cross-compiled binaries > > > >mariadb: Upgrade to 10.7.7 > > > > > > > > Narpat Mali (1): > > > >Fix collections.abc deprecation warning in downloadutils Warning > > > > appears as: > > > > > > > > Polampalli, Archana (1): > > > >xfce4-settings: 4.16.2 -> 4.16.5 > > > > > > > > Siddharth Doshi (1): > > > >xterm : Fix CVE-2022-45063 code execution via OSC 50 input > > > > sequences] CVE-2022-45063 > > > > > > > > Yogita Urade (1): > > > >multipath-tools:fix CVE-2022-41973 > > > > > > > > .../{mariadb-native_10.7.4.bb => mariadb-native_10.7.7.bb} | 4 +- > > > > meta-oe/recipes-dbs/mysql/mariadb.inc | 23 > > > > +- > > > > .../0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch| 69 > > > > +++ > > > > meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch | 34 > > > > ++ > > > > meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch| 416 > > > > --- > > > > .../recipes-dbs/mysql/{mariadb_10.7.4.bb => mariadb_10.7.7.bb} | 6 > > > > +- > > > > .../nodejs/0001-Nodejs-Fixed-pipes-DeprecationWarning.patch | 35 > > > > ++ > > > > meta-oe/recipes-devtools/nodejs/nodejs_16.18.1.bb | 3 +- > > > > meta-oe/recipes-devtools/php/{php_8.1.10.bb => php_8.1.12.bb} | 2 +- > > > > meta-oe/recipes-graphics/xorg-app/xterm/CVE-2022-45063.patch| 782 > > > > > > > > meta-oe/recipes-graphics/xorg-app/xterm_372.bb | 1 + > > > > .../files/0001-multipath-tools-use-run-instead-of-dev-shm.patch | 159 > > > > ++ > > > > .../recipes-support/multipath-tools/multipath-tools_0.8.4.bb| 4 + > > > > ...1-Fix-collections.abc-deprecation-warning-in-downloadu.patch
Re: [oe] Kirkstone merge request: Jan 8th
Since the merge of .../recipes-support/multipath-tools/multipath-tools_0.8.4.bb CVE fix, I've been getting build failures on my kirkstone builds due to this do_package_qa Error. ERROR: multipath-tools-0.8.4-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package multipath-tools-libs contains symlink .so '/usr/lib/libdmmp.so' non -dev/-dbg/nativesdk- package multipath-tools-libs contains symlink .so '/usr/lib/libmpathcmd.so' non -dev/-dbg/nativesdk- package multipath-tools-libs contains symlink .so '/usr/lib/libmultipath.so' non -dev/-dbg/nativesdk- package multipath-tools-libs contains symlink .so '/usr/lib/libmpathpersist.so' [dev-so] ERROR: multipath-tools-0.8.4-r0 do_package_qa: Fatal QA errors were found, failing task. The only ways I've been able to resolve the QA Error is to either revert the multipath-tools CVE fix commit, or add 'INSANE_SKIP:${PN}-libs = "dev-so" ' to a .bbappend. I'm happy to send a patch for the INSSANE_SKIP work-around, but I'm not sure this is a proper fix to this or not. On Sun, Jan 8, 2023 at 7:54 AM Khem Raj wrote: > > merged thanks. > > On Sun, Jan 8, 2023 at 7:32 AM akuster808 wrote: > > > > The following changes since commit a8055484f2829e8dfd03d5c8520b2c611aa7ebd2: > > > >dool: Add patch to fix rebuild (2022-12-11 16:18:53 -0500) > > > > are available in the Git repository at: > > > >https://git.openembedded.org/meta-openembedded kirkstone-next > > > > for you to fetch changes up to a9c25bef8882a69fd35ea7dbac3d978ce440fe06: > > > >mariadb: Upgrade to 10.7.7 (2023-01-04 11:46:45 -0500) > > > > > > Archana Polampalli (1): > >Nodejs: Fixed python3 DeprecationWarning > > > > Mingli Yu (3): > >php: Upgrade to 8.1.12 > >mariadb: not use qemu to run cross-compiled binaries > >mariadb: Upgrade to 10.7.7 > > > > Narpat Mali (1): > >Fix collections.abc deprecation warning in downloadutils Warning > > appears as: > > > > Polampalli, Archana (1): > >xfce4-settings: 4.16.2 -> 4.16.5 > > > > Siddharth Doshi (1): > >xterm : Fix CVE-2022-45063 code execution via OSC 50 input > > sequences] CVE-2022-45063 > > > > Yogita Urade (1): > >multipath-tools:fix CVE-2022-41973 > > > > .../{mariadb-native_10.7.4.bb => mariadb-native_10.7.7.bb} | 4 +- > > meta-oe/recipes-dbs/mysql/mariadb.inc | 23 +- > > .../0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch| 69 +++ > > meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch | 34 ++ > > meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch| 416 > > --- > > .../recipes-dbs/mysql/{mariadb_10.7.4.bb => mariadb_10.7.7.bb} | 6 +- > > .../nodejs/0001-Nodejs-Fixed-pipes-DeprecationWarning.patch | 35 ++ > > meta-oe/recipes-devtools/nodejs/nodejs_16.18.1.bb | 3 +- > > meta-oe/recipes-devtools/php/{php_8.1.10.bb => php_8.1.12.bb} | 2 +- > > meta-oe/recipes-graphics/xorg-app/xterm/CVE-2022-45063.patch| 782 > > > > meta-oe/recipes-graphics/xorg-app/xterm_372.bb | 1 + > > .../files/0001-multipath-tools-use-run-instead-of-dev-shm.patch | 159 > > ++ > > .../recipes-support/multipath-tools/multipath-tools_0.8.4.bb| 4 + > > ...1-Fix-collections.abc-deprecation-warning-in-downloadu.patch | 41 ++ > > .../recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb | 5 +- > > .../{xfce4-settings_4.16.2.bb => xfce4-settings_4.16.5.bb} | 2 +- > > 16 files changed, 1147 insertions(+), 439 deletions(-) > > rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.7.4.bb => > > mariadb-native_10.7.7.bb} (93%) > > create mode 100644 > > meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch > > create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch > > delete mode 100644 > > meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch > > rename meta-oe/recipes-dbs/mysql/{mariadb_10.7.4.bb => > > mariadb_10.7.7.bb} (81%) > > create mode 100644 > > meta-oe/recipes-devtools/nodejs/nodejs/0001-Nodejs-Fixed-pipes-DeprecationWarning.patch > > rename meta-oe/recipes-devtools/php/{php_8.1.10.bb => php_8.1.12.bb} (99%) > > create mode 100644 > > meta-oe/recipes-graphics/xorg-app/xterm/CVE-2022-45063.patch > > create mode 100644 > > meta-oe/recipes-support/multipath-tools/files/0001-multipath-tools-use-run-instead-of-dev-shm.patch > > create mode 100644 > > meta-python/recipes-devtools/python/python3-requests-toolbelt/0001-Fix-collections.abc-deprecation-warning-in-downloadu.patch > > rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.16.2.bb > > => xfce4-settings_4.16.5.bb} (93%) > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100493): https://lists.openembedded.org/g/openembedded-devel/message/100493 Mute This
[oe] [meta-java][master][PATCH] layer.conf: Switch LAYERSERIES_COMPAT to mickledore
From: Geoff Parker Signed-off-by: Geoff Parker --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index bf592de..c571df5 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-java" BBFILE_PATTERN_meta-java := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-java = "10" -LAYERSERIES_COMPAT_meta-java = "kirkstone langdale" +LAYERSERIES_COMPAT_meta-java = "mickledore" LAYERDEPENDS_meta-java += "openembedded-layer" LICENSE_PATH += "${LAYERDIR}/licenses" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100434): https://lists.openembedded.org/g/openembedded-devel/message/100434 Mute This Topic: https://lists.openembedded.org/mt/96125253/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] python3-yappi: upgrade 1.3.6 -> 1.4.0, python 3.11 compatible
From: Geoff Parker Update to 1.4.0 for python 3.11 compatibilty Add patch to add upstream commit added after the release of 1.4.0 tarball. Adds python 3.11 to setup.py Update 0001-Fix-imports-for-ptest.patch for patch fuzz and removed hunk already in 1.4.0. Signed-off-by: Geoff Parker --- .../0001-Fix-imports-for-ptests.patch | 16 ++--- .../0002-add-3.11-to-the-setup.patch | 24 +++ ...-yappi_1.3.6.bb => python3-yappi_1.4.0.bb} | 4 ++-- 3 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python3-yappi/0002-add-3.11-to-the-setup.patch rename meta-python/recipes-devtools/python/{python3-yappi_1.3.6.bb => python3-yappi_1.4.0.bb} (81%) diff --git a/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch b/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch index fa58897e6..274f6f527 100644 --- a/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch +++ b/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch @@ -8,10 +8,9 @@ Signed-off-by: Trevor Gamblin tests/test_asyncio.py | 2 +- tests/test_asyncio_context_vars.py | 2 +- tests/test_functionality.py| 2 +- - tests/test_gevent.py | 2 +- tests/test_hooks.py| 2 +- tests/test_tags.py | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) + 5 files changed, 6 insertions(+), 6 deletions(-) --- a/tests/test_asyncio.py +++ b/tests/test_asyncio.py @@ -23,7 +22,7 @@ Signed-off-by: Trevor Gamblin +from .utils import YappiUnitTestCase, find_stat_by_name, burn_cpu, burn_io - @asyncio.coroutine + async def async_sleep(sec): --- a/tests/test_asyncio_context_vars.py +++ b/tests/test_asyncio_context_vars.py @@ -5,7 +5,7 @@ import contextvars @@ -3870,17 +3869,6 @@ Signed-off-by: Trevor Gamblin +# import sys;sys.argv = ['', 'BasicUsage.test_run_as_script'] +# import sys;sys.argv = ['', 'MultithreadedScenarios.test_subsequent_profile'] +unittest.main() a/tests/test_gevent.py -+++ b/tests/test_gevent.py -@@ -4,7 +4,7 @@ import yappi - import gevent - from gevent.event import Event - import threading --from utils import ( -+from .utils import ( - YappiUnitTestCase, find_stat_by_name, burn_cpu, burn_io, - burn_io_gevent - ) --- a/tests/test_hooks.py +++ b/tests/test_hooks.py @@ -5,7 +5,7 @@ import unittest diff --git a/meta-python/recipes-devtools/python/python3-yappi/0002-add-3.11-to-the-setup.patch b/meta-python/recipes-devtools/python/python3-yappi/0002-add-3.11-to-the-setup.patch new file mode 100644 index 0..a9bf612db --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-yappi/0002-add-3.11-to-the-setup.patch @@ -0,0 +1,24 @@ +From 38afdacf526410f970afc58e147c7377c6c7112c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=BCmer=20Cip?= +Date: Fri, 25 Nov 2022 15:58:03 +0300 +Subject: [PATCH 2/2] add 3.11 to the setup + +--- + setup.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.py b/setup.py +index d006787..96e2a66 100644 +--- a/setup.py b/setup.py +@@ -56,6 +56,7 @@ CLASSIFIERS = [ + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', ++'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: Implementation :: CPython', + 'Operating System :: OS Independent', + 'Topic :: Software Development :: Libraries', +-- +2.30.2 + diff --git a/meta-python/recipes-devtools/python/python3-yappi_1.3.6.bb b/meta-python/recipes-devtools/python/python3-yappi_1.4.0.bb similarity index 81% rename from meta-python/recipes-devtools/python/python3-yappi_1.3.6.bb rename to meta-python/recipes-devtools/python/python3-yappi_1.4.0.bb index 526af346b..71e74e86f 100644 --- a/meta-python/recipes-devtools/python/python3-yappi_1.3.6.bb +++ b/meta-python/recipes-devtools/python/python3-yappi_1.4.0.bb @@ -4,11 +4,12 @@ HOMEPAGE = "https://github.com/sumerc/yappi; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=71c208c9a4fd864385eb69ad4caa3bee" -SRC_URI[sha256sum] = "0a73c608a2603570a020a32d4369ba744012bc5267f37e5bd8026fb491abba56" +SRC_URI[sha256sum] = "504b5d8fc7433736cb5e257991d2e7f2946019174f1faec7b2fe947881a17fc0" SRC_URI += " \ file://run-ptest \ file://0001-Fix-imports-for-ptests.patch \ +file://0002-add-3.11-to-the-setup.patch \ " inherit pypi setuptools3 ptest @@ -33,4 +34,3 @@ do_install_ptest() { cp -f ${S}/yappi/yappi.py ${D}/${PTEST_PATH}/ } -SKIP_RECIPE[python3-yappi] ?= "Not compatible with py3.11; needs a new release" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#99833): https://li
[oe] [meta-java] ant-native_1.8.1.bb recipe fails do_compile on release branches (hardknott, honister, master ...)
Building the ant-native fails on the master/hardknott, honister...) branches. I get this error which cascades into other errors on do_compile. 17. ERROR in src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java (at line 20) import javax.media.jai.PlanarImage; ^^^ The import javax.media cannot be resolved -- 18. ERROR in src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java (at line 38) PlanarImage executeDrawOperation(); ^^^ PlanarImage cannot be resolved to a type These other classes cannot be imported: The import javax.media cannot be resolved The import netrexx cannot be resolved The import junit cannot be resolved The import com.sun cannot be resolved The import javax.media cannot be resolved Git bissect on meta-java points to 'b71a986 all: run convert-overrides (0.9.3) script to convert to new override format' when this recipe broke. However, comparing master HEAD to the previous good commit ( 984f25b ), So it seems to be something with the overlay syntax changes, but I'm not seeing any obvious reason why the CLASSPATH would change. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#94112): https://lists.openembedded.org/g/openembedded-devel/message/94112 Mute This Topic: https://lists.openembedded.org/mt/87276277/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-aiosignal, python3-frozenlist: Add native & nativestdk package support
From: Geoff Parker Add 'BBCLASSEXTEND = "native nativesdk"' to python3-aiosignal and it's RDEPENDS python3-frozenlist. Signed-off-by: Geoff Parker --- meta-python/recipes-devtools/python/python3-aiosignal_1.2.0.bb | 2 ++ .../recipes-devtools/python/python3-frozenlist_1.2.0.bb| 3 +++ 2 files changed, 5 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-aiosignal_1.2.0.bb b/meta-python/recipes-devtools/python/python3-aiosignal_1.2.0.bb index 601ac8f45..efd94f793 100644 --- a/meta-python/recipes-devtools/python/python3-aiosignal_1.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-aiosignal_1.2.0.bb @@ -7,6 +7,8 @@ SRC_URI[sha256sum] = "78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f inherit pypi setuptools3 +BBCLASSEXTEND = "native nativesdk" + RDEPENDS:${PN} = "\ ${PYTHON_PN}-frozenlist \ " diff --git a/meta-python/recipes-devtools/python/python3-frozenlist_1.2.0.bb b/meta-python/recipes-devtools/python/python3-frozenlist_1.2.0.bb index b56e2e5e6..e8359418b 100644 --- a/meta-python/recipes-devtools/python/python3-frozenlist_1.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-frozenlist_1.2.0.bb @@ -6,3 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cf056e8e7a0a5477451af18b7b5aa98c" SRC_URI[sha256sum] = "68201be60ac56aff972dc18085800b6ee07973c49103a8aba669dee3d71079de" inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" + -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#94088): https://lists.openembedded.org/g/openembedded-devel/message/94088 Mute This Topic: https://lists.openembedded.org/mt/87226121/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] python3-cchardet: add BBCLASSEXTEND = "native nativesdk"
From: Geoff Parker The python3-cchardet recipe that was introduced in honnister to supplant the slower python3-chardet was missing support for building native and nativesdk variants. Signed-off-by: Geoff Parker --- meta-python/recipes-devtools/python/python3-cchardet_2.1.7.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-cchardet_2.1.7.bb b/meta-python/recipes-devtools/python/python3-cchardet_2.1.7.bb index ebd8130ab..8fa979776 100644 --- a/meta-python/recipes-devtools/python/python3-cchardet_2.1.7.bb +++ b/meta-python/recipes-devtools/python/python3-cchardet_2.1.7.bb @@ -6,3 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ecda54f6f525388d71d6b3cd92f7474" SRC_URI[sha256sum] = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf" inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#94066): https://lists.openembedded.org/g/openembedded-devel/message/94066 Mute This Topic: https://lists.openembedded.org/mt/87177394/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] Request to pull honister branch and override syntax commits from master-next to master branch
I made this request a month ago, still no change to the master branch so that builds can be made using meta-java with honister or master openembedded layers. On Thu, Oct 14, 2021 at 2:32 PM Geoff Parker via lists.openembedded.org wrote: > > Request that these commits that have been in meta-next for a while get > merged into master of meta-java so that builds using meta-java can be > built with master or honister core layers. > > 147677c layer.conf: Update to new honister release name > a1eb2b9 all: manual fixes for new override syntax > b71a986 all: run convert-overrides (0.9.3) script to convert to new > override format > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#93944): https://lists.openembedded.org/g/openembedded-devel/message/93944 Mute This Topic: https://lists.openembedded.org/mt/87063255/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-java] Request to pull honister branch and override syntax commits from master-next to master branch
Request that these commits that have been in meta-next for a while get merged into master of meta-java so that builds using meta-java can be built with master or honister core layers. 147677c layer.conf: Update to new honister release name a1eb2b9 all: manual fixes for new override syntax b71a986 all: run convert-overrides (0.9.3) script to convert to new override format -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#93304): https://lists.openembedded.org/g/openembedded-devel/message/93304 Mute This Topic: https://lists.openembedded.org/mt/86325514/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][PATCH] layer.conf: Mark as compatible with honister
Hi Richard, I compared master-next with my branch and they look equivalent, less one libc-musl string that your branch caught that I missed. I haven't had a chance to do a test build with meta-next yet, but perhaps tonight. Best Regards, -Geoff On Mon, Sep 20, 2021 at 11:03 PM Richard Leitner - SKIDATA wrote: > > Hi Geoff, > > On Mon, Sep 20, 2021 at 01:06:07PM -0700, Geoff Parker via > lists.openembedded.org wrote: > > From: Geoff Parker > > Thanks for the patch, but we have the same already in master-next! I'll > try to finish the tests and merge master-next into master today. > > regards;rl > > > Signed-off-by: Geoff Parker > > --- > > conf/layer.conf | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/conf/layer.conf b/conf/layer.conf > > index 7ef116d..7791178 100644 > > --- a/conf/layer.conf > > +++ b/conf/layer.conf > > @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb > > ${LAYERDIR}/recipes*/*/*.bbappend" > > BBFILE_COLLECTIONS += "meta-java" > > BBFILE_PATTERN_meta-java := "^${LAYERDIR}/" > > BBFILE_PRIORITY_meta-java = "10" > > -LAYERSERIES_COMPAT_meta-java = "dunfell gatesgarth hardknott" > > +LAYERSERIES_COMPAT_meta-java = "dunfell gatesgarth hardknott honister" > > LAYERDEPENDS_meta-java += "openembedded-layer" > > > > LICENSE_PATH += "${LAYERDIR}/licenses" > > -- > > 2.30.2 > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#93041): https://lists.openembedded.org/g/openembedded-devel/message/93041 Mute This Topic: https://lists.openembedded.org/mt/85751018/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-java][PATCH] update recipes for new override syntax introduced in Yocto 3.4 honister
From: Geoff Parker Ran convert-overrides.py script with some manual edits after review. Signed-off-by: Geoff Parker --- classes/java-library.bbclass | 6 +- classes/openjdk-build-helper.bbclass | 4 +- classes/openjdk-test-image.bbclass| 2 +- classes/openjre-test-image.bbclass| 2 +- recipes-core/ant/ant-native_1.8.1.bb | 2 +- recipes-core/antlr/antlr_2.7.7.bb | 6 +- .../ca-certificates-java_20180516.bb | 12 +-- .../cacao/cacao-initial-native_0.98.bb| 2 +- recipes-core/cacao/cacao_git.bb | 24 +++--- .../classpath-initial-native_0.93.bb | 2 +- .../classpath/classpath-native_0.99.bb| 2 +- recipes-core/classpath/classpath.inc | 40 +- recipes-core/cup/cup_0.10k.bb | 8 +- recipes-core/fastjar/fastjar.inc | 6 +- recipes-core/icedtea/icedtea7-native.inc | 20 ++--- .../icedtea/openjdk-7-release-03b147.inc | 4 +- .../commons-beanutils_1.8.0.bb| 2 +- .../commons-configuration_1.5.bb | 2 +- .../jakarta-commons/commons-digester_1.8.bb | 2 +- .../jakarta-commons/commons-discovery_0.4.bb | 2 +- .../jakarta-commons/commons-el_1.0.bb | 2 +- .../commons-fileupload_1.2.1.bb | 2 +- .../jakarta-commons/commons-httpclient_3.1.bb | 4 +- .../jakarta-commons/commons-jxpath_1.3.bb | 2 +- .../jakarta-commons/commons-net_1.4.1.bb | 4 +- .../jamvm/jamvm-initial-native_1.4.5.bb | 4 +- recipes-core/jamvm/jamvm.inc | 30 recipes-core/jamvm/jamvm_git.bb | 2 +- .../javasqlite/javasqlite_20150419.bb | 10 +-- recipes-core/jcraft/jsch_0.1.40.bb| 4 +- recipes-core/jikes/jikes_1.22.bb | 10 +-- recipes-core/jlex/jlex_1.2.6.bb | 8 +- recipes-core/libmatthew/libmatthew.inc| 22 +++--- recipes-core/openjdk/openjdk-7-common.inc | 76 +-- recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb | 2 +- recipes-core/openjdk/openjdk-8-common.inc | 16 ++-- recipes-core/openjdk/openjdk-8-cross.inc | 14 ++-- recipes-core/openjdk/openjdk-8-native.inc | 18 ++--- .../openjdk/openjdk-8-release-aarch32.inc | 30 .../openjdk/openjdk-8-release-aarch64.inc | 16 ++-- .../openjdk/openjdk-8-release-common.inc | 54 ++--- recipes-core/openjdk/openjdk-8-release.inc| 4 +- recipes-core/openjdk/openjdk-8_272.bb | 24 +++--- recipes-core/openjdk/openjre-8_272.bb | 16 ++-- recipes-core/rhino/rhino_1.7r4.bb | 10 +-- recipes-core/servlet-api/jsp2.0_5.5.26.bb | 2 +- recipes-core/xalan-j/xalan-j_2.7.1.bb | 4 +- recipes-core/xerces-j/xerces-j_2.11.0.bb | 4 +- recipes-core/xml-commons/jaxme_0.5.2.bb | 2 +- recipes-core/xml-commons/xpp3_1.1.3.4.O.bb| 4 +- recipes-extended/dbus/dbus-java_2.7.bb| 14 ++-- recipes-extended/rxtx/rxtx_2.2.0.bb | 18 ++--- recipes-images/images/openjdk-7-test-image.bb | 2 +- recipes-images/images/openjdk-8-test-image.bb | 2 +- recipes-images/images/openjre-7-test-image.bb | 2 +- recipes-images/images/openjre-8-test-image.bb | 2 +- 56 files changed, 295 insertions(+), 295 deletions(-) diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index 2ce96ab..f6059d4 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass @@ -40,11 +40,11 @@ def java_package_name(d): JPN ?= "${@java_package_name(d)}" -DEPENDS_prepend = "virtual/javac-native fastjar-native " +DEPENDS:prepend = "virtual/javac-native fastjar-native " PACKAGES += "${JPN}" -FILES_${JPN} = "${datadir_java}" +FILES:${JPN} = "${datadir_java}" # File name of the libraries' main Jar file JARFILENAME = "${BP}.jar" @@ -63,6 +63,6 @@ do_removebinaries() { addtask removebinaries after do_unpack before do_patch -do_install_append() { +do_install:append() { oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES} } diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass index 4e334c2..a4b77a0 100644 --- a/classes/openjdk-build-helper.bbclass +++ b/classes/openjdk-build-helper.bbclass @@ -2,8 +2,8 @@ # passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are # parallelizable and we need ${PARALLEL_MAKE} to derive the proper value. # The base for this quirk is that GNU Make only considers the last "-j" option. -EXTRA_OEMAKE_remove_task-compile = "${PARALLEL_MAKE}" -EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}" +EXTRA_OEMAKE:remove:task-compile = "${PARALLEL_MAKE}" +EXTRA_OEMAKE:remove:task-install = "${PARALLEL_MAKEINST}" # OpenJDK supports parallel compilation but uses a plain number for this. # In OE we have PARALLEL
[oe] [meta=java][PATCH] layer.conf: Mark as compatible with honister
From: Geoff Parker Signed-off-by: Geoff Parker --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 7ef116d..7791178 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-java" BBFILE_PATTERN_meta-java := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-java = "10" -LAYERSERIES_COMPAT_meta-java = "dunfell gatesgarth hardknott" +LAYERSERIES_COMPAT_meta-java = "dunfell gatesgarth hardknott honister" LAYERDEPENDS_meta-java += "openembedded-layer" LICENSE_PATH += "${LAYERDIR}/licenses" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#93024): https://lists.openembedded.org/g/openembedded-devel/message/93024 Mute This Topic: https://lists.openembedded.org/mt/85751018/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] cifs-utils: typo fix fakse --> false
From: Geoff Parker Signed-off-by: Geoff Parker --- meta-networking/recipes-support/cifs/cifs-utils_6.13.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb b/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb index 54aa3ce19..a8d3e91eb 100644 --- a/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb +++ b/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb @@ -26,7 +26,7 @@ do_configure:prepend() { # want installed to /usr/sbin rather than /sbin to be DISTRO_FEATURES usrmerge compliant # must override ROOTSBINDIR (default '/sbin'), # setting --exec-prefix or --prefix in EXTRA_OECONF does not work -if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','fakse',d)}; then +if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then export ROOTSBINDIR=${sbindir} fi } -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#92569): https://lists.openembedded.org/g/openembedded-devel/message/92569 Mute This Topic: https://lists.openembedded.org/mt/84801554/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] cifs-utils: set ROOTSBINDIR to /usr/sbin if DISTRO_FEATURES has usrmerge
From: Geoff Parker Fixes cif-utils recipe build when DISTRO_FEATURES includes 'usrmerge' Add do_configure_prepend() to override ROOTSSBINDIR environment variable so that the utilities are installed in /usr/sbin rather than /sbin. Setting --exec-prefix or --prefix in EXTRA_OECONF does not work. Update do_install_append() to NOT remove /usr/bin /usr/sbin if usrmerge is set in DISTRO_FEATURES Signed-off-by: Geoff Parker --- .../recipes-support/cifs/cifs-utils_6.13.bb | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb b/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb index 41a9b8e76..bf8b18043 100644 --- a/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb +++ b/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb @@ -22,10 +22,21 @@ PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disab inherit autotools pkgconfig +do_configure_prepend() { +# want installed to /usr/sbin rather than /sbin to be DISTRO_FEATURES usrmerge compliant +# must override ROOTSBINDIR (default '/sbin'), +# setting --exec-prefix or --prefix in EXTRA_OECONF does not work +if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','fakse',d)}; then +export ROOTSBINDIR=${sbindir} +fi +} + do_install_append() { -# Remove empty /usr/bin and /usr/sbin directories since the mount helper -# is installed to /sbin -rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} +if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then +# Remove empty /usr/bin and /usr/sbin directories since the mount helper +# is installed to /sbin +rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} +fi } FILES_${PN} += "${base_libdir}/security" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#91944): https://lists.openembedded.org/g/openembedded-devel/message/91944 Mute This Topic: https://lists.openembedded.org/mt/83614341/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][warrior] update python3-websockets from v4.0.1 to 5.0.1
Thanks, I'm new to the patch process. Do I just resubmit the same patch, changing the e-mail subject header line from [warrior] to [master] ? On Thu, May 30, 2019 at 6:19 AM akuster808 wrote: > > > > On 5/29/19 11:13 AM, Geoff Parker wrote: > > python3-websockets version 4.01 will throw this error > > when used with Python 3.7. > > > > File "/usr/lib/python3.7/site-packages/websockets/compatibility.py", line > > 15 > >asyncio_ensure_future = asyncio.async # Python < 3.5 > >^ > >SyntaxError: invalid syntax > > > > This was fixed upstream in a commit applied 3 commits since the 4.0.1 tag. > > Fix needs to be in master first before any consideration for backport. > > - armin > > > > > > https://github.com/aaugustin/websockets/commit/9f566c5d12eae1258aa6f1991fe8cf0a7d390f97 > > > > Signed-off-by: Geoff Parker > > --- > > ...ython3-websockets_4.0.1.bb => python3-websockets_5.0.1.bb} | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > rename meta-python/recipes-devtools/python/{python3-websockets_4.0.1.bb > > => python3-websockets_5.0.1.bb} (70%) > > > > diff --git a/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb > > b/meta-python/recipes-devtools/python/python3-websockets_5.0.1.bb > > similarity index 70% > > rename from meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb > > rename to meta-python/recipes-devtools/python/python3-websockets_5.0.1.bb > > index 414129c59..151dee2d5 100644 > > --- a/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb > > +++ b/meta-python/recipes-devtools/python/python3-websockets_5.0.1.bb > > @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = > > "file://LICENSE;md5=5070256738c06d2e59adbec1f4057dac" > > > > inherit pypi setuptools3 > > > > -SRC_URI[md5sum] = "9e8c6b3c70def4146d75fbb0f52bdfc7" > > -SRC_URI[sha256sum] = > > "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9" > > +SRC_URI[md5sum] = "cd2f92f07bca588acd9238b18f6cfbcf" > > +SRC_URI[sha256sum] = > > "a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674" > > > > BBCLASSEXTEND = "native nativesdk" > > > > -- > > 2.20.1 > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][warrior] update python3-websockets from v4.0.1 to 5.0.1
python3-websockets version 4.01 will throw this error when used with Python 3.7. File "/usr/lib/python3.7/site-packages/websockets/compatibility.py", line 15 asyncio_ensure_future = asyncio.async # Python < 3.5 ^ SyntaxError: invalid syntax This was fixed upstream in a commit applied 3 commits since the 4.0.1 tag. https://github.com/aaugustin/websockets/commit/9f566c5d12eae1258aa6f1991fe8cf0a7d390f97 Signed-off-by: Geoff Parker --- ...ython3-websockets_4.0.1.bb => python3-websockets_5.0.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python3-websockets_4.0.1.bb => python3-websockets_5.0.1.bb} (70%) diff --git a/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb b/meta-python/recipes-devtools/python/python3-websockets_5.0.1.bb similarity index 70% rename from meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb rename to meta-python/recipes-devtools/python/python3-websockets_5.0.1.bb index 414129c59..151dee2d5 100644 --- a/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-websockets_5.0.1.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5070256738c06d2e59adbec1f4057dac" inherit pypi setuptools3 -SRC_URI[md5sum] = "9e8c6b3c70def4146d75fbb0f52bdfc7" -SRC_URI[sha256sum] = "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9" +SRC_URI[md5sum] = "cd2f92f07bca588acd9238b18f6cfbcf" +SRC_URI[sha256sum] = "a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674" BBCLASSEXTEND = "native nativesdk" -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel