Re: [oe] [meta-xfce][PATCH 2/2] catfish: Do not set PYPA_WHEEL
Ah, if those patches have landed I can send my patchbomb to meta-oe :) Ross On Wed, 9 Mar 2022 at 19:05, Khem Raj wrote: > > OE-Core has addressed the pertaining issue which does not require > setting this here anymore > > Signed-off-by: Khem Raj > --- > meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb > b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb > index 6aa5ae8c30..27a807be29 100644 > --- a/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb > +++ b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb > @@ -4,7 +4,6 @@ LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" > > inherit xfce-app setuptools_build_meta gtk-icon-cache mime-xdg > -PYPA_WHEEL = "${B}/dist/UNKNOWN-*-*.whl" > > DEPENDS += "python3-distutils-extra-native" > > -- > 2.35.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95922): https://lists.openembedded.org/g/openembedded-devel/message/95922 Mute This Topic: https://lists.openembedded.org/mt/89669707/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 3/9] python3-configparser: remove, not needed for Python 3
This is a backport of the Python 3 configparser for Python 2 users, so obviously it makes no sense to have for Python 3. Signed-off-by: Ross Burton --- .../packagegroups/packagegroup-meta-python.bb | 1 - .../python/python3-configparser_5.2.0.bb| 13 - 2 files changed, 14 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-configparser_5.2.0.bb diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index ae454e789b..6eb803bd2a 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -82,7 +82,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-colorzero \ python3-configargparse \ python3-configobj \ -python3-configparser \ python3-configshell-fb \ python3-constantly \ python3-contextlib2 \ diff --git a/meta-python/recipes-devtools/python/python3-configparser_5.2.0.bb b/meta-python/recipes-devtools/python/python3-configparser_5.2.0.bb deleted file mode 100644 index e629331330..00 --- a/meta-python/recipes-devtools/python/python3-configparser_5.2.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "This module provides the ConfigParser class which implements a basic configuration language which provides a structure similar to what's found in Microsoft Windows INI files." -SECTION = "devel/python" -HOMEPAGE = "https://docs.python.org/3/library/configparser.html"; -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=23f9ad5cad3d8cc0336e2a5d8a87e1fa" - -SRC_URI[sha256sum] = "1b35798fdf1713f1c3139016cfcbc461f09edbf099d1fb658d4b7479fcaa3daa" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native ${PYTHON_PN}-toml-native" -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95925): https://lists.openembedded.org/g/openembedded-devel/message/95925 Mute This Topic: https://lists.openembedded.org/mt/89685714/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 1/9] packagegroup-meta-python: add poetry-core and unattended-upgrade
These were missing from the packagegroup. Signed-off-by: Ross Burton --- .../recipes-core/packagegroups/packagegroup-meta-python.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 9626231bba..86bf6db30b 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -280,6 +280,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-pkcs11 \ python3-pkgconfig \ python3-ply \ +python3-poetry-core \ python3-pocketsphinx \ python3-polyline \ python3-portalocker \ @@ -475,6 +476,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-yarl \ python3-zopeinterface \ telepathy-python3 \ +unattended-upgrades \ " RDEPENDS:packagegroup-meta-python3:remove:libc-musl:powerpc64le = "python3-grpcio python3-grpcio-tools" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95923): https://lists.openembedded.org/g/openembedded-devel/message/95923 Mute This Topic: https://lists.openembedded.org/mt/89685712/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 6/9] python3-pycurl: fix DEPENDS
By assigning directly to DEPENDS the dependencies in setuptools3 are overwritten, so python3-setuptools-native is present to let the build succeed entirely through luck. Signed-off-by: Ross Burton --- .../recipes-devtools/python/python3-pycurl_7.44.1.bb | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-pycurl_7.44.1.bb b/meta-python/recipes-devtools/python/python3-pycurl_7.44.1.bb index 0f1ae3caca..c9b3b71873 100644 --- a/meta-python/recipes-devtools/python/python3-pycurl_7.44.1.bb +++ b/meta-python/recipes-devtools/python/python3-pycurl_7.44.1.bb @@ -14,9 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \ SRC_URI[sha256sum] = "5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8" -inherit pypi setuptools3 +DEPENDS = "curl" -DEPENDS = "\ -curl \ -${PYTHON_PN}\ -" +inherit pypi setuptools3 -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95928): https://lists.openembedded.org/g/openembedded-devel/message/95928 Mute This Topic: https://lists.openembedded.org/mt/89685717/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 7/9] python3-twisted: remove empty PN-src and PN-dbg
Nothing is packaged in these, there are no debug symbols and the sources are packaged into the regular packages. Signed-off-by: Ross Burton --- .../python/python3-twisted_22.2.0.bb| 13 - 1 file changed, 13 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb b/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb index 2cf5ccc65d..5a000bc6a1 100644 --- a/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb @@ -78,7 +78,6 @@ RDEPENDS:${PN}-web += "${PN}-core ${PN}-protocols" RDEPENDS:${PN}-words += "${PN}-core" RDEPENDS:${PN}-flow += "${PN}-core" RDEPENDS:${PN}-pair += "${PN}-core" -RDEPENDS:${PN}-dbg = "${PN}" FILES:${PN} = "${PYTHON_SITEPACKAGES_DIR}/${PYPI_PACKAGE}-${PV}.dist-info/*" @@ -243,22 +242,10 @@ ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \ ${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \ " -FILES:${PN}-dbg += " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \ -" - FILES:${PN}-doc += " \ ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \ " -RDEPENDS:${PN}-src = "${PN}" -FILES:${PN}-src = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \ -" - FILES:${PN}-core:append = " \ ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95929): https://lists.openembedded.org/g/openembedded-devel/message/95929 Mute This Topic: https://lists.openembedded.org/mt/89685718/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 8/9] python3-pylint: upgrade to 2.12.2
The test suite is no longer shipped in the sources, so remove PN-tests. Signed-off-by: Ross Burton --- .../python/python3-pylint_1.8.3.bb| 38 --- .../python/python3-pylint_2.12.2.bb | 18 + 2 files changed, 18 insertions(+), 38 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb create mode 100644 meta-python/recipes-devtools/python/python3-pylint_2.12.2.bb diff --git a/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb b/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb deleted file mode 100644 index 60726df09d..00 --- a/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY="Pylint is a Python source code analyzer" -HOMEPAGE= "http://www.pylint.org/"; -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" - -SRC_URI[md5sum] = "2eb5f3cb8fe567eaf5420dd415012202" -SRC_URI[sha256sum] = "c77311859e0c2d7932095f30d2b1bfdc4b6fe111f534450ba727a52eae330ef2" - -inherit pypi setuptools3 python3-dir - -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -do_install:append(){ -rm ${D}${bindir}/pylint -cat >> ${D}${bindir}/pylint
[oe] [PATCH 9/9] meta-python: migrate away from setuptool3 where possible
Many recipes are currently building with setuptools3 but can use a more modern tool: typically setuptools_build_meta but ordered-set can use flit_core and pyrad can use poetry_core. Signed-off-by: Ross Burton --- .../recipes-devtools/python/python3-aiohttp_3.8.1.bb | 3 ++- .../python/python3-ansi2html_1.7.0.bb| 7 +-- .../python/python3-asttokens_2.0.5.bb| 7 ++- .../python/python3-async-timeout_4.0.2.bb| 2 +- .../recipes-devtools/python/python3-bcrypt_3.2.0.bb | 2 +- .../recipes-devtools/python/python3-bidict_0.21.4.bb | 2 +- .../python/python3-cachetools_4.2.4.bb | 2 +- .../recipes-devtools/python/python3-cbor2_5.4.2.bb | 2 +- .../python/python3-dateutil_2.8.2.bb | 2 +- .../python/python3-engineio_4.3.1.bb | 2 +- .../python/python3-fasteners_0.17.3.bb | 7 +-- .../python/python3-flask-migrate_3.1.0.bb| 2 +- .../python/python3-flask-socketio_5.1.1.bb | 2 +- .../python/python3-frozenlist_1.3.0.bb | 2 +- .../python/python3-httplib2_0.20.4.bb| 2 +- .../python/python3-humanize_4.0.0.bb | 2 +- .../python/python3-hyperlink_21.0.0.bb | 2 +- .../recipes-devtools/python/python3-icu_2.8.1.bb | 2 +- .../recipes-devtools/python/python3-iso3166_2.0.2.bb | 2 +- .../python/python3-license-expression_21.6.14.bb | 7 ++- .../python/python3-luma-core_2.3.1.bb| 4 +--- .../recipes-devtools/python/python3-lz4_4.0.0.bb | 2 +- .../recipes-devtools/python/python3-mypy_0.910.bb| 2 +- .../python/python3-ordered-set_4.1.0.bb | 2 +- .../recipes-devtools/python/python3-pint_0.18.bb | 2 +- .../python/python3-pyhamcrest_2.0.3.bb | 2 +- .../recipes-devtools/python/python3-pynacl_1.5.0.bb | 3 +-- .../recipes-devtools/python/python3-pyrad_2.4.bb | 2 +- .../python/python3-pyscaffold_4.1.5.bb | 2 +- .../python/python3-pytest-forked_1.4.0.bb| 2 +- .../python3-pytest-helpers-namespace_2021.4.29.bb| 12 +--- .../python/python3-pytest-html_3.1.1.bb | 3 +-- .../python/python3-pytest-runner_5.3.1.bb| 4 ++-- .../python/python3-pytest-xdist_2.5.0.bb | 2 +- .../python3-pytz-deprecation-shim_0.1.0.post0.bb | 7 +-- .../recipes-devtools/python/python3-pyzmq_22.3.0.bb | 2 +- .../python/python3-simpleeval_0.9.12.bb | 6 +- .../python/python3-socketio_5.5.2.bb | 2 +- .../python/python3-soupsieve_2.3.1.bb| 2 +- .../recipes-devtools/python/python3-tqdm_4.63.0.bb | 2 +- .../python/python3-traitlets_5.1.1.bb| 2 +- .../recipes-devtools/python/python3-twine_3.8.0.bb | 7 +-- .../python/python3-twisted_22.2.0.bb | 2 +- .../python/python3-typeguard_2.13.3.bb | 2 +- .../recipes-devtools/python/python3-tzlocal_4.1.bb | 2 +- .../python/python3-waitress_2.1.0.bb | 2 +- .../python/python3-yamlloader_1.1.0.bb | 2 +- 47 files changed, 51 insertions(+), 94 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.8.1.bb b/meta-python/recipes-devtools/python/python3-aiohttp_3.8.1.bb index 1d8434e3ca..3a4c510144 100644 --- a/meta-python/recipes-devtools/python/python3-aiohttp_3.8.1.bb +++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.8.1.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8074d6c6e217873b2a018a4522243ea3" SRC_URI[sha256sum] = "fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578" PYPI_PACKAGE = "aiohttp" -inherit setuptools3 pypi +inherit setuptools_build_meta pypi + RDEPENDS:${PN} = "\ ${PYTHON_PN}-async-timeout \ ${PYTHON_PN}-attrs \ diff --git a/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb b/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb index 0a81ebdded..9a6e0f7a3a 100644 --- a/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb @@ -7,7 +7,7 @@ PYPI_PACKAGE = "ansi2html" SRC_URI[sha256sum] = "69316be8c68ac91c5582d397c2890e69c993cc7cda52062ac7e45fcb660d8edc" -inherit pypi setuptools3 +inherit pypi setuptools_build_meta DEPENDS += " \ ${PYTHON_PN}-setuptools-scm-native \ @@ -18,8 +18,3 @@ RDEPENDS:${PN} = " \ ${PYTHON_PN}-six \ ${PYTHON_PN}-compression \ " - -do_compile:prepend() { - echo "from setuptools import setup" > ${S}/setup.py - echo "setup()" >> ${S}/setup.py -} diff --git a/meta-python/recipes-devtools/python/python3-asttokens_2.0.5.bb b/meta-python/recipes-devtools/python/python3-asttokens_2.0.5.bb index 429a56bae6..d45e70ce8a 100644 --- a/meta-python/recipes-devtools/python/python3-asttokens_2.0.5.bb +++ b/meta-python/recipes-devtools/python/
[oe] [PATCH 4/9] python3-backports-functional-lru-cache: remove, not needed for Python 3
This is a backport of the Python 3 lru_cache for Python 2 users, so obviously it makes no sense to have for Python 3. Signed-off-by: Ross Burton --- .../packagegroups/packagegroup-meta-python.bb | 2 -- ...on3-backports-functools-lru-cache_1.6.4.bb | 31 --- 2 files changed, 33 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.4.bb diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 6eb803bd2a..66a11d2dd9 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -46,7 +46,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-aws-iot-device-sdk-python \ python3-babel \ python3-backcall \ -python3-backports-functools-lru-cache \ python3-bandit \ python3-bcrypt \ python3-beautifulsoup4 \ @@ -484,7 +483,6 @@ RDEPENDS:packagegroup-meta-python3-ptest = "\ python3-markupsafe-ptest \ python3-ansicolors-ptest \ python3-appdirs-ptest \ -python3-backports-functools-lru-cache-ptest \ python3-bcrypt-ptest \ python3-betamax-ptest \ python3-blinker-ptest \ diff --git a/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.4.bb b/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.4.bb deleted file mode 100644 index 392c044bfc..00 --- a/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.4.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Backport of functools.lru_cache from Python 3.3" -HOMEPAGE = "https://github.com/jaraco/backports.functools_lru_cache"; -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" - -PYPI_PACKAGE = "backports.functools_lru_cache" - -SRC_URI[sha256sum] = "d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS:${PN} += "\ -${PYTHON_PN}-pickle \ -${PYTHON_PN}-threading \ -" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95926): https://lists.openembedded.org/g/openembedded-devel/message/95926 Mute This Topic: https://lists.openembedded.org/mt/89685715/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 5/9] python3-pyzmq: clean up recipe
Put the patch into a directory named after PN to avoid needing to set FILESEXTRAPATHS. Remove explicit FILES:${PN}-dbg, as these are packaged automatically. Signed-off-by: Ross Burton --- .../{python-pyzmq => python3-pyzmq}/club-rpath-out.patch | 0 meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb | 4 2 files changed, 4 deletions(-) rename meta-python/recipes-devtools/python/{python-pyzmq => python3-pyzmq}/club-rpath-out.patch (100%) diff --git a/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch b/meta-python/recipes-devtools/python/python3-pyzmq/club-rpath-out.patch similarity index 100% rename from meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch rename to meta-python/recipes-devtools/python/python3-pyzmq/club-rpath-out.patch diff --git a/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb b/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb index 09e7341877..d2893ccbb1 100644 --- a/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e" DEPENDS = "zeromq" -FILESEXTRAPATHS:prepend := "${THISDIR}/python-pyzmq:" - SRC_URI += "file://club-rpath-out.patch" SRC_URI[sha256sum] = "8eddc033e716f8c91c6a2112f0a8ebc5e00532b4a6ae1eb0ccc48e027f9c671c" @@ -17,8 +15,6 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-json \ " -FILES:${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" - do_compile:prepend() { echo [global] > ${S}/setup.cfg echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95927): https://lists.openembedded.org/g/openembedded-devel/message/95927 Mute This Topic: https://lists.openembedded.org/mt/89685716/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-xfce][PATCH 2/2] catfish: Do not set PYPA_WHEEL
On Thu, Mar 10, 2022 at 1:31 AM Ross Burton wrote: > Ah, if those patches have landed I can send my patchbomb to meta-oe :) > Ok > Ross > > On Wed, 9 Mar 2022 at 19:05, Khem Raj wrote: > > > > OE-Core has addressed the pertaining issue which does not require > > setting this here anymore > > > > Signed-off-by: Khem Raj > > --- > > meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb > b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb > > index 6aa5ae8c30..27a807be29 100644 > > --- a/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb > > +++ b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb > > @@ -4,7 +4,6 @@ LICENSE = "GPL-2.0-only" > > LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" > > > > inherit xfce-app setuptools_build_meta gtk-icon-cache mime-xdg > > -PYPA_WHEEL = "${B}/dist/UNKNOWN-*-*.whl" > > > > DEPENDS += "python3-distutils-extra-native" > > > > -- > > 2.35.1 > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95932): https://lists.openembedded.org/g/openembedded-devel/message/95932 Mute This Topic: https://lists.openembedded.org/mt/89669707/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-networking][PATCH] net-snmp: Avoid running `make clean` as it may fail
Rebuilding net-snmp may cause autotools_preconfigure() to run `make clean`, which in turn can cause `configure`to be run. However, since CACHED_CONFIGUREVARS is not set under those circumstances, `configure` will run with an incorrect configuration and the build will fail with: checking for /etc/printcap... configure: error: cannot check for file existence when cross compiling Avoid the problem by setting CLEANBROKEN = "1". Signed-off-by: Peter Kjellerstedt --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb index b0c5bbdac..5f887b886 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb @@ -40,6 +40,7 @@ EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${B PARALLEL_MAKE = "" CCACHE = "" +CLEANBROKEN = "1" TARGET_CC_ARCH += "${LDFLAGS}" -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95933): https://lists.openembedded.org/g/openembedded-devel/message/95933 Mute This Topic: https://lists.openembedded.org/mt/89688271/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] ttf-vlgothic: Specify accurate BSD license type
Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb index a386bb850f..6b79eb9197 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb @@ -4,7 +4,7 @@ SUMMARY = "Japanese TrueType fonts from Vine Linux" AUTHOR = "Contributor: noonov " HOMEPAGE = "http://vlgothic.dicey.org/"; -LICENSE = "ttf-mplus & BSD" +LICENSE = "ttf-mplus & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.en;md5=cc06b20e7a20bdf6c989624405378303 \ file://LICENSE_E.mplus;md5=1c4767416f20215f1e61b970f2117db9 \ " -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95934): https://lists.openembedded.org/g/openembedded-devel/message/95934 Mute This Topic: https://lists.openembedded.org/mt/89688759/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] nspr-native: build correclty with extended buildtools.
sadly I am seeing this failure https://errors.yoctoproject.org/Errors/Details/651342/ On Wed, Mar 9, 2022 at 12:31 PM Jeremy Puhlman wrote: > > > > On 3/9/2022 12:06 PM, Khem Raj wrote: > > Thanks Jeremy > > > > I wonder why we don't see it failing on AB or in my local testing. is > > it specific to some build host distro ? > > I am seeing the same issue reported on ubuntu 18.04, centos 7 and 8, but > its only with the extended buildtools. > > > > > On Wed, Mar 9, 2022 at 11:41 AM Jeremy Puhlman wrote: > >> From: Jeremy Puhlman > >> > >> gcc abstract.o -Xlinker -L../../dist/lib -lplc4 -L../../dist/lib -lnspr4 > >> -lpthread -o abstract > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > >> /lib64/librt.so.1: undefined reference to `__libc_dlsym@GLIBC_PRIVATE' > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > >> /lib64/librt.so.1: undefined reference to `__pthread_unwind@GLIBC_PRIVATE' > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > >> /lib64/librt.so.1: undefined reference to > >> `__libc_dlopen_mode@GLIBC_PRIVATE' > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > >> /lib64/librt.so.1: undefined reference to > >> `__clock_getcpuclockid@GLIBC_PRIVATE' > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > >> /lib64/librt.so.1: undefined reference to > >> `__clock_nanosleep@GLIBC_PRIVATE' > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > >> /lib64/librt.so.1: undefined reference to `__clock_settime@GLIBC_PRIVATE' > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > >> /lib64/librt.so.1: undefined reference to `__clock_getres@GLIBC_PRIVATE' > >> > >> The linker is not correctly pulling in lrt as needed. > >> > >> Signed-off-by: Jeremy Puhlman > >> --- > >> meta-oe/recipes-support/nspr/nspr_4.29.bb | 2 ++ > >> 1 file changed, 2 insertions(+) > >> > >> diff --git a/meta-oe/recipes-support/nspr/nspr_4.29.bb > >> b/meta-oe/recipes-support/nspr/nspr_4.29.bb > >> index f224bcd34..2717f37bc 100644 > >> --- a/meta-oe/recipes-support/nspr/nspr_4.29.bb > >> +++ b/meta-oe/recipes-support/nspr/nspr_4.29.bb > >> @@ -160,6 +160,8 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," > >> # preferred path upstream. > >> EXTRA_OECONF += "--includedir=${includedir}/nspr" > >> > >> +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt'" > >> + > >> do_compile:prepend() { > >> oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" > >> LDFLAGS="" CC="${BUILD_CC}" -C config export > >> } > >> -- > >> 2.31.1 > >> > >> > >> > >> > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95935): https://lists.openembedded.org/g/openembedded-devel/message/95935 Mute This Topic: https://lists.openembedded.org/mt/89670512/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] nspr-native: build correclty with extended buildtools.
I came here to say the same. :) Ross On Thu, 10 Mar 2022 at 17:04, Khem Raj wrote: > > sadly I am seeing this failure > > https://errors.yoctoproject.org/Errors/Details/651342/ > > On Wed, Mar 9, 2022 at 12:31 PM Jeremy Puhlman wrote: > > > > > > > > On 3/9/2022 12:06 PM, Khem Raj wrote: > > > Thanks Jeremy > > > > > > I wonder why we don't see it failing on AB or in my local testing. is > > > it specific to some build host distro ? > > > > I am seeing the same issue reported on ubuntu 18.04, centos 7 and 8, but > > its only with the extended buildtools. > > > > > > > > On Wed, Mar 9, 2022 at 11:41 AM Jeremy Puhlman > > > wrote: > > >> From: Jeremy Puhlman > > >> > > >> gcc abstract.o -Xlinker -L../../dist/lib -lplc4 -L../../dist/lib > > >> -lnspr4 -lpthread -o abstract > > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > > >> /lib64/librt.so.1: undefined reference to `__libc_dlsym@GLIBC_PRIVATE' > > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > > >> /lib64/librt.so.1: undefined reference to > > >> `__pthread_unwind@GLIBC_PRIVATE' > > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > > >> /lib64/librt.so.1: undefined reference to > > >> `__libc_dlopen_mode@GLIBC_PRIVATE' > > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > > >> /lib64/librt.so.1: undefined reference to > > >> `__clock_getcpuclockid@GLIBC_PRIVATE' > > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > > >> /lib64/librt.so.1: undefined reference to > > >> `__clock_nanosleep@GLIBC_PRIVATE' > > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > > >> /lib64/librt.so.1: undefined reference to > > >> `__clock_settime@GLIBC_PRIVATE' > > >> /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > > >> /lib64/librt.so.1: undefined reference to `__clock_getres@GLIBC_PRIVATE' > > >> > > >> The linker is not correctly pulling in lrt as needed. > > >> > > >> Signed-off-by: Jeremy Puhlman > > >> --- > > >> meta-oe/recipes-support/nspr/nspr_4.29.bb | 2 ++ > > >> 1 file changed, 2 insertions(+) > > >> > > >> diff --git a/meta-oe/recipes-support/nspr/nspr_4.29.bb > > >> b/meta-oe/recipes-support/nspr/nspr_4.29.bb > > >> index f224bcd34..2717f37bc 100644 > > >> --- a/meta-oe/recipes-support/nspr/nspr_4.29.bb > > >> +++ b/meta-oe/recipes-support/nspr/nspr_4.29.bb > > >> @@ -160,6 +160,8 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," > > >> # preferred path upstream. > > >> EXTRA_OECONF += "--includedir=${includedir}/nspr" > > >> > > >> +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt'" > > >> + > > >> do_compile:prepend() { > > >> oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" > > >> LDFLAGS="" CC="${BUILD_CC}" -C config export > > >> } > > >> -- > > >> 2.31.1 > > >> > > >> > > >> > > >> > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95936): https://lists.openembedded.org/g/openembedded-devel/message/95936 Mute This Topic: https://lists.openembedded.org/mt/89670512/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] nspr-native: build correclty with extended buildtools.
Adding -ldl should resolve it. It corrected the issue on ubuntu-18.04 + extended-buildtools and with out. Lemme check centos as well. On 3/10/2022 9:04 AM, Khem Raj wrote: sadly I am seeing this failure https://errors.yoctoproject.org/Errors/Details/651342/ On Wed, Mar 9, 2022 at 12:31 PM Jeremy Puhlman wrote: On 3/9/2022 12:06 PM, Khem Raj wrote: Thanks Jeremy I wonder why we don't see it failing on AB or in my local testing. is it specific to some build host distro ? I am seeing the same issue reported on ubuntu 18.04, centos 7 and 8, but its only with the extended buildtools. On Wed, Mar 9, 2022 at 11:41 AM Jeremy Puhlman wrote: From: Jeremy Puhlman gcc abstract.o -Xlinker -L../../dist/lib -lplc4 -L../../dist/lib -lnspr4 -lpthread -o abstract /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__libc_dlsym@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__pthread_unwind@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__libc_dlopen_mode@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__clock_getcpuclockid@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__clock_nanosleep@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__clock_settime@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__clock_getres@GLIBC_PRIVATE' The linker is not correctly pulling in lrt as needed. Signed-off-by: Jeremy Puhlman --- meta-oe/recipes-support/nspr/nspr_4.29.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/nspr/nspr_4.29.bb b/meta-oe/recipes-support/nspr/nspr_4.29.bb index f224bcd34..2717f37bc 100644 --- a/meta-oe/recipes-support/nspr/nspr_4.29.bb +++ b/meta-oe/recipes-support/nspr/nspr_4.29.bb @@ -160,6 +160,8 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # preferred path upstream. EXTRA_OECONF += "--includedir=${includedir}/nspr" +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt'" + do_compile:prepend() { oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export } -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95937): https://lists.openembedded.org/g/openembedded-devel/message/95937 Mute This Topic: https://lists.openembedded.org/mt/89670512/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] nspr-native: build correclty with extended buildtools.
On Thu, Mar 10, 2022 at 9:58 AM Jeremy Puhlman wrote: > > Adding -ldl should resolve it. It corrected the issue on ubuntu-18.04 + > extended-buildtools and with out. Lemme check centos as well. > Thanks Jeremy Since, I merged the patch. Please send and incremental fix. > > On 3/10/2022 9:04 AM, Khem Raj wrote: > > sadly I am seeing this failure > > > > https://errors.yoctoproject.org/Errors/Details/651342/ > > > > On Wed, Mar 9, 2022 at 12:31 PM Jeremy Puhlman wrote: > >> > >> > >> On 3/9/2022 12:06 PM, Khem Raj wrote: > >>> Thanks Jeremy > >>> > >>> I wonder why we don't see it failing on AB or in my local testing. is > >>> it specific to some build host distro ? > >> I am seeing the same issue reported on ubuntu 18.04, centos 7 and 8, but > >> its only with the extended buildtools. > >> > >>> On Wed, Mar 9, 2022 at 11:41 AM Jeremy Puhlman > >>> wrote: > From: Jeremy Puhlman > > gcc abstract.o -Xlinker -L../../dist/lib -lplc4 -L../../dist/lib > -lnspr4 -lpthread -o abstract > /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > /lib64/librt.so.1: undefined reference to `__libc_dlsym@GLIBC_PRIVATE' > /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > /lib64/librt.so.1: undefined reference to > `__pthread_unwind@GLIBC_PRIVATE' > /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > /lib64/librt.so.1: undefined reference to > `__libc_dlopen_mode@GLIBC_PRIVATE' > /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > /lib64/librt.so.1: undefined reference to > `__clock_getcpuclockid@GLIBC_PRIVATE' > /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > /lib64/librt.so.1: undefined reference to > `__clock_nanosleep@GLIBC_PRIVATE' > /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > /lib64/librt.so.1: undefined reference to > `__clock_settime@GLIBC_PRIVATE' > /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: > /lib64/librt.so.1: undefined reference to `__clock_getres@GLIBC_PRIVATE' > > The linker is not correctly pulling in lrt as needed. > > Signed-off-by: Jeremy Puhlman > --- > meta-oe/recipes-support/nspr/nspr_4.29.bb | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta-oe/recipes-support/nspr/nspr_4.29.bb > b/meta-oe/recipes-support/nspr/nspr_4.29.bb > index f224bcd34..2717f37bc 100644 > --- a/meta-oe/recipes-support/nspr/nspr_4.29.bb > +++ b/meta-oe/recipes-support/nspr/nspr_4.29.bb > @@ -160,6 +160,8 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," > # preferred path upstream. > EXTRA_OECONF += "--includedir=${includedir}/nspr" > > +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt'" > + > do_compile:prepend() { > oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" > LDFLAGS="" CC="${BUILD_CC}" -C config export > } > -- > 2.31.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95938): https://lists.openembedded.org/g/openembedded-devel/message/95938 Mute This Topic: https://lists.openembedded.org/mt/89670512/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] nspr-native: fix ubuntu 18.04 builds using system gcc.
gcc abstract.o -Xlinker -L../../dist/lib -lplc4 -L../../dist/lib -lnspr4 -lpthread -lrt -o abstract ../../dist/lib/libnspr4.so: undefined reference to `dlopen' ../../dist/lib/libnspr4.so: undefined reference to `dlclose' ../../dist/lib/libnspr4.so: undefined reference to `dlerror' ../../dist/lib/libnspr4.so: undefined reference to `dlsym' ../../dist/lib/libnspr4.so: undefined reference to `dladdr' collect2: error: ld returned 1 exit status Pulling in -lrt, does not automatically pull in libdl. Signed-off-by: Jeremy A. Puhlman --- meta-oe/recipes-support/nspr/nspr_4.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/nspr/nspr_4.29.bb b/meta-oe/recipes-support/nspr/nspr_4.29.bb index 2717f37bc..b60de08d2 100644 --- a/meta-oe/recipes-support/nspr/nspr_4.29.bb +++ b/meta-oe/recipes-support/nspr/nspr_4.29.bb @@ -160,7 +160,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # preferred path upstream. EXTRA_OECONF += "--includedir=${includedir}/nspr" -EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt'" +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt -ldl'" do_compile:prepend() { oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95939): https://lists.openembedded.org/g/openembedded-devel/message/95939 Mute This Topic: https://lists.openembedded.org/mt/89693555/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] nspr-native: build correclty with extended buildtools.
On 3/10/2022 10:21 AM, Khem Raj wrote: On Thu, Mar 10, 2022 at 9:58 AM Jeremy Puhlman wrote: Adding -ldl should resolve it. It corrected the issue on ubuntu-18.04 + extended-buildtools and with out. Lemme check centos as well. Thanks Jeremy Since, I merged the patch. Please send and incremental fix. Patch sent. Seems to work fine in: ubuntu 18.04 + extended-buildtools ubuntu 18.04 ubuntu 20.04 + extended-buildtools ubuntu 20.04 centos 8 + extended-buildtools centos 8 centos 7 + extended-buildtools On 3/10/2022 9:04 AM, Khem Raj wrote: sadly I am seeing this failure https://errors.yoctoproject.org/Errors/Details/651342/ On Wed, Mar 9, 2022 at 12:31 PM Jeremy Puhlman wrote: On 3/9/2022 12:06 PM, Khem Raj wrote: Thanks Jeremy I wonder why we don't see it failing on AB or in my local testing. is it specific to some build host distro ? I am seeing the same issue reported on ubuntu 18.04, centos 7 and 8, but its only with the extended buildtools. On Wed, Mar 9, 2022 at 11:41 AM Jeremy Puhlman wrote: From: Jeremy Puhlman gcc abstract.o -Xlinker -L../../dist/lib -lplc4 -L../../dist/lib -lnspr4 -lpthread -o abstract /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__libc_dlsym@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__pthread_unwind@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__libc_dlopen_mode@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__clock_getcpuclockid@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__clock_nanosleep@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__clock_settime@GLIBC_PRIVATE' /build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/11.2.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1: undefined reference to `__clock_getres@GLIBC_PRIVATE' The linker is not correctly pulling in lrt as needed. Signed-off-by: Jeremy Puhlman --- meta-oe/recipes-support/nspr/nspr_4.29.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/nspr/nspr_4.29.bb b/meta-oe/recipes-support/nspr/nspr_4.29.bb index f224bcd34..2717f37bc 100644 --- a/meta-oe/recipes-support/nspr/nspr_4.29.bb +++ b/meta-oe/recipes-support/nspr/nspr_4.29.bb @@ -160,6 +160,8 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # preferred path upstream. EXTRA_OECONF += "--includedir=${includedir}/nspr" +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt'" + do_compile:prepend() { oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export } -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95940): https://lists.openembedded.org/g/openembedded-devel/message/95940 Mute This Topic: https://lists.openembedded.org/mt/89670512/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] pcp: Upgrade to 5.3.6
Signed-off-by: Khem Raj --- .../pcp/{pcp-native_5.3.5.bb => pcp-native_5.3.6.bb} | 0 meta-oe/recipes-support/pcp/pcp.inc | 9 +++-- .../recipes-support/pcp/{pcp_5.3.5.bb => pcp_5.3.6.bb} | 0 3 files changed, 3 insertions(+), 6 deletions(-) rename meta-oe/recipes-support/pcp/{pcp-native_5.3.5.bb => pcp-native_5.3.6.bb} (100%) rename meta-oe/recipes-support/pcp/{pcp_5.3.5.bb => pcp_5.3.6.bb} (100%) diff --git a/meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb b/meta-oe/recipes-support/pcp/pcp-native_5.3.6.bb similarity index 100% rename from meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb rename to meta-oe/recipes-support/pcp/pcp-native_5.3.6.bb diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc index 97a9095b97..1c1a977b97 100644 --- a/meta-oe/recipes-support/pcp/pcp.inc +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -7,15 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \ " COMPATIBLE_HOST:libc-musl = "null" -SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/pcp-5.3.5.src.tar.gz \ +SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \ file://config.linux \ " +SRC_URI[sha256sum] = "6ef33b7aa14c09860ba7cd8873e76d38ccd24eab0c94a50e235f813e77fe3610" -SRC_URI[sha256sum] = "589a610f753a49af6d2015cede87e9d469bd07880ebef26fe1607b6ded375e97" - -inherit setuptools3-base pkgconfig autotools - -B = "${S}" +inherit setuptools3-base pkgconfig autotools-brokensep # Specify any options you want to pass to the configure script using EXTRA_OECONF: CACHED_CONFIGUREVARS = "PACKAGE_DISTRIBUTION=arch" diff --git a/meta-oe/recipes-support/pcp/pcp_5.3.5.bb b/meta-oe/recipes-support/pcp/pcp_5.3.6.bb similarity index 100% rename from meta-oe/recipes-support/pcp/pcp_5.3.5.bb rename to meta-oe/recipes-support/pcp/pcp_5.3.6.bb -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95941): https://lists.openembedded.org/g/openembedded-devel/message/95941 Mute This Topic: https://lists.openembedded.org/mt/89693645/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] libcereal: upgrade 1.3.1 -> 1.3.2
this fails to build on qemumips see https://errors.yoctoproject.org/Errors/Details/651369/ perhaps its clang being more fussy here I dont know, can you build it for qemumips and see if it works ok with gcc atleast On Mon, Mar 7, 2022 at 4:45 AM wangmy wrote: > > This is a minor bug fix and build enhancement release for cereal. > The primary reason for this release is to correctly increment the version for > cereal in include/cereal/version.hpp. > > Bug fixes and enhancements > -- > Make doxygen docs reproducible > Add CMake options for building doc and sandbox > Correct patch version for 1.3.2 > > Signed-off-by: Wang Mingyu > --- > .../libcereal/{libcereal_1.3.1.bb => libcereal_1.3.2.bb}| 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > rename meta-oe/recipes-support/libcereal/{libcereal_1.3.1.bb => > libcereal_1.3.2.bb} (94%) > > diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.1.bb > b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb > similarity index 94% > rename from meta-oe/recipes-support/libcereal/libcereal_1.3.1.bb > rename to meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb > index c905b74d6..08291d2db 100644 > --- a/meta-oe/recipes-support/libcereal/libcereal_1.3.1.bb > +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb > @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "\ > PROVIDES += "${PN}-dev" > > PV .= "+git${SRCPV}" > -SRCREV = "1de8fe89471d69ea392ea260ce74e079d5f4b415" > +SRCREV = "ebef1e929807629befafbb2918ea1a08c7194554" > SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https" > > S = "${WORKDIR}/git" > -- > 2.25.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95942): https://lists.openembedded.org/g/openembedded-devel/message/95942 Mute This Topic: https://lists.openembedded.org/mt/89610748/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][dunfell][PATCH] p7zip: refresh patches
From: Armin Kuster Signed-off-by: Armin Kuster --- .../p7zip/files/CVE-2018-5996.patch | 72 +-- ...nge_numMethods_from_bool_to_unsigned.patch | 14 ++-- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch index 0de39e78bd..b6deb5d3a7 100644 --- a/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch +++ b/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch @@ -20,10 +20,10 @@ Signed-off-by: Virendra Thakur CPP/7zip/Compress/Rar3Decoder.h | 2 ++ 6 files changed, 42 insertions(+), 8 deletions(-) -diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp -index 1aaedcc..68030c7 100644 a/CPP/7zip/Compress/Rar1Decoder.cpp -+++ b/CPP/7zip/Compress/Rar1Decoder.cpp +Index: p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp +=== +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp @@ -29,7 +29,7 @@ public: }; */ @@ -33,7 +33,7 @@ index 1aaedcc..68030c7 100644 void CDecoder::InitStructures() { -@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * +@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialIn InitData(); if (!m_IsSolid) { @@ -48,7 +48,7 @@ index 1aaedcc..68030c7 100644 if (m_UnpackSize > 0) { GetFlagsBuf(); -@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream +@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialI const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) { try { return CodeReal(inStream, outStream, inSize, outSize, progress); } @@ -61,10 +61,10 @@ index 1aaedcc..68030c7 100644 } STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) -diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h -index 630f089..01b606b 100644 a/CPP/7zip/Compress/Rar1Decoder.h -+++ b/CPP/7zip/Compress/Rar1Decoder.h +Index: p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h +=== +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h @@ -39,6 +39,7 @@ public: Int64 m_UnpackSize; @@ -73,11 +73,11 @@ index 630f089..01b606b 100644 UInt32 ReadBits(int numBits); HRESULT CopyBlock(UInt32 distance, UInt32 len); -diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp -index b3f2b4b..0580c8d 100644 a/CPP/7zip/Compress/Rar2Decoder.cpp -+++ b/CPP/7zip/Compress/Rar2Decoder.cpp -@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20; +Index: p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp +=== +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp +@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << static const UInt32 kWindowReservSize = (1 << 22) + 256; CDecoder::CDecoder(): @@ -87,7 +87,7 @@ index b3f2b4b..0580c8d 100644 { } -@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB +@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBi bool CDecoder::ReadTables(void) { @@ -105,7 +105,7 @@ index b3f2b4b..0580c8d 100644 return true; } -@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * +@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialIn return S_FALSE; } @@ -115,10 +115,10 @@ index b3f2b4b..0580c8d 100644 UInt64 startPos = m_OutWindowStream.GetProcessedSize(); while (pos < unPackSize) { -diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h -index 3a0535c..0e9005f 100644 a/CPP/7zip/Compress/Rar2Decoder.h -+++ b/CPP/7zip/Compress/Rar2Decoder.h +Index: p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h +=== +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h @@ -139,6 +139,7 @@ class CDecoder : UInt64 m_PackSize; @@ -127,10 +127,10 @@ index 3a0535c..0e9005f 100644 void InitStructures(); UInt32 ReadBits(unsigned numBits); -diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp -index 3bf2513..6cb8a6a 100644 a/CPP/7zip/Compress/Rar3Decoder.cpp -+++ b/CPP/7zip/Compress/Rar3Decoder.cpp +Index: p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp +=== +--- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp @@ -92,7 +92,8 @@ CDecoder::CDecoder():
[oe] [meta-oe][PATCH] pcp: Do not search headers on build host during cross compile
This is required for cross-compile to work correctly Signed-off-by: Khem Raj --- meta-oe/recipes-support/pcp/pcp.inc | 3 +- ...e-Limit-the-header-search-to-sysroot.patch | 88 +++ 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc index 1c1a977b97..708ebfe7ab 100644 --- a/meta-oe/recipes-support/pcp/pcp.inc +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \ COMPATIBLE_HOST:libc-musl = "null" SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \ - file://config.linux \ + file://0001-configure-Limit-the-header-search-to-sysroot.patch \ + file://config.linux \ " SRC_URI[sha256sum] = "6ef33b7aa14c09860ba7cd8873e76d38ccd24eab0c94a50e235f813e77fe3610" diff --git a/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch new file mode 100644 index 00..591f94f374 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch @@ -0,0 +1,88 @@ +From 1eb68f65fd73443d862ca5f36f3b6041e2b0f13a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 10 Mar 2022 18:53:13 -0800 +Subject: [PATCH] configure: Limit the header search to sysroot + +Hardcoded paths in configure.ac means it starts to poke at host system +include paths, which is least we want in a cross build, therefore prefix +these paths with STAGING_SYSROOT + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Khem Raj +--- + configure.ac | 20 ++-- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5d24714..4e2d8ec 100644 +--- a/configure.ac b/configure.ac +@@ -913,7 +913,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], + [ PY_MAJOR="$1" + PY_MINOR="$2" + PY_VERSION="python$PY_MAJOR.$PY_MINOR" +-PY_INCLUDE_DIRS="-I/usr/include/${PY_VERSION}m -I/usr/include/${PY_VERSION}" ++PY_INCLUDE_DIRS="-I${STAGING_INCDIR}/${PY_VERSION}m -I${STAGING_INCDIR}/${PY_VERSION}" + saved_CFLAGS="$CFLAGS" + saved_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $PY_INCLUDE_DIRS" +@@ -1524,7 +1524,7 @@ AC_SUBST(qmake) + + enable_qt3d=false + AS_IF([test "x$do_qt3d" != "xno"], [ +-if test -f /usr/include/Coin3/Inventor/Qt/SoQt.h -o -f /usr/include/Inventor/Qt/SoQt.h ++if test -f ${STAGING_INCDIR}/Coin3/Inventor/Qt/SoQt.h -o -f ${STAGING_INCDIR}/Inventor/Qt/SoQt.h + then + enable_qt3d=$enable_qt + elif test x"$do_qt3d" = x"yes" +@@ -3810,13 +3810,13 @@ then + + saved_CFLAGS="$CFLAGS" + saved_CPPFLAGS="$CPPFLAGS" +-NSS_INC_DIRS="-I/usr/include/nss -I/usr/include/nss3" +-NSPR_INC_DIRS="-I/usr/include/nspr -I/usr/include/nspr4" ++NSS_INC_DIRS="-I${STAGING_INCDIR}/nss -I${STAGING_INCDIR}/nss3" ++NSPR_INC_DIRS="-I${STAGING_INCDIR}/nspr -I${STAGING_INCDIR}/nspr4" + CFLAGS="$CFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS" + CPPFLAGS="$CPPFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS" + +-AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I/usr/include/nss], [ +- AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I/usr/include/nss3], [ ++AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss], [ ++ AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss3], [ + enable_secure=false + if test "$do_secure" = "yes" + then +@@ -3826,8 +3826,8 @@ then + ]) + AC_SUBST(NSSCFLAGS) + +-AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr], [ +- AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr4], [ ++AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr], [ ++ AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr4], [ + enable_secure=false + if test "$do_secure" = "yes" + then +@@ -3837,7 +3837,7 @@ then + ]) + AC_SUBST(NSPRCFLAGS) + +-AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I/usr/include/sasl], [ ++AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I${STAGING_INCDIR}/sasl], [ + enable_secure=false + if test "$do_secure" = "yes" + then +@@ -3938,7 +3938,7 @@ AC_SUBST(enable_decompression) + AC_SUBST(enable_lzma) + + dnl check for array sessions +-if test -f /usr/include/sn/arsess.h ++if test -f ${STAGING_INCDIR}/sn/arsess.h + then + pcp_mpi_dirs=libpcp_mpi\ libpcp_mpiread + else +-- +2.35.1 + -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95944): https://lists.openembedded.org/g/openembedded-devel/message/95944 Mute This Topic: https://list
[oe] [PATCH] ecryptfs-utils: add CVE-2016-1572 to allowlist
Patch for CVE-2016-1572 is applied in version 109. Signed-off-by: matsunaga-shinji --- recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb index 9aefc32..d98724c 100644 --- a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb +++ b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb @@ -68,3 +68,6 @@ FILES:${PN} += "${base_libdir}/security/* ${base_libdir}/ecryptfs/*" RDEPENDS:${PN} += "cryptsetup" RRECOMMENDS:${PN} = "gettext-runtime" + +# Patch for CVE-2016-1572 is applied in version 109. +CVE_CHECK_IGNORE += "CVE-2016-1572" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95945): https://lists.openembedded.org/g/openembedded-devel/message/95945 Mute This Topic: https://lists.openembedded.org/mt/89704285/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] ecryptfs-utils: add CVE-2016-1572 to allowlist
I guess this belongs to meta-security, please prefix the patch subject with layer name [meta-security] in this case. On Thu, Mar 10, 2022 at 8:14 PM Matsunaga-Shinji wrote: > > Patch for CVE-2016-1572 is applied in version 109. > > Signed-off-by: matsunaga-shinji > --- > recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb > b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb > index 9aefc32..d98724c 100644 > --- a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb > +++ b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb > @@ -68,3 +68,6 @@ FILES:${PN} += "${base_libdir}/security/* > ${base_libdir}/ecryptfs/*" > > RDEPENDS:${PN} += "cryptsetup" > RRECOMMENDS:${PN} = "gettext-runtime" > + > +# Patch for CVE-2016-1572 is applied in version 109. > +CVE_CHECK_IGNORE += "CVE-2016-1572" > -- > 2.25.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95946): https://lists.openembedded.org/g/openembedded-devel/message/95946 Mute This Topic: https://lists.openembedded.org/mt/89704285/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] ecryptfs-utils: add CVE-2016-1572 to allowlist
On Fri, Mar 11, 2022, 05:14 Matsunaga-Shinji wrote: > Patch for CVE-2016-1572 is applied in version 109. > > Signed-off-by: matsunaga-shinji > --- > recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb > b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb > index 9aefc32..d98724c 100644 > --- a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb > +++ b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb > @@ -68,3 +68,6 @@ FILES:${PN} += "${base_libdir}/security/* > ${base_libdir}/ecryptfs/*" > > RDEPENDS:${PN} += "cryptsetup" > RRECOMMENDS:${PN} = "gettext-runtime" > + > +# Patch for CVE-2016-1572 is applied in version 109. > +CVE_CHECK_IGNORE += "CVE-2016-1572" > Wouldn't it be better to report this to the NVD and do the fix in the database instead? Regards Marta > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#95947): https://lists.openembedded.org/g/openembedded-devel/message/95947 Mute This Topic: https://lists.openembedded.org/mt/89704285/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: adb: add u3 ss descriptor support
Porting u3 Superspeed descriptor support to open-embedded android-tools package. This patch origins from the the patch in android project [1], but has been modified for backporting to android-tools_5.1.1.r37. [1] https://android.googlesource.com/platform/system/core/+/d6ee9f26a5163af4121f4380264fcbd4e6851a17%5E%21 Signed-off-by: Macpaul Lin Signed-off-by: Jiacheng Liu --- ...add-u3-ss-descriptor-support-for-adb.patch | 342 ++ .../android-tools/android-tools_5.1.1.r37.bb | 1 + 2 files changed, 343 insertions(+) create mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch new file mode 100644 index 0..05973aaaf --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch @@ -0,0 +1,342 @@ +From dae9a11f3a158357966399aef97c48b5f16934d9 Mon Sep 17 00:00:00 2001 +From: Jiacheng Liu +Date: Sat, 24 Jul 2021 11:01:18 +0800 +Subject: [PATCH] android-tools: adb: add u3 ss descriptor support + +Porting u3 Superspeed descriptor support to open-embedded android-tools package. +This patch origins from the the patch in android project [1], but has been +modified for backporting to android-tools_5.1.1.r37. + +[1] https://android.googlesource.com/platform/system/core/+/d6ee9f26a5163af4121f4380264fcbd4e6851a17%5E%21 + +Signed-off-by: Macpaul Lin +Signed-off-by: Jiacheng Liu +--- + adb/usb_linux_client.c | 275 +++-- + 1 file changed, 207 insertions(+), 68 deletions(-) + +diff --git a/adb/usb_linux_client.c b/adb/usb_linux_client.c +index 6e8b5bb..884e85e 100644 +--- a/adb/usb_linux_client.c b/adb/usb_linux_client.c +@@ -31,8 +31,10 @@ + #define TRACE_TAG TRACE_USB + #include "adb.h" + ++#define USB_EXT_PROP_UNICODE1 + #define MAX_PACKET_SIZE_FS64 + #define MAX_PACKET_SIZE_HS512 ++#define MAX_PACKET_SIZE_SS1024 + + #if __BYTE_ORDER == __LITTLE_ENDIAN + # define cpu_to_le16(x) (x) +@@ -62,74 +64,185 @@ struct usb_handle + int bulk_in; /* "in" from the host's perspective => sink for adbd */ + }; + +-static const struct { +-struct usb_functionfs_descs_head header; +-struct { +-struct usb_interface_descriptor intf; +-struct usb_endpoint_descriptor_no_audio source; +-struct usb_endpoint_descriptor_no_audio sink; +-} __attribute__((packed)) fs_descs, hs_descs; +-} __attribute__((packed)) descriptors = { +-.header = { +-.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC), +-.length = cpu_to_le32(sizeof(descriptors)), +-.fs_count = 3, +-.hs_count = 3, ++struct func_desc { ++struct usb_interface_descriptor intf; ++struct usb_endpoint_descriptor_no_audio source; ++struct usb_endpoint_descriptor_no_audio sink; ++} __attribute__((packed)); ++ ++struct ss_func_desc { ++struct usb_interface_descriptor intf; ++struct usb_endpoint_descriptor_no_audio source; ++struct usb_ss_ep_comp_descriptor source_comp; ++struct usb_endpoint_descriptor_no_audio sink; ++struct usb_ss_ep_comp_descriptor sink_comp; ++} __attribute__((packed)); ++ ++struct desc_v1 { ++struct usb_functionfs_descs_head_v1 { ++__le32 magic; ++__le32 length; ++__le32 fs_count; ++__le32 hs_count; ++} __attribute__((packed)) header; ++struct func_desc fs_descs, hs_descs; ++} __attribute__((packed)); ++ ++struct usb_os_desc_ext_prop { ++uint32_t dwSize; ++uint32_t dwPropertyDataType; ++ ++// Property name and value are transmitted as UTF-16, but the kernel only ++// accepts ASCII values and performs the conversion for us. ++uint16_t wPropertyNameLength; ++char bPropertyName[20]; ++ ++uint32_t dwPropertyDataLength; ++char bProperty[39]; ++} __attribute__((packed)) os_desc_guid = { ++.dwSize = sizeof(struct usb_os_desc_ext_prop), ++.dwPropertyDataType = cpu_to_le32(USB_EXT_PROP_UNICODE), ++.wPropertyNameLength = cpu_to_le16(20), ++.bPropertyName = "DeviceInterfaceGUID", ++.dwPropertyDataLength = cpu_to_le32(39), ++.bProperty = "{F72FE0D4-CBCB-407D-8814-9ED673D0DD6B}", ++}; ++ ++struct usb_ext_prop_values { ++struct usb_os_desc_ext_prop guid; ++} __attribute__((packed)); ++ ++struct desc_v2 { ++struct usb_functionfs_descs_head_v2 header; ++// The rest of the structure depends on the flags in the header. ++__le32 fs_count; ++__le32 hs_count; ++__le32 ss_count; ++__le32 os_count; ++struct func_desc fs_descs, hs_descs; ++struct ss_func_desc ss_descs; ++struct usb_os_desc_header os_header; ++struct usb_ext_compat_desc os_desc; ++struct usb_os_desc_header os_prop_header; ++struct