Re: [OE-core] [meta-oe][PATCH] glm: Fix packaging for header-only recipe
On Thu, Jan 28, 2021 at 5:44 PM Tom Hochstein wrote: > Set ALLOW_EMPTY for the main package to "1" for this header-only recipe. > This > allows the SDK to be created properly when there is an RDEPENDS on glm. Runtime dependency on a header only package seems a bit iffy it’s perhaps better to depend on glm-dev perhaps ? > > > Signed-off-by: Tom Hochstein > --- > meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb > b/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb > index e2f4dbebc..019e6257d 100644 > --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb > +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb > @@ -34,6 +34,7 @@ do_install() { > > } > > -RDEPENDS_${PN}-dev = "" > +# This is a header-only library, so the main package will be empty. > +ALLOW_EMPTY_${PN} = "1" > > BBCLASSEXTEND = "native" > -- > 2.17.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147424): https://lists.openembedded.org/g/openembedded-core/message/147424 Mute This Topic: https://lists.openembedded.org/mt/80200725/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] cve_check: add CVE_VERSION_SUFFIX to indicate suffix in versioning
From: Lee Chee Yang add CVE_VERSION_SUFFIX to indicate the version suffix type, currently works in two value, "alphabetical" if the version string uses single alphabetical character suffix as incremental release, blank to not consider the unidentified suffixes. This can be expand when more suffix pattern identified. refactor cve_check.Version class to use functools and add parameter to handle suffix condition. Also update testcases to cover new changes. Signed-off-by: Lee Chee Yang --- V2 make sure match.group("patch_l") not "None" before assign it to key meta/classes/cve-check.bbclass| 12 --- meta/lib/oe/cve_check.py | 40 --- meta/lib/oeqa/selftest/cases/cve_check.py | 11 ++- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 646cc879dd..ed86403b6b 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -53,6 +53,9 @@ CVE_CHECK_PN_WHITELIST ?= "" # CVE_CHECK_WHITELIST ?= "" +# set to "alphabetical" for version using single alphabetical character as increament release +CVE_VERSION_SUFFIX ??= "" + python cve_save_summary_handler () { import shutil import datetime @@ -210,6 +213,7 @@ def check_cves(d, patched_cves): pn = d.getVar("PN") real_pv = d.getVar("PV") +suffix = d.getVar("CVE_VERSION_SUFFIX") cves_unpatched = [] # CVE_PRODUCT can contain more than one product (eg. curl/libcurl) @@ -263,8 +267,8 @@ def check_cves(d, patched_cves): else: if operator_start: try: -vulnerable_start = (operator_start == '>=' and Version(pv) >= Version(version_start)) -vulnerable_start |= (operator_start == '>' and Version(pv) > Version(version_start)) +vulnerable_start = (operator_start == '>=' and Version(pv,suffix) >= Version(version_start,suffix)) +vulnerable_start |= (operator_start == '>' and Version(pv,suffix) > Version(version_start,suffix)) except: bb.warn("%s: Failed to compare %s %s %s for %s" % (product, pv, operator_start, version_start, cve)) @@ -274,8 +278,8 @@ def check_cves(d, patched_cves): if operator_end: try: -vulnerable_end = (operator_end == '<=' and Version(pv) <= Version(version_end) ) -vulnerable_end |= (operator_end == '<' and Version(pv) < Version(version_end) ) +vulnerable_end = (operator_end == '<=' and Version(pv,suffix) <= Version(version_end,suffix) ) +vulnerable_end |= (operator_end == '<' and Version(pv,suffix) < Version(version_end,suffix) ) except: bb.warn("%s: Failed to compare %s %s %s for %s" % (product, pv, operator_end, version_end, cve)) diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py index ec48a3f829..ce755f940a 100644 --- a/meta/lib/oe/cve_check.py +++ b/meta/lib/oe/cve_check.py @@ -1,58 +1,60 @@ import collections import re import itertools +import functools _Version = collections.namedtuple( -"_Version", ["release", "pre_l", "pre_v"] +"_Version", ["release", "patch_l", "pre_l", "pre_v"] ) +@functools.total_ordering class Version(): -_version_pattern = r"""v?(?:(?P[0-9]+(?:[-\.][0-9]+)*)(?P[-_\.]?(?P(rc|alpha|beta|pre|preview|dev))[-_\.]?(?P[0-9]+)?)?)(.*)?""" -_regex = re.compile(r"^\s*" + _version_pattern + r"\s*$", re.VERBOSE | re.IGNORECASE) -def __init__(self, version): -match = self._regex.search(version) + +def __init__(self, version, suffix=None): +if str(suffix) == "alphabetical": +version_pattern = r"""r?v?(?:(?P[0-9]+(?:[-\.][0-9]+)*)(?P[-_\.]?(?P[a-z]))?(?P[-_\.]?(?P(rc|alpha|beta|pre|preview|dev))[-_\.]?(?P[0-9]+)?)?)(.*)?""" +else: +version_pattern = r"""r?v?(?:(?P[0-9]+(?:[-\.][0-9]+)*)(?P[-_\.]?(?P(rc|alpha|beta|pre|preview|dev))[-_\.]?(?P[0-9]+)?)?)(.*)?""" +regex = re.compile(r"^\s*" + version_pattern + r"\s*$", re.VERBOSE | re.IGNORECASE) + +match = regex.search(version) if not match: raise Exception("Invalid version: '{0}'".format(version)) self._version = _Version( release=tuple(int(i) for i in match.group("release").replace("-",".").split(".")), +patch_l=match.group("patch_l") if str(suffix) == "alphabetical" and match.group("patch_l") else "", pre_l=match.group("pre_l"), pre_v=match.group("pre_v") ) self._key = _cmpkey( self._version.release, +self._version.patch_l
[OE-core] [meta-oe][PATCH] glm: Fix packaging for header-only recipe
Set ALLOW_EMPTY for the main package to "1" for this header-only recipe. This allows the SDK to be created properly when there is an RDEPENDS on glm. Signed-off-by: Tom Hochstein --- meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb index e2f4dbebc..019e6257d 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb @@ -34,6 +34,7 @@ do_install() { } -RDEPENDS_${PN}-dev = "" +# This is a header-only library, so the main package will be empty. +ALLOW_EMPTY_${PN} = "1" BBCLASSEXTEND = "native" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147422): https://lists.openembedded.org/g/openembedded-core/message/147422 Mute This Topic: https://lists.openembedded.org/mt/80200725/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] [RFC] openssl: Enable cryptodev-linux by default
On 1/28/21 1:35 PM, Tom Hochstein wrote: This is a Request for Comment. Would it be a good idea to enable cryptodev-linux by default, gaining hardware acceleration where supported? Are there any unacceptable drawbacks? What happens on hardware without acceleration? this perhaps helps with devices that include a hardware crypto device but not as much with one;s thats fine but we use qemu machines quite a bit in testing so it would be good to get a readout on qemu secondly, if it does not, then maybe we should see if defining it via MACHINE_FEATUREs might be an option to enable it. Signed-off-by: Tom Hochstein --- meta/recipes-connectivity/openssl/openssl_1.1.1i.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb index 5617f337e0..d4c19f1a52 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb @@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee0 inherit lib_package multilib_header multilib_script ptest MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" -PACKAGECONFIG ?= "" +PACKAGECONFIG ?= "cryptodev-linux" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147421): https://lists.openembedded.org/g/openembedded-core/message/147421 Mute This Topic: https://lists.openembedded.org/mt/80195674/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] insane: native-last: Print classes inherited after native/nativesdk
>> I'd prefer a little of context on the commit log. > >Agreed, I've improved the log of the patch I've merged. Linking to a >bugzilla entry isn't really enough information. I appreciate the >patches though, there have been some good ones! Thank you both for your feedback and for improving the commit log. I will add more descriptive messages even for small changes next time. Best regards, Tomasz Dziendzielski -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147420): https://lists.openembedded.org/g/openembedded-core/message/147420 Mute This Topic: https://lists.openembedded.org/mt/80169150/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] insane: native-last: Print classes inherited after native/nativesdk
On Thu, 2021-01-28 at 17:27 -0300, Otavio Salvador wrote: > Em qua., 27 de jan. de 2021 às 18:30, Tomasz Dziendzielski > escreveu: > > > > See [YOCTO #5729] for details. > > > > Signed-off-by: Tomasz Dziendzielski > > I'd prefer a little of context on the commit log. Agreed, I've improved the log of the patch I've merged. Linking to a bugzilla entry isn't really enough information. I appreciate the patches though, there have been some good ones! Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147419): https://lists.openembedded.org/g/openembedded-core/message/147419 Mute This Topic: https://lists.openembedded.org/mt/80169150/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] maintainers: update own email address
Signed-off-by: Denys Dmytriyenko --- meta/conf/distro/include/maintainers.inc | 42 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index b0ddfb8..75af9e4 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -85,8 +85,8 @@ RECIPE_MAINTAINER_pn-builder = "Richard Purdie " RECIPE_MAINTAINER_pn-core-image-sato-sdk-ptest = "Richard Purdie " RECIPE_MAINTAINER_pn-coreutils = "Chen Qi " -RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster " RECIPE_MAINTAINER_pn-createrepo-c = "Alexander Kanavin " RECIPE_MAINTAINER_pn-cronie = "Anuj Mittal " @@ -232,7 +232,7 @@ RECIPE_MAINTAINER_pn-gobject-introspection = "Alexander Kanavin " RECIPE_MAINTAINER_pn-gtk+3 = "Ross Burton " RECIPE_MAINTAINER_pn-gtk-doc = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal " -RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-help2man = "Hongxu Jia " RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal " RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin " @@ -461,10 +461,10 @@ RECIPE_MAINTAINER_pn-ltp = "Yi Zhao " RECIPE_MAINTAINER_pn-lttng-modules = "Richard Purdie " RECIPE_MAINTAINER_pn-lttng-tools = "Richard Purdie " RECIPE_MAINTAINER_pn-lttng-ust = "Richard Purdie " -RECIPE_MAINTAINER_pn-lz4 = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-lzo = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-lzip = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-lzop = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-lz4 = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-lzo = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-lzip = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-lzop = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-m4 = "Robert Yang " RECIPE_MAINTAINER_pn-m4-native = "Robert Yang " RECIPE_MAINTAINER_pn-make = "Robert Yang " @@ -508,7 +508,7 @@ RECIPE_MAINTAINER_pn-mpeg2dec = "Alexander Kanavin " RECIPE_MAINTAINER_pn-mpfr = "Khem Raj " RECIPE_MAINTAINER_pn-mpg123 = "Alexander Kanavin " RECIPE_MAINTAINER_pn-msmtp = "Wang Mingyu " -RECIPE_MAINTAINER_pn-mtd-utils = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-mtd-utils = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-mtdev = "Anuj Mittal " RECIPE_MAINTAINER_pn-mtools = "Anuj Mittal " RECIPE_MAINTAINER_pn-musl = "Khem Raj " @@ -553,7 +553,7 @@ RECIPE_MAINTAINER_pn-pango = "Ross Burton " RECIPE_MAINTAINER_pn-parted = "Hongxu Jia " RECIPE_MAINTAINER_pn-patch = "Hongxu Jia " RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie " -RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-pciutils = "Chen Qi " RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin " RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield " @@ -714,7 +714,7 @@ RECIPE_MAINTAINER_pn-udev-extraconf = "Ross Burton " RECIPE_MAINTAINER_pn-unfs3 = "Ross Burton " RECIPE_MAINTAINER_pn-unifdef = "Ross Burton " RECIPE_MAINTAINER_pn-uninative-tarball = "Richard Purdie " -RECIPE_MAINTAINER_pn-unzip = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-unzip = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-update-rc.d = "Ross Burton " RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin " RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin " @@ -735,12 +735,12 @@ RECIPE_MAINTAINER_pn-vulkan-tools = "Anuj Mittal " RECIPE_MAINTAINER_pn-waffle = "Ross Burton " RECIPE_MAINTAINER_pn-watchdog = "Alexander Kanavin " RECIPE_MAINTAINER_pn-watchdog-config = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-wayland-utils = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-wayland-utils = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-wget = "Yi Zhao " RECIPE_MAINTAINER_pn-which = "Anuj Mittal " RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal " @@ -794,7 +794,7 @@ RECIPE_MAINTAINER_pn-xtrans = "Armin Kuster " RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster " RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster " RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster " -RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko " +RECIPE_MAINTAI
[OE-core] [PATCH] wayland: upgrade 1.18.0 -> 1.19.0
This release mostly contains bug fixes and minor protocol updates. Related patches were rebased and backported patches dropped. Signed-off-by: Denys Dmytriyenko --- ...0001-build-Fix-strndup-detection-on-MinGW.patch | 5 +- ...-add-missing-dependencies-on-protocol-hea.patch | 115 - ...-not-hardcode-the-path-to-wayland-scanner.patch | 23 +++-- ...-find-the-native-wayland-scanner-directly.patch | 13 +-- .../{wayland_1.18.0.bb => wayland_1.19.0.bb} | 4 +- 5 files changed, 24 insertions(+), 136 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch rename meta/recipes-graphics/wayland/{wayland_1.18.0.bb => wayland_1.19.0.bb} (91%) diff --git a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch index c2ceae4..ad1063b 100644 --- a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch +++ b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch @@ -1,4 +1,4 @@ -From e6783c99f051c6d8252db5f388d805cef0e16357 Mon Sep 17 00:00:00 2001 +From 6a6223a8e217664a348835e92d5a602f50e18b2c Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Thu, 20 Feb 2020 15:20:45 -0600 Subject: [PATCH] build: Fix strndup detection on MinGW @@ -13,10 +13,13 @@ See: https://github.com/mesonbuild/meson/issues/3672 Signed-off-by: Joshua Watt Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] + --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/meson.build b/meson.build +index 11c35fa..80729d0 100644 --- a/meson.build +++ b/meson.build @@ -36,11 +36,11 @@ have_funcs = [ diff --git a/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch b/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch deleted file mode 100644 index 61de0e0..000 --- a/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch +++ /dev/null @@ -1,115 +0,0 @@ -From b2c74f6a3dbe0aee2413800837314136947a4985 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Sat, 15 Feb 2020 02:03:45 + -Subject: [PATCH] meson/tests: add missing dependencies on protocol headers - -In file included from ../tests/connection-test.c:43: -In file included from ../tests/test-compositor.h:30: -../src/wayland-client.h:40:10: fatal error: 'wayland-client-protocol.h' file not found - #include "wayland-client-protocol.h" - ^~~ -In file included from ../tests/display-test.c:45: -In file included from ../src/wayland-server.h:104: -src/wayland-server-protocol.h:4454:2: error: unterminated /* comment -/** -^ -In file included from ../tests/cpp-compile-test.cpp:2: -In file included from src/wayland-server-protocol.h:8: -In file included from ../src/wayland-server.h:104: -src/wayland-server-protocol.h:3:2: error: unterminated conditional directive - #ifndef WAYLAND_SERVER_PROTOCOL_H - ^ -../tests/headers-protocol-test.c:33:2: error: including wayland-server-protocol.h did not include wayland-server.h! - #error including wayland-server-protocol.h did not include wayland-server.h! - ^ -In file included from ../tests/headers-protocol-test.c:26: -In file included from src/wayland-client-protocol.h:8: -In file included from ../src/wayland-client.h:40: -src/wayland-client-protocol.h:1358:2: error: unterminated conditional directive - #ifndef WL_SHM_FORMAT_ENUM - ^ -In file included from ../tests/protocol-logger-test.c:34: -In file included from ../src/wayland-client.h:40: -src/wayland-client-protocol.h:2613:1: error: unterminated /* comment -/** -^ -../tests/resources-test.c:49:36: error: use of undeclared identifier 'wl_seat_interface' -res = wl_resource_create(client, &wl_seat_interface, 4, 0); - ^ -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin - tests/meson.build | 26 ++ - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index c28a2a3..f1af7b4 100644 a/tests/meson.build -+++ b/tests/meson.build -@@ -69,7 +69,7 @@ test( - executable( - 'cpp-compile-test', - 'cpp-compile-test.cpp', -- wayland_server_protocol_core_h, -+ wayland_server_protocol_h, - include_directories: src_inc - ) - ) -@@ -91,17 +91,25 @@ tests = { - 'array-test': [], - 'client-test': [ wayland_server_protocol_h ], - 'display-test': [ -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, - tests_server_protocol_h, - tests_client_protocol_c, -
Re: [OE-core] [PATCH v4 4/4] shaderc: fix the build with glslang 11.1.0
On Thu, 2021-01-28 at 23:38 +0100, Alexandre Belloni wrote: > Hello Jose, > > On 24/01/2021 18:07:58+, Jose Quaresma wrote: > > Drop patches: > > * 0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch > > is rejected upstream and is not need when glslang as shared libs. > > > > Update pacthes: > > * 0001-cmake-de-vendor-libs-and-disable-git-versioning.patch > > renamed and refreshed from > > 0003-cmake-de-vendor-libs-and-disable-git-versioning.patch. > > > > It seems there is still a linking issue when building shaderc-native. > The full log is available here: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/2978/steps/11/logs/stdio I have a suspicion this happens on Ubuntu 18.04 systems since I've seen issues like this locally with 18.04's binutils version and OE generated vulkan-samples binaries, I think Joshua Watt reported the same issue too with 18.04. Not sure what we can do about it, can we disable the debug symbol types causing problems in that -native recipe? Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147416): https://lists.openembedded.org/g/openembedded-core/message/147416 Mute This Topic: https://lists.openembedded.org/mt/80084132/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v4 4/4] shaderc: fix the build with glslang 11.1.0
Hello Jose, On 24/01/2021 18:07:58+, Jose Quaresma wrote: > Drop patches: > * 0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch > is rejected upstream and is not need when glslang as shared libs. > > Update pacthes: > * 0001-cmake-de-vendor-libs-and-disable-git-versioning.patch > renamed and refreshed from > 0003-cmake-de-vendor-libs-and-disable-git-versioning.patch. > It seems there is still a linking issue when building shaderc-native. The full log is available here: https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/2978/steps/11/logs/stdio > Signed-off-by: Jose Quaresma > --- > ...link-order-of-libglslang-and-libHLSL.patch | 49 --- > ...dor-libs-and-disable-git-versioning.patch} | 4 +- > .../shaderc/shaderc_2020.4.bb | 10 ++-- > 3 files changed, 9 insertions(+), 54 deletions(-) > delete mode 100644 > meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch > rename > meta/recipes-graphics/shaderc/files/{0003-cmake-de-vendor-libs-and-disable-git-versioning.patch > => 0001-cmake-de-vendor-libs-and-disable-git-versioning.patch} (94%) > > diff --git > a/meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch > > b/meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch > deleted file mode 100644 > index 7102e25bcf..00 > --- > a/meta/recipes-graphics/shaderc/files/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From 0b9468d4face34879214f500b15e810cdd1a81a1 Mon Sep 17 00:00:00 2001 > -From: Niklas Haas > -Date: Tue, 29 May 2018 07:34:00 +0200 > -Subject: [PATCH] Fix the link order of libglslang and libHLSL > - > -libglslang depends on libHLSL, so the latter needs to be specified last. > -This fixes an issue when trying to build shaderc against system-wide > -versions of libglslang/libHLSL, rather than the in-tree versions from > -third_party. > - > -Additionally, libshaderc_util also depends on SPIRV-Tools > - > -Upstream-Status: Backport [21c8be385b3fab5edcb934a6d99f69fd389c4e67] > - > -Signed-off-by: Jose Quaresma > - > > - glslc/CMakeLists.txt | 2 +- > - libshaderc_util/CMakeLists.txt | 4 ++-- > - 2 files changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt > -index 31664d1..35b3f19 100644 > a/glslc/CMakeLists.txt > -+++ b/glslc/CMakeLists.txt > -@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) > - endif(SHADERC_ENABLE_WGSL_OUTPUT) > - > - target_link_libraries(glslc PRIVATE > -- glslang OSDependent OGLCompiler HLSL glslang SPIRV# Glslang libraries > -+ glslang OSDependent OGLCompiler glslang SPIRV HLSL# Glslang libraries > - $<$:libtint> # Tint libraries, > optional > - shaderc_util shaderc # internal Shaderc > libraries > - ${CMAKE_THREAD_LIBS_INIT}) > -diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt > -index 48f9991..984cc06 100644 > a/libshaderc_util/CMakeLists.txt > -+++ b/libshaderc_util/CMakeLists.txt > -@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL) > - > - find_package(Threads) > - target_link_libraries(shaderc_util PRIVATE > -- glslang OSDependent OGLCompiler HLSL glslang SPIRV > -- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) > -+ glslang OSDependent OGLCompiler glslang HLSL SPIRV > -+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) > - > - shaderc_add_tests( > - TEST_PREFIX shaderc_util > diff --git > a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch > > b/meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch > similarity index 94% > rename from > meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch > rename to > meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch > index e4e3f0be1e..40cc84df26 100644 > --- > a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch > +++ > b/meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch > @@ -1,4 +1,4 @@ > -From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001 > +From a07ac322a5a5fd4f0339913eb4456321ad1a69fd Mon Sep 17 00:00:00 2001 > From: Jose Quaresma > Date: Sat, 17 Oct 2020 12:51:50 +0100 > Subject: [PATCH] cmake: de-vendor libs and disable git versioning > @@ -32,7 +32,7 @@ index 5c74cd8..9451fbc 100644 > add_custom_target(build-version > ${PYTHON_EXECUTABLE} > diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt > -index 35b3f19..52006b8 100644 > +index 31664d1..358d91b 100644 > --- a/glslc/CMakeLists.txt > +++ b/glslc/CMakeLists.txt > @@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) > diff --git a/meta/recip
[oe-core][PATCH] glibc: fix CVE-2020-27618
iconv: Accept redundant shift sequences in IBM1364 Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1893708 Signed-off-by: Yi Fan Yu --- .../glibc/glibc/CVE-2020-27618.patch | 91 +++ meta/recipes-core/glibc/glibc_2.32.bb | 1 + 2 files changed, 92 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-27618.patch diff --git a/meta/recipes-core/glibc/glibc/CVE-2020-27618.patch b/meta/recipes-core/glibc/glibc/CVE-2020-27618.patch new file mode 100644 index 00..bf32238357 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/CVE-2020-27618.patch @@ -0,0 +1,91 @@ +From 20e6c868c29f5a6121cbb88f3387bb9b884a4206 Mon Sep 17 00:00:00 2001 +From: Arjun Shankar +Date: Wed, 4 Nov 2020 12:19:38 +0100 +Subject: [PATCH] iconv: Accept redundant shift sequences in IBM1364 [BZ + #26224] + +The IBM1364, IBM1371, IBM1388, IBM1390 and IBM1399 character sets +share converter logic (iconvdata/ibm1364.c) which would reject +redundant shift sequences when processing input in these character +sets. This led to a hang in the iconv program (CVE-2020-27618). + +This commit adjusts the converter to ignore redundant shift sequences +and adds test cases for iconv_prog hangs that would be triggered upon +their rejection. This brings the implementation in line with other +converters that also ignore redundant shift sequences (e.g. IBM930 +etc., fixed in commit 692de4b3960d). + +Reviewed-by: Carlos O'Donell + +Upstream-Status: Backport +[https://sourceware.org/git/?p=glibc.git;a=commit; +h=9a99c682144bdbd40792ebf822fe9264e0376fb5] + +CVE: CVE-2020-27618 +Signed-off-by: Yi Fan Yu +--- + iconv/tst-iconv_prog.sh | 16 ++-- + iconvdata/ibm1364.c | 14 ++ + 2 files changed, 12 insertions(+), 18 deletions(-) + +diff --git a/iconv/tst-iconv_prog.sh b/iconv/tst-iconv_prog.sh +index 8298136b7f..d8db7b335c 100644 +--- a/iconv/tst-iconv_prog.sh b/iconv/tst-iconv_prog.sh +@@ -102,12 +102,16 @@ hangarray=( + "\x00\x80;-c;IBM1161;UTF-8//TRANSLIT//IGNORE" + "\x00\xdb;-c;IBM1162;UTF-8//TRANSLIT//IGNORE" + "\x00\x70;-c;IBM12712;UTF-8//TRANSLIT//IGNORE" +-# These are known hangs that are yet to be fixed: +-# "\x00\x0f;-c;IBM1364;UTF-8" +-# "\x00\x0f;-c;IBM1371;UTF-8" +-# "\x00\x0f;-c;IBM1388;UTF-8" +-# "\x00\x0f;-c;IBM1390;UTF-8" +-# "\x00\x0f;-c;IBM1399;UTF-8" ++"\x00\x0f;-c;IBM1364;UTF-8" ++"\x0e\x0e;-c;IBM1364;UTF-8" ++"\x00\x0f;-c;IBM1371;UTF-8" ++"\x0e\x0e;-c;IBM1371;UTF-8" ++"\x00\x0f;-c;IBM1388;UTF-8" ++"\x0e\x0e;-c;IBM1388;UTF-8" ++"\x00\x0f;-c;IBM1390;UTF-8" ++"\x0e\x0e;-c;IBM1390;UTF-8" ++"\x00\x0f;-c;IBM1399;UTF-8" ++"\x0e\x0e;-c;IBM1399;UTF-8" + "\x00\x53;-c;IBM16804;UTF-8//TRANSLIT//IGNORE" + "\x00\x41;-c;IBM274;UTF-8//TRANSLIT//IGNORE" + "\x00\x41;-c;IBM275;UTF-8//TRANSLIT//IGNORE" +diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c +index 49e7267ab4..521f0825b7 100644 +--- a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c +@@ -158,24 +158,14 @@ enum + \ + if (__builtin_expect (ch, 0) == SO) \ + { \ +- /* Shift OUT, change to DBCS converter. */ \ +- if (curcs == db) \ +-{ \ +- result = __GCONV_ILLEGAL_INPUT; \ +- break;\ +-} \ ++ /* Shift OUT, change to DBCS converter (redundant escape okay). */ \ + curcs = db; \ + ++inptr; \ + continue; \ + } \ + if (__builtin_expect (ch, 0) == SI) \ + { \ +- /* Shift IN, change to SBCS converter. */\ +- if (curcs == sb) \ +-{ \ +- result = __GCONV_ILLEGAL_INPUT; \ +- break;\ +-} \ ++ /* Shift IN, change to SBCS converter (redundant escape okay). */\ + curcs = sb; \ + ++inptr;
Re: [OE-core] [PATCH] [RFC] openssl: Enable cryptodev-linux by default
Em qui., 28 de jan. de 2021 às 18:36, Tom Hochstein escreveu: > > This is a Request for Comment. Would it be a good idea to enable > cryptodev-linux > by default, gaining hardware acceleration where supported? Are there any > unacceptable drawbacks? What happens on hardware without acceleration? > > Signed-off-by: Tom Hochstein Tom and I were discussing about this and I suggested him to raise the issue here. We are not aware of drawbacks but as we are not experts on this field we'd like to receive feedback from the community prior sending the formal patch for it. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147413): https://lists.openembedded.org/g/openembedded-core/message/147413 Mute This Topic: https://lists.openembedded.org/mt/80195674/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] [RFC] openssl: Enable cryptodev-linux by default
This is a Request for Comment. Would it be a good idea to enable cryptodev-linux by default, gaining hardware acceleration where supported? Are there any unacceptable drawbacks? What happens on hardware without acceleration? Signed-off-by: Tom Hochstein --- meta/recipes-connectivity/openssl/openssl_1.1.1i.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb index 5617f337e0..d4c19f1a52 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb @@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee0 inherit lib_package multilib_header multilib_script ptest MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" -PACKAGECONFIG ?= "" +PACKAGECONFIG ?= "cryptodev-linux" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147412): https://lists.openembedded.org/g/openembedded-core/message/147412 Mute This Topic: https://lists.openembedded.org/mt/80195674/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] pseudo_client: Ensure renames update open fd file paths
There is an issue in pseudo where if you open a file, rename the file, then call fstat on the open fd, pseudo would thrown an abort. This is because it needs to track the open fd mappings to files and it doesn't update in the case of a rename. Add code in pseudo to update the fd mappings in the case of a rename call. Also add a test case. Signed-off-by: Richard Purdie --- Makefile.in | 1 + pseudo_client.c | 20 +++- test/test-rename-fstat.c | 23 +++ test/test-rename-fstat.sh | 12 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 test/test-rename-fstat.c create mode 100755 test/test-rename-fstat.sh diff --git a/Makefile.in b/Makefile.in index d1f77d5..6eff522 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,6 +75,7 @@ TABLES=table_templates/pseudo_tables.c table_templates/pseudo_tables.h all: $(LIBPSEUDO) $(PSEUDO) $(PSEUDODB) $(PSEUDOLOG) $(PSEUDO_PROFILE) test: all | $(BIN) $(LIB) $(LOCALSTATE) + $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o test/test-rename-fstat test/test-rename-fstat.c @./run_tests.sh -v install-lib: $(LIBPSEUDO) diff --git a/pseudo_client.c b/pseudo_client.c index f5cab7e..f846d54 100644 --- a/pseudo_client.c +++ b/pseudo_client.c @@ -943,6 +943,21 @@ pseudo_client_linked_paths(const char *oldpath, const char *newpath) { } } +static void +pseudo_client_rename_path(const char *oldpath, const char *newpath) { + int fd; + for (fd = 3; fd < nfds; ++fd) { + if (fd_paths[fd] && !strcmp(oldpath, fd_paths[fd])) { +pseudo_client_path(fd, newpath); + } + } + for (fd = 0; fd < linked_nfds; ++fd) { + if (linked_fd_paths[fd] && fd_paths[fd] && !strcmp(oldpath, linked_fd_paths[fd])) { + pseudo_client_path_set(fd, newpath, &linked_fd_paths, &linked_nfds); + } + } +} + static void pseudo_client_unlinked_path(const char *path) { int fd; @@ -1939,7 +1954,6 @@ pseudo_client_op(pseudo_op_t op, int access, int fd, int dirfd, const char *path case OP_FCHOWN: case OP_FSTAT: case OP_LINK: - case OP_RENAME: case OP_STAT: case OP_CANCEL_UNLINK: case OP_MAY_UNLINK: @@ -1949,6 +1963,10 @@ pseudo_client_op(pseudo_op_t op, int access, int fd, int dirfd, const char *path case OP_REMOVE_XATTR: do_request = 1; break; + case OP_RENAME: + pseudo_client_rename_path(path_extra_1, path); + do_request = 1; + break; default: pseudo_diag("error: unknown or unimplemented operator %d (%s)", op, pseudo_op_name(op)); break; diff --git a/test/test-rename-fstat.c b/test/test-rename-fstat.c new file mode 100644 index 000..fb47c05 --- /dev/null +++ b/test/test-rename-fstat.c @@ -0,0 +1,23 @@ +/* + * SPDX-License-Identifier: LGPL-2.1-only + * + * Test we can rename a file whilst holding an open fd which we fstat after renaming + */ +#include +#include +#include +#include +#include +#include +#include + +int main() +{ +struct stat buf; +int err; +int fd = open("test-rename-fstat1", O_RDONLY); +err = rename("test-rename-fstat1", "test-rename-fstat1"); +if (err) +return err; +return fstat(fd, &buf); +} diff --git a/test/test-rename-fstat.sh b/test/test-rename-fstat.sh new file mode 100755 index 000..4ac89b8 --- /dev/null +++ b/test/test-rename-fstat.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +# SPDX-License-Identifier: LGPL-2.1-only +# + +rm -f test-rename-fstat1 test-rename-fstat2 +touch test-rename-fstat1 +# Will abort if it fails +./test/test-rename-fstat +ecode=$? +rm -f test-rename-fstat1 test-rename-fstat2 +exit $ecode -- 2.27.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147411): https://lists.openembedded.org/g/openembedded-core/message/147411 Mute This Topic: https://lists.openembedded.org/mt/80194815/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] pseudo_client: Ensure renames update open fd file paths
There is an issue in pseudo where if you open a file, rename the file, then call fstat on the open fd, pseudo would thrown an abort. This is because it needs to track the open fd mappings to files and it doesn't update in the case of a rename. Add code in pseudo to update the fd mappings in the case of a rename call. Also add a test case. Signed-off-by: Richard Purdie --- Makefile.in | 1 + pseudo_client.c | 20 +++- test/test-rename-fstat.c | 21 + test/test-rename-fstat.sh | 9 + 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 test/test-rename-fstat.c create mode 100755 test/test-rename-fstat.sh diff --git a/Makefile.in b/Makefile.in index d1f77d5..6eff522 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,6 +75,7 @@ TABLES=table_templates/pseudo_tables.c table_templates/pseudo_tables.h all: $(LIBPSEUDO) $(PSEUDO) $(PSEUDODB) $(PSEUDOLOG) $(PSEUDO_PROFILE) test: all | $(BIN) $(LIB) $(LOCALSTATE) + $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o test/test-rename-fstat test/test-rename-fstat.c @./run_tests.sh -v install-lib: $(LIBPSEUDO) diff --git a/pseudo_client.c b/pseudo_client.c index f5cab7e..f846d54 100644 --- a/pseudo_client.c +++ b/pseudo_client.c @@ -943,6 +943,21 @@ pseudo_client_linked_paths(const char *oldpath, const char *newpath) { } } +static void +pseudo_client_rename_path(const char *oldpath, const char *newpath) { + int fd; + for (fd = 3; fd < nfds; ++fd) { + if (fd_paths[fd] && !strcmp(oldpath, fd_paths[fd])) { +pseudo_client_path(fd, newpath); + } + } + for (fd = 0; fd < linked_nfds; ++fd) { + if (linked_fd_paths[fd] && fd_paths[fd] && !strcmp(oldpath, linked_fd_paths[fd])) { + pseudo_client_path_set(fd, newpath, &linked_fd_paths, &linked_nfds); + } + } +} + static void pseudo_client_unlinked_path(const char *path) { int fd; @@ -1939,7 +1954,6 @@ pseudo_client_op(pseudo_op_t op, int access, int fd, int dirfd, const char *path case OP_FCHOWN: case OP_FSTAT: case OP_LINK: - case OP_RENAME: case OP_STAT: case OP_CANCEL_UNLINK: case OP_MAY_UNLINK: @@ -1949,6 +1963,10 @@ pseudo_client_op(pseudo_op_t op, int access, int fd, int dirfd, const char *path case OP_REMOVE_XATTR: do_request = 1; break; + case OP_RENAME: + pseudo_client_rename_path(path_extra_1, path); + do_request = 1; + break; default: pseudo_diag("error: unknown or unimplemented operator %d (%s)", op, pseudo_op_name(op)); break; diff --git a/test/test-rename-fstat.c b/test/test-rename-fstat.c new file mode 100644 index 000..ef1daf7 --- /dev/null +++ b/test/test-rename-fstat.c @@ -0,0 +1,21 @@ +/* + * SPDX-License-Identifier: LGPL-2.1-only + * + * Test we can rename a file whilst holding an open fd which we fstat after renaming + */ +#include +#include +#include +#include +#include +#include +#include + +int main() +{ +struct stat buf; +int fd = open("test-rename-fstat1", O_RDONLY); +rename("test-rename-fstat1", "test-rename-fstat1"); +fstat(fd, &buf); +return 0; +} diff --git a/test/test-rename-fstat.sh b/test/test-rename-fstat.sh new file mode 100755 index 000..93b3d8a --- /dev/null +++ b/test/test-rename-fstat.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# +# SPDX-License-Identifier: LGPL-2.1-only +# + +rm -f test-rename-fstat1 test-rename-fstat2 +# Will abort if it fails +./test/test-rename-fstat +exit $? -- 2.27.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147410): https://lists.openembedded.org/g/openembedded-core/message/147410 Mute This Topic: https://lists.openembedded.org/mt/80194815/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] sanity.bbclass: check if PSEUDO_IGNORE_PATHS and ${S} overlap
This patch won't be necessary as the previous patch here https://listshanks.openembedded.org/g/openembedded-core/message/147238?p=,,,20,0,0,0::Created,,verify+that+user,20,2,0,80117826 would detect it. Thanks, Dorinda On Jan 28, 2021 20:51, "dorindabassey" wrote: > added a sanity check for when PSEUDO_IGNORE_PATHS and ${S} overlap to > avoid random failures generated. > > [YOCTO #14193] > > Signed-off-by: Dorinda Bassey > --- > v2: > added a condition for when {WORKDIR}={S} > > meta/classes/sanity.bbclass | 10 ++ > 1 file changed, 10 insertions(+) > > diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass > index c6842ff549..63284b7917 100644 > --- a/meta/classes/sanity.bbclass > +++ b/meta/classes/sanity.bbclass > @@ -710,6 +710,16 @@ def check_sanity_version_change(status, d): > if i and workdir.startswith(i): > status.addresult("You are building in a path included in > PSEUDO_IGNORE_PATHS " + str(i) + " please locate the build outside this > path.\n") > > +# Check if PSEUDO_IGNORE_PATHS and ${S} overlap > +pseudoignorepaths = d.getVar('PSEUDO_IGNORE_PATHS', > expand=True).split(",") > +workdir = d.getVar('WORKDIR') > +sourcefile = d.getVar('S') > +if (workdir == sourcefile): > +for i in pseudoignorepaths: > +if i and sourcefile: > +if sourcefile.startswith(i) or i.startswith(sourcefile): > +status.addresult("a path included in > PSEUDO_IGNORE_PATHS " + str(i) + " and ${S} (source files) path " + > str(sourcefile) + " are overlapping each other, please set ${S} in your > recipe to point to a different directory. \n") > + > # Some third-party software apparently relies on chmod etc. being > suid root (!!) > import stat > suid_check_bins = "chown chmod mknod".split() > -- > 2.17.1 > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147409): https://lists.openembedded.org/g/openembedded-core/message/147409 Mute This Topic: https://lists.openembedded.org/mt/80192676/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] common-licenses: add BSD-3-Clause-Clear license
See https://spdx.org/licenses/BSD-3-Clause-Clear.html Signed-off-by: Adrian Herrera --- meta/files/common-licenses/BSD-3-Clause-Clear | 32 +++ 1 file changed, 32 insertions(+) create mode 100644 meta/files/common-licenses/BSD-3-Clause-Clear diff --git a/meta/files/common-licenses/BSD-3-Clause-Clear b/meta/files/common-licenses/BSD-3-Clause-Clear new file mode 100644 index 00..c6e95da6aa --- /dev/null +++ b/meta/files/common-licenses/BSD-3-Clause-Clear @@ -0,0 +1,32 @@ +The Clear BSD License + +Copyright (c) []-[] [Owner Organization] +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted (subject to the limitations in the disclaimer +below) provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of [Owner Organization] nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY +THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. -- 2.29.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147408): https://lists.openembedded.org/g/openembedded-core/message/147408 Mute This Topic: https://lists.openembedded.org/mt/80194167/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] scripts: oe-run-native, fix *-native directories
This fixes a crash with "find" when running a native tool and *-native directories do not exist under the binary directory in the sysroot. This happened because the directory wildcard was passed as part of the root directory. The directory wildcard is now passed by "-name", which returns an empty result if no matching directory. Signed-off-by: Adrian Herrera --- scripts/oe-run-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-run-native b/scripts/oe-run-native index 4e63e69cc4..22958d97e7 100755 --- a/scripts/oe-run-native +++ b/scripts/oe-run-native @@ -43,7 +43,7 @@ fi OLD_PATH=$PATH # look for a tool only in native sysroot -PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$OECORE_NATIVE_SYSROOT/bin:$OECORE_NATIVE_SYSROOT/usr/sbin:$OECORE_NATIVE_SYSROOT/sbin$(find $OECORE_NATIVE_SYSROOT/usr/bin/*-native -maxdepth 1 -type d -printf ":%p") +PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$OECORE_NATIVE_SYSROOT/bin:$OECORE_NATIVE_SYSROOT/usr/sbin:$OECORE_NATIVE_SYSROOT/sbin$(find $OECORE_NATIVE_SYSROOT/usr/bin -maxdepth 1 -name "*-native" -type d -printf ":%p") tool_find=`/usr/bin/which $tool 2>/dev/null` if [ -n "$tool_find" ] ; then -- 2.29.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147407): https://lists.openembedded.org/g/openembedded-core/message/147407 Mute This Topic: https://lists.openembedded.org/mt/80194159/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] cmake: Upgrade 3.19.2 -> 3.19.3
Em qui., 28 de jan. de 2021 às 17:45, Vinícius Ossanes Aquino escreveu: > > Signed-off-by: Vinícius Ossanes Aquino Reviewed-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147406): https://lists.openembedded.org/g/openembedded-core/message/147406 Mute This Topic: https://lists.openembedded.org/mt/80194035/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] cmake: Upgrade 3.19.2 -> 3.19.3
Signed-off-by: Vinícius Ossanes Aquino --- .../cmake/{cmake-native_3.19.2.bb => cmake-native_3.19.3.bb}| 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- .../recipes-devtools/cmake/{cmake_3.19.2.bb => cmake_3.19.3.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cmake/{cmake-native_3.19.2.bb => cmake-native_3.19.3.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.19.2.bb => cmake_3.19.3.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.19.3.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.19.2.bb rename to meta/recipes-devtools/cmake/cmake-native_3.19.3.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index db03819b66..a79b3922bc 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -23,7 +23,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch \ " -SRC_URI[sha256sum] = "e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0" +SRC_URI[sha256sum] = "3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.19.2.bb b/meta/recipes-devtools/cmake/cmake_3.19.3.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.19.2.bb rename to meta/recipes-devtools/cmake/cmake_3.19.3.bb -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147405): https://lists.openembedded.org/g/openembedded-core/message/147405 Mute This Topic: https://lists.openembedded.org/mt/80194035/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] insane: native-last: Print classes inherited after native/nativesdk
Em qua., 27 de jan. de 2021 às 18:30, Tomasz Dziendzielski escreveu: > > See [YOCTO #5729] for details. > > Signed-off-by: Tomasz Dziendzielski I'd prefer a little of context on the commit log. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147404): https://lists.openembedded.org/g/openembedded-core/message/147404 Mute This Topic: https://lists.openembedded.org/mt/80169150/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] sanity.bbclass: check if PSEUDO_IGNORE_PATHS and ${S} overlap
added a sanity check for when PSEUDO_IGNORE_PATHS and ${S} overlap to avoid random failures generated. [YOCTO #14193] Signed-off-by: Dorinda Bassey --- v2: added a condition for when {WORKDIR}={S} meta/classes/sanity.bbclass | 10 ++ 1 file changed, 10 insertions(+) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index c6842ff549..63284b7917 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -710,6 +710,16 @@ def check_sanity_version_change(status, d): if i and workdir.startswith(i): status.addresult("You are building in a path included in PSEUDO_IGNORE_PATHS " + str(i) + " please locate the build outside this path.\n") +# Check if PSEUDO_IGNORE_PATHS and ${S} overlap +pseudoignorepaths = d.getVar('PSEUDO_IGNORE_PATHS', expand=True).split(",") +workdir = d.getVar('WORKDIR') +sourcefile = d.getVar('S') +if (workdir == sourcefile): +for i in pseudoignorepaths: +if i and sourcefile: +if sourcefile.startswith(i) or i.startswith(sourcefile): +status.addresult("a path included in PSEUDO_IGNORE_PATHS " + str(i) + " and ${S} (source files) path " + str(sourcefile) + " are overlapping each other, please set ${S} in your recipe to point to a different directory. \n") + # Some third-party software apparently relies on chmod etc. being suid root (!!) import stat suid_check_bins = "chown chmod mknod".split() -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147403): https://lists.openembedded.org/g/openembedded-core/message/147403 Mute This Topic: https://lists.openembedded.org/mt/80192676/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] npm.bbclass: use python3 for npm config
python2-native executable is not available in sysroot anymore, which causes compilation of some nodejs modules to fail. Switch to python3 as a default python version. Signed-off-by: Vyacheslav Yurkov --- meta/classes/npm.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index d3dd1a9ab8..79f55febcc 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass @@ -17,6 +17,8 @@ # NPM_INSTALL_DEV: # Set to 1 to also install devDependencies. +inherit python3native + DEPENDS_prepend = "nodejs-native " RDEPENDS_${PN}_prepend = "nodejs " @@ -248,9 +250,7 @@ python npm_do_compile() { sysroot = d.getVar("RECIPE_SYSROOT_NATIVE") nodedir = os.path.join(sysroot, d.getVar("prefix_native").strip("/")) configs.append(("nodedir", nodedir)) -bindir = os.path.join(sysroot, d.getVar("bindir_native").strip("/")) -pythondir = os.path.join(bindir, "python-native", "python") -configs.append(("python", pythondir)) +configs.append(("python", d.getVar("PYTHON"))) # Add node-pre-gyp configuration args.append(("target_arch", d.getVar("NPM_ARCH"))) -- 2.28.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147402): https://lists.openembedded.org/g/openembedded-core/message/147402 Mute This Topic: https://lists.openembedded.org/mt/80190992/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] npm.bbclass: use python3 for npm config
python2-native executable is not available in sysroot anymore, which causes compilation of some nodejs modules to fail. Switch to pytho3 as a default python version. Signed-off-by: Vyacheslav Yurkov --- meta/classes/npm.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index d3dd1a9ab8..d0fb5745ec 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass @@ -20,6 +20,8 @@ DEPENDS_prepend = "nodejs-native " RDEPENDS_${PN}_prepend = "nodejs " +inherit python3native + NPM_INSTALL_DEV ?= "0" def npm_target_arch_map(target_arch): @@ -248,9 +250,7 @@ python npm_do_compile() { sysroot = d.getVar("RECIPE_SYSROOT_NATIVE") nodedir = os.path.join(sysroot, d.getVar("prefix_native").strip("/")) configs.append(("nodedir", nodedir)) -bindir = os.path.join(sysroot, d.getVar("bindir_native").strip("/")) -pythondir = os.path.join(bindir, "python-native", "python") -configs.append(("python", pythondir)) +configs.append(("python", d.getVar("PYTHON"))) # Add node-pre-gyp configuration args.append(("target_arch", d.getVar("NPM_ARCH"))) -- 2.28.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147401): https://lists.openembedded.org/g/openembedded-core/message/147401 Mute This Topic: https://lists.openembedded.org/mt/80190602/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] bitbake: Don't treat mc recipe (Midnight Commander) as a multiconfig target
When we run `devtool build mc` recipe's task dependencies are expanded to "mc:do_populate_sysroot" where "mc" name is treated as multiconfig and "do_package_sysroot" as multiconfigname. | ERROR: Multiconfig dependency mc:do_populate_sysroot depends on | nonexistent multiconfig configuration named do_populate_sysroot Signed-off-by: Tomasz Dziendzielski --- skipped change in showEnvironment() to keep "bitbake -e" working --- bitbake/lib/bb/cache.py| 4 ++-- bitbake/lib/bb/cooker.py | 4 ++-- bitbake/lib/bb/runqueue.py | 6 +++--- bitbake/lib/bb/siggen.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 36270d0093..5497da384f 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -238,7 +238,7 @@ def virtualfn2realfn(virtualfn): Convert a virtual file name to a real one + the associated subclass keyword """ mc = "" -if virtualfn.startswith('mc:'): +if virtualfn.startswith('mc:') and virtualfn.count(':') == 2: elems = virtualfn.split(':') mc = elems[1] virtualfn = ":".join(elems[2:]) @@ -268,7 +268,7 @@ def variant2virtual(realfn, variant): """ if variant == "": return realfn -if variant.startswith("mc:"): +if variant.startswith("mc:") and variant.count(':') == 2: elems = variant.split(":") if elems[2]: return "mc:" + elems[1] + ":virtual:" + ":".join(elems[2:]) + ":" + realfn diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 83cfee7fb4..c200127b27 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -614,7 +614,7 @@ class BBCooker: # Replace string such as "mc:*:bash" # into "mc:A:bash mc:B:bash bash" for k in targetlist: -if k.startswith("mc:"): +if k.startswith("mc:") and k.count(':') == 2: if wildcard: bb.fatal('multiconfig conflict') if k.split(":")[1] == "*": @@ -648,7 +648,7 @@ class BBCooker: for k in fulltargetlist: origk = k mc = "" -if k.startswith("mc:"): +if k.startswith("mc:") and k.count(':') == 2: mc = k.split(":")[1] k = ":".join(k.split(":")[2:]) ktask = task diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 28bdadb45e..d1fcb7cea4 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -38,7 +38,7 @@ def taskname_from_tid(tid): return tid.rsplit(":", 1)[1] def mc_from_tid(tid): -if tid.startswith('mc:'): +if tid.startswith('mc:') and tid.count(':') == 2: return tid.split(':')[1] return "" @@ -47,13 +47,13 @@ def split_tid(tid): return (mc, fn, taskname) def split_mc(n): -if n.startswith("mc:"): +if n.startswith("mc:") and n.count(':') == 2: _, mc, n = n.split(":", 2) return (mc, n) return ('', n) def split_tid_mcfn(tid): -if tid.startswith('mc:'): +if tid.startswith('mc:') and tid.count(':') == 2: elems = tid.split(':') mc = elems[1] fn = ":".join(elems[2:-1]) diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 0ac3952466..6859a7207b 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -748,7 +748,7 @@ def clean_basepath(basepath): if basepath[0] == '/': return cleaned -if basepath.startswith("mc:"): +if basepath.startswith("mc:") and basepath.count(':') == 2: mc, mc_name, basepath = basepath.split(":", 2) mc_suffix = ':mc:' + mc_name else: -- 2.30.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147400): https://lists.openembedded.org/g/openembedded-core/message/147400 Mute This Topic: https://lists.openembedded.org/mt/80188697/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] "file" cmd ISO mime type: "octet-stream" should be "x-iso9660-image"
apparently, the newer version of "file", when asked about the mime type of an ISO image, reports: application/octet-stream when, from what i read, it should (and used to) report: application/x-iso9660-image the above unexpected(?) behaviour comes with file-5.37, and it's been seen in the wild: https://bugs.launchpad.net/ubuntu/+source/file/+bug/1763570 is this a known issue? i checked bugzilla but didn't find anything, and this change in behaviour is messing with some install scripts which use "file" to verify that something is a valid ISO image by looking for the string "x-iso9660-image". thoughts? others certainly seem to think this is a bug. rday -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147399): https://lists.openembedded.org/g/openembedded-core/message/147399 Mute This Topic: https://lists.openembedded.org/mt/80188399/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] bitbake: Don't treat mc recipe (Midnight Commander) as a multiconfig target
It seems that I don't need to modify showEnvironment() in lib/bb/cooker.py, that is only used for "bitbake -e", and without changing this one line I have both "devtool build mc" and "bitbake -e mc:foo" working correctly. I compared the output of environment dump before and after my change and it was the same (with exception of hashes and timestamps). I will submit a new patchset. Best regards, Tomasz Dziendzielski czw., 28 sty 2021 o 17:33 Tomasz Dziendzielski via lists.openembedded.org napisał(a): > >Hmm, this might be problematic, since "bitbake -e mc:foo" needs to keep > working to dump the base environment for the "foo" multiconfig, and I think > this patch will break that (although I didn't test it to verify) > > You're right. I just checked and with this patch "bitbake -e mc:foo" > returns "ERROR: Nothing PROVIDES 'mc:foo'". I will try to find a solution > to keep it working for the environment dump. > > Best regards, > Tomasz Dziendzielski > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147398): https://lists.openembedded.org/g/openembedded-core/message/147398 Mute This Topic: https://lists.openembedded.org/mt/80186365/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/7] ncurses: Don't put terminfo into the sysroot
On Thu, 2021-01-28 at 08:45 +, mikko.rap...@bmw.de wrote: > Interesting series! Do you already have some numbers how this affects > bitbake builds? We do now have measurements: https://autobuilder.yocto.io/pub/non-release/20210128-10/testresults/buildperf-centos7/perf-centos7.yoctoproject.org_master-next_20210128130350_0ec9fb3f98.html https://autobuilder.yocto.io/pub/non-release/20210128-9/testresults/buildperf-ubuntu1604/perf-ubuntu1604_master-next_20210128130346_0ec9fb3f98.html so a 5-7% build time speedup with and without rm_work and a 7% reduction in disk usage without rm_work. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147397): https://lists.openembedded.org/g/openembedded-core/message/147397 Mute This Topic: https://lists.openembedded.org/mt/80162698/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] bitbake: Don't treat mc recipe (Midnight Commander) as a multiconfig target
>Hmm, this might be problematic, since "bitbake -e mc:foo" needs to keep working to dump the base environment for the "foo" multiconfig, and I think this patch will break that (although I didn't test it to verify) You're right. I just checked and with this patch "bitbake -e mc:foo" returns "ERROR: Nothing PROVIDES 'mc:foo'". I will try to find a solution to keep it working for the environment dump. Best regards, Tomasz Dziendzielski -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147396): https://lists.openembedded.org/g/openembedded-core/message/147396 Mute This Topic: https://lists.openembedded.org/mt/80186365/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] bitbake: Don't treat mc recipe (Midnight Commander) as a multiconfig target
On 1/28/21 9:55 AM, Tomasz Dziendzielski wrote: When we run `devtool build mc` recipe's task dependencies are expanded to "mc:do_populate_sysroot" where "mc" name is treated as multiconfig and "do_package_sysroot" as multiconfigname. Hmm, this might be problematic, since "bitbake -e mc:foo" needs to keep working to dump the base environment for the "foo" multiconfig, and I think this patch will break that (although I didn't test it to verify) | ERROR: Multiconfig dependency mc:do_populate_sysroot depends on | nonexistent multiconfig configuration named do_populate_sysroot Signed-off-by: Tomasz Dziendzielski --- bitbake/lib/bb/cache.py| 4 ++-- bitbake/lib/bb/cooker.py | 6 +++--- bitbake/lib/bb/runqueue.py | 6 +++--- bitbake/lib/bb/siggen.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 36270d0093..5497da384f 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -238,7 +238,7 @@ def virtualfn2realfn(virtualfn): Convert a virtual file name to a real one + the associated subclass keyword """ mc = "" -if virtualfn.startswith('mc:'): +if virtualfn.startswith('mc:') and virtualfn.count(':') == 2: elems = virtualfn.split(':') mc = elems[1] virtualfn = ":".join(elems[2:]) @@ -268,7 +268,7 @@ def variant2virtual(realfn, variant): """ if variant == "": return realfn -if variant.startswith("mc:"): +if variant.startswith("mc:") and variant.count(':') == 2: elems = variant.split(":") if elems[2]: return "mc:" + elems[1] + ":virtual:" + ":".join(elems[2:]) + ":" + realfn diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 83cfee7fb4..3d8dbd6065 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -533,7 +533,7 @@ class BBCooker: self.reset() def mc_base(p): -if p.startswith('mc:'): +if p.startswith('mc:') and p.count(':') == 2: s = p.split(':') if len(s) == 2: return s[1] @@ -614,7 +614,7 @@ class BBCooker: # Replace string such as "mc:*:bash" # into "mc:A:bash mc:B:bash bash" for k in targetlist: -if k.startswith("mc:"): +if k.startswith("mc:") and k.count(':') == 2: if wildcard: bb.fatal('multiconfig conflict') if k.split(":")[1] == "*": @@ -648,7 +648,7 @@ class BBCooker: for k in fulltargetlist: origk = k mc = "" -if k.startswith("mc:"): +if k.startswith("mc:") and k.count(':') == 2: mc = k.split(":")[1] k = ":".join(k.split(":")[2:]) ktask = task diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 28bdadb45e..d1fcb7cea4 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -38,7 +38,7 @@ def taskname_from_tid(tid): return tid.rsplit(":", 1)[1] def mc_from_tid(tid): -if tid.startswith('mc:'): +if tid.startswith('mc:') and tid.count(':') == 2: return tid.split(':')[1] return "" @@ -47,13 +47,13 @@ def split_tid(tid): return (mc, fn, taskname) def split_mc(n): -if n.startswith("mc:"): +if n.startswith("mc:") and n.count(':') == 2: _, mc, n = n.split(":", 2) return (mc, n) return ('', n) def split_tid_mcfn(tid): -if tid.startswith('mc:'): +if tid.startswith('mc:') and tid.count(':') == 2: elems = tid.split(':') mc = elems[1] fn = ":".join(elems[2:-1]) diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 0ac3952466..6859a7207b 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -748,7 +748,7 @@ def clean_basepath(basepath): if basepath[0] == '/': return cleaned -if basepath.startswith("mc:"): +if basepath.startswith("mc:") and basepath.count(':') == 2: mc, mc_name, basepath = basepath.split(":", 2) mc_suffix = ':mc:' + mc_name else: -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147395): https://lists.openembedded.org/g/openembedded-core/message/147395 Mute This Topic: https://lists.openembedded.org/mt/80186365/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] bitbake: Don't treat mc recipe (Midnight Commander) as a multiconfig target
When we run `devtool build mc` recipe's task dependencies are expanded to "mc:do_populate_sysroot" where "mc" name is treated as multiconfig and "do_package_sysroot" as multiconfigname. | ERROR: Multiconfig dependency mc:do_populate_sysroot depends on | nonexistent multiconfig configuration named do_populate_sysroot Signed-off-by: Tomasz Dziendzielski --- bitbake/lib/bb/cache.py| 4 ++-- bitbake/lib/bb/cooker.py | 6 +++--- bitbake/lib/bb/runqueue.py | 6 +++--- bitbake/lib/bb/siggen.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 36270d0093..5497da384f 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -238,7 +238,7 @@ def virtualfn2realfn(virtualfn): Convert a virtual file name to a real one + the associated subclass keyword """ mc = "" -if virtualfn.startswith('mc:'): +if virtualfn.startswith('mc:') and virtualfn.count(':') == 2: elems = virtualfn.split(':') mc = elems[1] virtualfn = ":".join(elems[2:]) @@ -268,7 +268,7 @@ def variant2virtual(realfn, variant): """ if variant == "": return realfn -if variant.startswith("mc:"): +if variant.startswith("mc:") and variant.count(':') == 2: elems = variant.split(":") if elems[2]: return "mc:" + elems[1] + ":virtual:" + ":".join(elems[2:]) + ":" + realfn diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 83cfee7fb4..3d8dbd6065 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -533,7 +533,7 @@ class BBCooker: self.reset() def mc_base(p): -if p.startswith('mc:'): +if p.startswith('mc:') and p.count(':') == 2: s = p.split(':') if len(s) == 2: return s[1] @@ -614,7 +614,7 @@ class BBCooker: # Replace string such as "mc:*:bash" # into "mc:A:bash mc:B:bash bash" for k in targetlist: -if k.startswith("mc:"): +if k.startswith("mc:") and k.count(':') == 2: if wildcard: bb.fatal('multiconfig conflict') if k.split(":")[1] == "*": @@ -648,7 +648,7 @@ class BBCooker: for k in fulltargetlist: origk = k mc = "" -if k.startswith("mc:"): +if k.startswith("mc:") and k.count(':') == 2: mc = k.split(":")[1] k = ":".join(k.split(":")[2:]) ktask = task diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 28bdadb45e..d1fcb7cea4 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -38,7 +38,7 @@ def taskname_from_tid(tid): return tid.rsplit(":", 1)[1] def mc_from_tid(tid): -if tid.startswith('mc:'): +if tid.startswith('mc:') and tid.count(':') == 2: return tid.split(':')[1] return "" @@ -47,13 +47,13 @@ def split_tid(tid): return (mc, fn, taskname) def split_mc(n): -if n.startswith("mc:"): +if n.startswith("mc:") and n.count(':') == 2: _, mc, n = n.split(":", 2) return (mc, n) return ('', n) def split_tid_mcfn(tid): -if tid.startswith('mc:'): +if tid.startswith('mc:') and tid.count(':') == 2: elems = tid.split(':') mc = elems[1] fn = ":".join(elems[2:-1]) diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 0ac3952466..6859a7207b 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -748,7 +748,7 @@ def clean_basepath(basepath): if basepath[0] == '/': return cleaned -if basepath.startswith("mc:"): +if basepath.startswith("mc:") and basepath.count(':') == 2: mc, mc_name, basepath = basepath.split(":", 2) mc_suffix = ':mc:' + mc_name else: -- 2.30.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147394): https://lists.openembedded.org/g/openembedded-core/message/147394 Mute This Topic: https://lists.openembedded.org/mt/80186365/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] sanity.bbclass: check if PSEUDO_IGNORE_PATHS and ${S} overlap
Hmm, thanks for spotting this, I think that was an oversight on my part. IMHO i think this patch should apply to cases where {WORKDIR} = {S}. so i'll make some changes to the patch soon. Thanks, Dorinda. On Wed, Jan 27, 2021 at 6:44 PM Tomasz Dziendzielski < tomasz.dziendziel...@gmail.com> wrote: > >+# Check if PSEUDO_IGNORE_PATHS and ${S} overlap > >+pseudoignorepaths = d.getVar('PSEUDO_IGNORE_PATHS', > expand=True).split(",") > >+sourcefile = d.getVar('S') > >+for i in pseudoignorepaths: > >+if i and sourcefile: > >+if sourcefile.startswith(i) or i.startswith(sourcefile): > >+status.addresult("a path included in PSEUDO_IGNORE_PATHS > " + str(i) + " and ${S} (source files) path " + str(sourcefile) + " are > overlapping each other, please set ${S} in your recipe to point to a > different directory. \n") > > Isn't ${S} added to PSEUDO_IGNORE_PATHS almost every time in > meta/classes/base.bbclass? > if os.path.normpath(d.getVar("WORKDIR")) != > os.path.normpath(d.getVar("S")): > d.appendVar("PSEUDO_IGNORE_PATHS", ",${S}") > > Best regards, > Tomasz Dziendzielski > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147393): https://lists.openembedded.org/g/openembedded-core/message/147393 Mute This Topic: https://lists.openembedded.org/mt/80170967/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/2] cve_check: add CVE_VERSION_SUFFIX to indicate suffix in versioning
Hello, On 27/01/2021 17:03:53+0800, Lee Chee Yang wrote: > From: Lee Chee Yang > > add CVE_VERSION_SUFFIX to indicate the version suffix type, currently > works in two value, "alphabetical" if the version string uses single > alphabetical character suffix as incremental release, blank to not > consider the unidentified suffixes. This can be expand when more suffix > pattern identified. > > refactor cve_check.Version class to use functools add parameter to handle > suffix condition. > > Also update testcases to cover new changes. > > Signed-off-by: Lee Chee Yang > --- > meta/classes/cve-check.bbclass| 12 --- > meta/lib/oe/cve_check.py | 40 --- > meta/lib/oeqa/selftest/cases/cve_check.py | 11 ++- > 3 files changed, 39 insertions(+), 24 deletions(-) > I believe this patch resulted in the following autobuilder errors: https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1768/steps/14/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/1752/steps/15/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1757/steps/14/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/1784/steps/14/logs/stdio 2021-01-28 00:16:31,719 - oe-selftest - INFO - cve_check.CVECheck.test_version_compare (subunit.RemotedTestCase) 2021-01-28 00:16:31,720 - oe-selftest - INFO - ... FAIL 2021-01-28 00:16:31,720 - oe-selftest - INFO - 11: 1/17 2/424 (0.14s) (cve_check.CVECheck.test_version_compare) 2021-01-28 00:16:31,720 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last): File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/cve_check.py", line 36, in test_version_compare self.assertTrue( result ,msg="Failed to compare version with suffix '1.0b' > '1.0'") File "/usr/lib64/python3.6/unittest/case.py", line 699, in assertTrue raise self.failureException(msg) AssertionError: False is not true : Failed to compare version with suffix '1.0b' > '1.0' > diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass > index 646cc879dd..ed86403b6b 100644 > --- a/meta/classes/cve-check.bbclass > +++ b/meta/classes/cve-check.bbclass > @@ -53,6 +53,9 @@ CVE_CHECK_PN_WHITELIST ?= "" > # > CVE_CHECK_WHITELIST ?= "" > > +# set to "alphabetical" for version using single alphabetical character as > increament release > +CVE_VERSION_SUFFIX ??= "" > + > python cve_save_summary_handler () { > import shutil > import datetime > @@ -210,6 +213,7 @@ def check_cves(d, patched_cves): > > pn = d.getVar("PN") > real_pv = d.getVar("PV") > +suffix = d.getVar("CVE_VERSION_SUFFIX") > > cves_unpatched = [] > # CVE_PRODUCT can contain more than one product (eg. curl/libcurl) > @@ -263,8 +267,8 @@ def check_cves(d, patched_cves): > else: > if operator_start: > try: > -vulnerable_start = (operator_start == '>=' and > Version(pv) >= Version(version_start)) > -vulnerable_start |= (operator_start == '>' and > Version(pv) > Version(version_start)) > +vulnerable_start = (operator_start == '>=' and > Version(pv,suffix) >= Version(version_start,suffix)) > +vulnerable_start |= (operator_start == '>' and > Version(pv,suffix) > Version(version_start,suffix)) > except: > bb.warn("%s: Failed to compare %s %s %s for %s" % > (product, pv, operator_start, > version_start, cve)) > @@ -274,8 +278,8 @@ def check_cves(d, patched_cves): > > if operator_end: > try: > -vulnerable_end = (operator_end == '<=' and > Version(pv) <= Version(version_end) ) > -vulnerable_end |= (operator_end == '<' and > Version(pv) < Version(version_end) ) > +vulnerable_end = (operator_end == '<=' and > Version(pv,suffix) <= Version(version_end,suffix) ) > +vulnerable_end |= (operator_end == '<' and > Version(pv,suffix) < Version(version_end,suffix) ) > except: > bb.warn("%s: Failed to compare %s %s %s for %s" % > (product, pv, operator_end, version_end, > cve)) > diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py > index ec48a3f829..e40929fd2b 100644 > --- a/meta/lib/oe/cve_check.py > +++ b/meta/lib/oe/cve_check.py > @@ -1,58 +1,60 @@ > import collections > import re > import itertools > +import functools > > _Version = collections.namedtuple( > -"_Version", ["release", "pre_l", "pre_v"] > +"_Version", ["release", "patch_l", "pre_l", "pre_v"] > ) > > +
Re: [OE-core] [PATCH 1/7] ncurses: Don't put terminfo into the sysroot
On Thu, 2021-01-28 at 10:35 +, mikko.rap...@bmw.de wrote: > On Thu, Jan 28, 2021 at 09:02:39AM +, Richard Purdie wrote: > > On Thu, 2021-01-28 at 08:45 +, mikko.rap...@bmw.de wrote: > > > Interesting series! Do you already have some numbers how this affects > > > bitbake builds? > > > > Not yet. I should really have split the series into two, the files > > reduction and the native PACKAGES pieces as the latter is proving quite > > unstable on the autobuilder and holding the other up. Once it does > > build cleanly and merges, we will get build time measurements which I'm > > curious about too. > > Yes, split would have been nice. I'm seeing issues after porting over > to dunfell :) They don't depend on each other so you can just pick the sysroot cleaning ones. master-next has some updated patches which are doing better too. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147391): https://lists.openembedded.org/g/openembedded-core/message/147391 Mute This Topic: https://lists.openembedded.org/mt/80162698/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/7] ncurses: Don't put terminfo into the sysroot
On Thu, Jan 28, 2021 at 09:02:39AM +, Richard Purdie wrote: > On Thu, 2021-01-28 at 08:45 +, mikko.rap...@bmw.de wrote: > > Interesting series! Do you already have some numbers how this affects > > bitbake builds? > > Not yet. I should really have split the series into two, the files > reduction and the native PACKAGES pieces as the latter is proving quite > unstable on the autobuilder and holding the other up. Once it does > build cleanly and merges, we will get build time measurements which I'm > curious about too. Yes, split would have been nice. I'm seeing issues after porting over to dunfell :) -Mikko > Cheers, > > Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147390): https://lists.openembedded.org/g/openembedded-core/message/147390 Mute This Topic: https://lists.openembedded.org/mt/80162698/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] ca-certificates: upgrade 20200601 -> 20210119
0001-certdata2pem.py-use-python3.patch removed since it is included in 20210119 Signed-off-by: Zheng Ruoqin --- .../0001-certdata2pem.py-use-python3.patch| 37 --- ...0200601.bb => ca-certificates_20210119.bb} | 3 +- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch rename meta/recipes-support/ca-certificates/{ca-certificates_20200601.bb => ca-certificates_20210119.bb} (96%) diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch b/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch deleted file mode 100644 index aa2c85ff43..00 --- a/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b6d18ca77f131cdcaa10d0eaa9d303399767edf6 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 28 Aug 2019 19:18:14 +0200 -Subject: [PATCH] certdata2pem.py: use python3 - -Comments in that file imply it is already py3 compatible. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - mozilla/Makefile| 2 +- - mozilla/certdata2pem.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mozilla/Makefile b/mozilla/Makefile -index 6f46118..f98877c 100644 a/mozilla/Makefile -+++ b/mozilla/Makefile -@@ -3,7 +3,7 @@ - # - - all: -- python certdata2pem.py -+ python3 certdata2pem.py - - clean: - -rm -f *.crt -diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py -index 0b02b2a..7d796f1 100644 a/mozilla/certdata2pem.py -+++ b/mozilla/certdata2pem.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # vim:set et sw=4: - # - # certdata2pem.py - splits certdata.txt into multiple files diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20200601.bb b/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb similarity index 96% rename from meta/recipes-support/ca-certificates/ca-certificates_20200601.bb rename to meta/recipes-support/ca-certificates/ca-certificates_20210119.bb index 6f39df7985..888a235c1a 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20200601.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb @@ -14,7 +14,7 @@ DEPENDS_class-nativesdk = "openssl-native" # Need rehash from openssl and run-parts from debianutils PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" -SRCREV = "b3a8980b781bc9a370e42714a605cd4191bb6c0b" +SRCREV = "181be7ebd169b4a6fb5d90c3e6dc791e90534144" SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ file://0002-update-ca-certificates-use-SYSROOT.patch \ @@ -23,7 +23,6 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ file://default-sysroot.patch \ file://sbindir.patch \ file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ - file://0001-certdata2pem.py-use-python3.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+)" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147389): https://lists.openembedded.org/g/openembedded-core/message/147389 Mute This Topic: https://lists.openembedded.org/mt/80180274/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] bison: upgrade 3.7.4 -> 3.7.5
Signed-off-by: Zheng Ruoqin --- meta/recipes-devtools/bison/{bison_3.7.4.bb => bison_3.7.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/bison/{bison_3.7.4.bb => bison_3.7.5.bb} (93%) diff --git a/meta/recipes-devtools/bison/bison_3.7.4.bb b/meta/recipes-devtools/bison/bison_3.7.5.bb similarity index 93% rename from meta/recipes-devtools/bison/bison_3.7.4.bb rename to meta/recipes-devtools/bison/bison_3.7.5.bb index abccaf9958..f8263f93a3 100644 --- a/meta/recipes-devtools/bison/bison_3.7.4.bb +++ b/meta/recipes-devtools/bison/bison_3.7.5.bb @@ -12,7 +12,7 @@ DEPENDS = "bison-native flex-native" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ file://add-with-bisonlocaledir.patch \ " -SRC_URI[sha256sum] = "a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010" +SRC_URI[sha256sum] = "e8c53bc5bc396d636622d0f25e31ca92fd53f00b09629f13ef540d564a6b31ab" # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147388): https://lists.openembedded.org/g/openembedded-core/message/147388 Mute This Topic: https://lists.openembedded.org/mt/80180272/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH] libsdl2: fix CVE-2020-14409 CVE-2020-14410
From: Wenlin Kang CVE-2020-14409 SDL (Simple DirectMedia Layer) through 2.0.12 has an Integer Overflow (and resultant SDL_memcpy heap corruption) in SDL_BlitCopy in video/SDL_blit_copy.c via a crafted .BMP file. CVE-2020-14410 SDL (Simple DirectMedia Layer) through 2.0.12 has a heap-based buffer over-read in Blit_3or4_to_3or4__inversed_rgb in video/SDL_blit_N.c via a crafted .BMP file. References: https://nvd.nist.gov/vuln/detail/CVE-2020-14409 https://nvd.nist.gov/vuln/detail/CVE-2020-14410 Upstream patches: https://hg.libsdl.org/SDL/rev/3f9b4e92c1d9 https://hg.libsdl.org/SDL/rev/ed0e044e308c Signed-off-by: Wenlin Kang --- .../CVE-2020-14409-CVE-2020-14410-1.patch | 84 +++ .../CVE-2020-14409-CVE-2020-14410-2.patch | 35 .../libsdl2/libsdl2_2.0.12.bb | 2 + 3 files changed, 121 insertions(+) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/CVE-2020-14409-CVE-2020-14410-1.patch create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/CVE-2020-14409-CVE-2020-14410-2.patch diff --git a/meta/recipes-graphics/libsdl2/libsdl2/CVE-2020-14409-CVE-2020-14410-1.patch b/meta/recipes-graphics/libsdl2/libsdl2/CVE-2020-14409-CVE-2020-14410-1.patch new file mode 100644 index 00..aba21581de --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2/CVE-2020-14409-CVE-2020-14410-1.patch @@ -0,0 +1,84 @@ +From 1ede8ee20669d2c103c9568f75733b376b69e2d2 Mon Sep 17 00:00:00 2001 +From: Sam Lantinga +Date: Wed, 27 Jan 2021 07:08:36 + +Subject: [PATCH 1/2] Fixed overflow in surface pitch calculation + +Upstream-Status: Backport +CVE: CVE-2020-14409,CVE-2020-14410 + +Reference to upstream patch: +https://hg.libsdl.org/SDL/rev/3f9b4e92c1d9 + +Signed-off-by: Wenlin Kang +--- + src/video/SDL_surface.c | 24 +++- + 1 file changed, 15 insertions(+), 9 deletions(-) + +diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c +index 3795b94..c8075f1 100644 +--- a/src/video/SDL_surface.c b/src/video/SDL_surface.c +@@ -27,25 +27,23 @@ + #include "SDL_pixels_c.h" + #include "SDL_yuv_c.h" + +- +-/* Check to make sure we can safely check multiplication of surface w and pitch and it won't overflow size_t */ +-SDL_COMPILE_TIME_ASSERT(surface_size_assumptions, +-sizeof(int) == sizeof(Sint32) && sizeof(size_t) >= sizeof(Sint32)); ++/* Check to make sure we can safely check multiplication of surface w and pitch and it won't overflow Sint64 */ ++SDL_COMPILE_TIME_ASSERT(surface_size_assumptions, sizeof(int) == sizeof(Sint32)); + + /* Public routines */ + + /* + * Calculate the pad-aligned scanline width of a surface + */ +-static int ++static Sint64 + SDL_CalculatePitch(Uint32 format, int width) + { +-int pitch; ++Sint64 pitch; + + if (SDL_ISPIXELFORMAT_FOURCC(format) || SDL_BITSPERPIXEL(format) >= 8) { +-pitch = (width * SDL_BYTESPERPIXEL(format)); ++pitch = ((Sint64)width * SDL_BYTESPERPIXEL(format)); + } else { +-pitch = ((width * SDL_BITSPERPIXEL(format)) + 7) / 8; ++ pitch = (((Sint64)width * SDL_BITSPERPIXEL(format)) + 7) / 8; + } + pitch = (pitch + 3) & ~3; /* 4-byte aligning for speed */ + return pitch; +@@ -59,11 +57,19 @@ SDL_Surface * + SDL_CreateRGBSurfaceWithFormat(Uint32 flags, int width, int height, int depth, +Uint32 format) + { ++Sint64 pitch; + SDL_Surface *surface; + + /* The flags are no longer used, make the compiler happy */ + (void)flags; + ++pitch = SDL_CalculatePitch(format, width); ++if (pitch < 0 || pitch > SDL_MAX_SINT32) { ++/* Overflow... */ ++SDL_OutOfMemory(); ++return NULL; ++} ++ + /* Allocate the surface */ + surface = (SDL_Surface *) SDL_calloc(1, sizeof(*surface)); + if (surface == NULL) { +@@ -78,7 +84,7 @@ SDL_CreateRGBSurfaceWithFormat(Uint32 flags, int width, int height, int depth, + } + surface->w = width; + surface->h = height; +-surface->pitch = SDL_CalculatePitch(format, width); ++surface->pitch = (int)pitch; + SDL_SetClipRect(surface, NULL); + + if (SDL_ISPIXELFORMAT_INDEXED(surface->format->format)) { +-- +2.17.1 + diff --git a/meta/recipes-graphics/libsdl2/libsdl2/CVE-2020-14409-CVE-2020-14410-2.patch b/meta/recipes-graphics/libsdl2/libsdl2/CVE-2020-14409-CVE-2020-14410-2.patch new file mode 100644 index 00..929be75457 --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2/CVE-2020-14409-CVE-2020-14410-2.patch @@ -0,0 +1,35 @@ +From 2029bd75a501623106cfd0400cffe38d22f1b005 Mon Sep 17 00:00:00 2001 +From: Sam Lantinga +Date: Wed, 27 Jan 2021 07:25:26 + +Subject: [PATCH 2/2] Reverted comment change in previous commit + +Upstream-Status: Backport +CVE: CVE-2020-14409,CVE-2020-14410 + +Reference to upstream patch: +https://hg.libsdl.org/SDL/rev/ed0e044e308c + +Signed-off-by: Wenlin Kang +--- + src/video/SDL_surface.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(
Re: [OE-core] [PATCH 1/7] ncurses: Don't put terminfo into the sysroot
On Thu, 2021-01-28 at 08:45 +, mikko.rap...@bmw.de wrote: > Interesting series! Do you already have some numbers how this affects > bitbake builds? Not yet. I should really have split the series into two, the files reduction and the native PACKAGES pieces as the latter is proving quite unstable on the autobuilder and holding the other up. Once it does build cleanly and merges, we will get build time measurements which I'm curious about too. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147386): https://lists.openembedded.org/g/openembedded-core/message/147386 Mute This Topic: https://lists.openembedded.org/mt/80162698/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/7] ncurses: Don't put terminfo into the sysroot
Hi Richard, Interesting series! Do you already have some numbers how this affects bitbake builds? Cheers, -Mikko -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147385): https://lists.openembedded.org/g/openembedded-core/message/147385 Mute This Topic: https://lists.openembedded.org/mt/80162698/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] sanity.bbclass: verify that user isn't building in PSEUDO_IGNORE_PATHS
On 01/27/2021 05:49 PM, Richard Purdie wrote: Hi, On Wed, 2021-01-27 at 17:46 +0800, ChenQi wrote: Is it possible to use an opposite way for pseudo path filtering? Instead of ignoring paths, only take into consideration paths in something like PSEUDO_CONSIDER_PATHS. The list should be short. ${D}, ${PKGD}, ${PKGDEST}, ${IMAGE_ROOTFS}? Its a good question, I was convinced by the pseudo authors that it was a bad idea. The reason being that it isn't just the above paths but we also need to catch calls where files are transiently in other directories or in other parts of the filesystem such as /tmp/. Code creates files in interesting and convoluted ways to preserve permissions, for security reasons and so on and there was a worry that masking just a specific list would cause a different set of problems. It probably shouldn't be crossing filesystem boundaries doing it but I know there were complications due to it. That said, now that pseudo can support path filtering, it may be worth an experiment to see how whether it could work better than what we're doing now. The algorithm (whether its include or exclude) should be relatively easy to test. Yes. I'm now testing the patch. I can also say the above list would need expanding as some sstate objects need to preserve ownership/permissions during creating and so on. Thanks. You are right. The current list is "${D},${PKGD},${PKGDEST},${IMAGE_ROOTFS},${SDK_OUTPUT},${STAGING_DIR}" I'm now doing more build testing to see if it needs to be expanded. Best Regards, Chen Qi It probably would still be simpler than our current ignore list though. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147384): https://lists.openembedded.org/g/openembedded-core/message/147384 Mute This Topic: https://lists.openembedded.org/mt/80117826/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-