[OE-core] systemd_create_users broken even more
When relying on useradd-staticids, this commit [1] made the problems that this [2] bug causes, much worse. Prior to that commit we could predict with surprising accuracy what the UID and GID would be for the very small number of systemd-* accounts that were created (or simply patch the expected UID/GID values in, but that never became necessary). After that commit, a bunch of system accounts and groups get created with the wrong UID and/or GID. I suppose this is an opportunity to implement BZ9789. But since this issue is so old it either means it was forgotten, or it is really hard in some non-obvious way. Is there any insight available into which it is? The solution seems pretty straight forward, so that pretty much guarantees I am missing something important. In the systemd_create_users function inherit extrausers, set the appropriate variables, call set_user_group directly, and then remove set_user_group from ROOTFS_POSTPROCESS_COMMAND. So where did I go wrong there? Also, does it make sense to return from systemd_create_users early if read-only-rootfs is *NOT* in IMAGE_FEATURES? Thank you, ..Ch:W.. P.S. I think there is also a legitimate bug in systemd_create_users. I noticed a few situations where it was trying to add a non-standard home directory to the useradd command, but it was missing the --home-dir flag, so the useradd command silently broke and did not fail the build. 1. https://git.openembedded.org/openembedded-core/commit/?id=a94e622f53c6646f1a1157f918d8aa586866 2. https://bugzilla.yoctoproject.org/show_bug.cgi?id=9789 -- *"Perfection must be reached by degrees; she requires the slow hand of time." - Voltaire* -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161387): https://lists.openembedded.org/g/openembedded-core/message/161387 Mute This Topic: https://lists.openembedded.org/mt/88922422/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][dunfell 01/20] glibc: update to lastest 2.31 release HEAD
It seems in commit message you have mentioned 2 times CVE-2022-23218
instead of CVE-2022-23218 and CVE-2022-23219.
On Fri, 4 Feb, 2022, 1:21 am Steve Sakoman, wrote:
> Includes the following fixes:
>
> 3ef8be9b89 CVE-2022-23218: Buffer overflow in sunrpc svcunix_create (bug
> 28768)
> e5c8da9826 : Support compat_symbol_reference for _ISOMAC
> 412aaf1522 sunrpc: Test case for clnt_create "unix" buffer overflow (bug
> 22542)
> c4c833d3dd CVE-2022-23219: Buffer overflow in sunrpc clnt_create for
> "unix" (bug 22542)
> 547b63bf6d socket: Add the __sockaddr_un_set function
> b061e95277 Revert "Fix __minimal_malloc segfaults in __mmap due to
> stack-protector"
> 95e206b67f Fix __minimal_malloc segfaults in __mmap due to stack-protector
> e26a2db141 gconv: Do not emit spurious NUL character in ISO-2022-JP-3 (bug
> 28524)
> 094618d401 x86_64: Remove unneeded static PIE check for undefined weak
> diagnostic
>
> Also add CVE-2022-23218 and CVE-2022-23218 to ignore list since they are
> fixed
> by the above changes.
>
> Signed-off-by: Steve Sakoman
> ---
> meta/recipes-core/glibc/glibc-version.inc | 2 +-
> meta/recipes-core/glibc/glibc_2.31.bb | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/glibc/glibc-version.inc
> b/meta/recipes-core/glibc/glibc-version.inc
> index aac0d9b3bf..68efd09ece 100644
> --- a/meta/recipes-core/glibc/glibc-version.inc
> +++ b/meta/recipes-core/glibc/glibc-version.inc
> @@ -1,6 +1,6 @@
> SRCBRANCH ?= "release/2.31/master"
> PV = "2.31+git${SRCPV}"
> -SRCREV_glibc ?= "4f0a61f75385c9a5879cbe7202042e88f692a3c8"
> +SRCREV_glibc ?= "3ef8be9b89ef98300951741f381eb79126ac029f"
> SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655"
>
> GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
> diff --git a/meta/recipes-core/glibc/glibc_2.31.bb
> b/meta/recipes-core/glibc/glibc_2.31.bb
> index 4a545cb97d..0c37467fe4 100644
> --- a/meta/recipes-core/glibc/glibc_2.31.bb
> +++ b/meta/recipes-core/glibc/glibc_2.31.bb
> @@ -3,6 +3,7 @@ require glibc-version.inc
>
> CVE_CHECK_WHITELIST += "CVE-2020-10029 CVE-2020-6096 CVE-2016-10228
> CVE-2020-1751 CVE-2020-1752 \
> CVE-2021-27645 CVE-2021-3326 CVE-2020-27618
> CVE-2020-29562 CVE-2019-25013 \
> +CVE-2022-23218 CVE-2022-23219 \
> "
>
> # glibc https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-1010022
> --
> 2.25.1
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161386):
https://lists.openembedded.org/g/openembedded-core/message/161386
Mute This Topic: https://lists.openembedded.org/mt/88891348/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] runqemu: preload uninative libraries when host gl drivers are in use
The dynamic loader will print an error about missing libraries, but will
execute the binary regardless.
Alex
On Fri, 4 Feb 2022 at 22:17, Christopher Larson wrote:
> What will this do if uninative isn't enabled?
>
> On Fri, Feb 4, 2022 at 1:40 PM Alexander Kanavin
> wrote:
>
>> Some of the host distributions build the drivers in a way (RPATH/RUNPATH)
>> that tricks uninative loader into loading pieces of the host libc, if
>> the same pieces haven't been previously loaded by native binaries. Mixing
>> the two libc versions leads to failures.
>>
>> This change ensures that the correct (uninative) versions are always in
>> use.
>>
>> Signed-off-by: Alexander Kanavin
>> ---
>> meta/classes/qemuboot.bbclass | 2 +-
>> scripts/runqemu | 4
>> 2 files changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
>> index cc1cbce69d..229bd88527 100644
>> --- a/meta/classes/qemuboot.bbclass
>> +++ b/meta/classes/qemuboot.bbclass
>> @@ -109,7 +109,7 @@ def qemuboot_vars(d):
>> build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE',
>> 'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME',
>> 'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE',
>> -'STAGING_DIR_HOST', 'SERIAL_CONSOLES']
>> +'STAGING_DIR_HOST', 'SERIAL_CONSOLES',
>> 'UNINATIVE_LOADER']
>> return build_vars + [k for k in d.keys() if k.startswith('QB_')]
>>
>> do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"
>> diff --git a/scripts/runqemu b/scripts/runqemu
>> index 4e05c1bb15..7d1f85f357 100755
>> --- a/scripts/runqemu
>> +++ b/scripts/runqemu
>> @@ -460,6 +460,10 @@ class BaseConfig(object):
>> except subprocess.CalledProcessError as e:
>> raise RunQemuError("Could not determine the path to dri
>> drivers on the host via pkg-config.\nPlease install Mesa development files
>> (particularly, dri.pc) on the host machine.")
>> os.environ['LIBGL_DRIVERS_PATH'] =
>> dripath.decode('utf-8').strip()
>> +uninative_path = os.path.dirname(self.get("UNINATIVE_LOADER"))
>> +preload_items = ['libdl.so.2', 'librt.so.1', 'libpthread.so.0']
>> +preload_paths = [os.path.join(uninative_path, i) for i in
>> preload_items]
>> +os.environ['LD_PRELOAD'] = " ".join(preload_paths)
>>
>> def check_args(self):
>> for debug in ("-d", "--debug"):
>> --
>> 2.20.1
>>
>>
>>
>>
>>
>
> --
> Christopher Larson
> kergoth at gmail dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Senior Software Engineer, Mentor Graphics
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161385):
https://lists.openembedded.org/g/openembedded-core/message/161385
Mute This Topic: https://lists.openembedded.org/mt/88916306/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] runqemu: preload uninative libraries when host gl drivers are in use
What will this do if uninative isn't enabled?
On Fri, Feb 4, 2022 at 1:40 PM Alexander Kanavin
wrote:
> Some of the host distributions build the drivers in a way (RPATH/RUNPATH)
> that tricks uninative loader into loading pieces of the host libc, if
> the same pieces haven't been previously loaded by native binaries. Mixing
> the two libc versions leads to failures.
>
> This change ensures that the correct (uninative) versions are always in
> use.
>
> Signed-off-by: Alexander Kanavin
> ---
> meta/classes/qemuboot.bbclass | 2 +-
> scripts/runqemu | 4
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
> index cc1cbce69d..229bd88527 100644
> --- a/meta/classes/qemuboot.bbclass
> +++ b/meta/classes/qemuboot.bbclass
> @@ -109,7 +109,7 @@ def qemuboot_vars(d):
> build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE',
> 'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME',
> 'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE',
> -'STAGING_DIR_HOST', 'SERIAL_CONSOLES']
> +'STAGING_DIR_HOST', 'SERIAL_CONSOLES', 'UNINATIVE_LOADER']
> return build_vars + [k for k in d.keys() if k.startswith('QB_')]
>
> do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"
> diff --git a/scripts/runqemu b/scripts/runqemu
> index 4e05c1bb15..7d1f85f357 100755
> --- a/scripts/runqemu
> +++ b/scripts/runqemu
> @@ -460,6 +460,10 @@ class BaseConfig(object):
> except subprocess.CalledProcessError as e:
> raise RunQemuError("Could not determine the path to dri
> drivers on the host via pkg-config.\nPlease install Mesa development files
> (particularly, dri.pc) on the host machine.")
> os.environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip()
> +uninative_path = os.path.dirname(self.get("UNINATIVE_LOADER"))
> +preload_items = ['libdl.so.2', 'librt.so.1', 'libpthread.so.0']
> +preload_paths = [os.path.join(uninative_path, i) for i in
> preload_items]
> +os.environ['LD_PRELOAD'] = " ".join(preload_paths)
>
> def check_args(self):
> for debug in ("-d", "--debug"):
> --
> 2.20.1
>
>
>
>
>
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161384):
https://lists.openembedded.org/g/openembedded-core/message/161384
Mute This Topic: https://lists.openembedded.org/mt/88916306/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] gcc: enable zstd compression of LTO bytecode
On Fri, Feb 4, 2022 at 11:00 AM Enrico Scholz via lists.openembedded.org wrote: > > Richard Purdie writes: > > >> | lto1: internal compiler error: original not compressed with zstd > >> > >> DEPENDS =+ "mpfr gmp libmpc zlib flex-native" > >> -NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native > >> flex-native" > >> +NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native > >> flex-native zstd-native" > >> > >> LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" > >> > > > > Should we be passing some flag to gcc explicitly to configure this > > deterministicly? > > Both '--with-zstd' and '--without-zstd' make it deterministic (require > zstd.h and abort when non-existing resp. ignore it when existing). > > Perhaps '--without-zstd' should be added in the hardknott and honister > branches to prevent pollution by host environment. > yes makes sense. > > > Enrico > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161383): https://lists.openembedded.org/g/openembedded-core/message/161383 Mute This Topic: https://lists.openembedded.org/mt/8010/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] runqemu: preload uninative libraries when host gl drivers are in use
Some of the host distributions build the drivers in a way (RPATH/RUNPATH)
that tricks uninative loader into loading pieces of the host libc, if
the same pieces haven't been previously loaded by native binaries. Mixing
the two libc versions leads to failures.
This change ensures that the correct (uninative) versions are always in use.
Signed-off-by: Alexander Kanavin
---
meta/classes/qemuboot.bbclass | 2 +-
scripts/runqemu | 4
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index cc1cbce69d..229bd88527 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -109,7 +109,7 @@ def qemuboot_vars(d):
build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE',
'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME',
'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE',
-'STAGING_DIR_HOST', 'SERIAL_CONSOLES']
+'STAGING_DIR_HOST', 'SERIAL_CONSOLES', 'UNINATIVE_LOADER']
return build_vars + [k for k in d.keys() if k.startswith('QB_')]
do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"
diff --git a/scripts/runqemu b/scripts/runqemu
index 4e05c1bb15..7d1f85f357 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -460,6 +460,10 @@ class BaseConfig(object):
except subprocess.CalledProcessError as e:
raise RunQemuError("Could not determine the path to dri drivers on
the host via pkg-config.\nPlease install Mesa development files (particularly,
dri.pc) on the host machine.")
os.environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip()
+uninative_path = os.path.dirname(self.get("UNINATIVE_LOADER"))
+preload_items = ['libdl.so.2', 'librt.so.1', 'libpthread.so.0']
+preload_paths = [os.path.join(uninative_path, i) for i in
preload_items]
+os.environ['LD_PRELOAD'] = " ".join(preload_paths)
def check_args(self):
for debug in ("-d", "--debug"):
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161382):
https://lists.openembedded.org/g/openembedded-core/message/161382
Mute This Topic: https://lists.openembedded.org/mt/88916306/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [OE-core] Inclusive Language Proposal for YP/OE
Alexander Kanavin writes: >> > Would CANCEL be clearer to you than HALT? >> >> mmmh for me as a developer (and non-native english speaker), "cancel" >> means some ordered ending of an operation. >> >> But the condition above causes an emergency abort. >> > > Cancel is the same as abort: a request to immediately stop the operation > (or not even start it) without reaching the originally requested > outcome. https://english.stackexchange.com/questions/535153/what-is-the-difference-between-cancel-and-abort | Cancel implies the action is rescinded before it implements... | | Abort is an emergency procedure to interrupt... > Halt implies the operation is not going to continue Really? https://translate.google.com/?sl=en=de=halt=translate says | a suspension of movement or activity, typically a temporary one. Examples in https://dictionary.cambridge.org/de/worterbuch/englisch/halt sound like there is a chance to continue after the "halt" (show the permit, resolve the pay dispute). When we want to continue this inclusion BS, then "halt" seems to be offending to some people because it can mean | ... having a physical disability. Enrico -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161381): https://lists.openembedded.org/g/openembedded-core/message/161381 Mute This Topic: https://lists.openembedded.org/mt/88906624/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [OE-core] Inclusive Language Proposal for YP/OE
On Fri, 4 Feb 2022 at 19:39, Enrico Scholz wrote: > > Would CANCEL be clearer to you than HALT? > > mmmh for me as a developer (and non-native english speaker), "cancel" > means some ordered ending of an operation. > > But the condition above causes an emergency abort. > Cancel is the same as abort: a request to immediately stop the operation (or not even start it) without reaching the originally requested outcome. Halt implies the operation is not going to continue (Alan Turing was as English as it gets, just to remind you). I don't think any of this is remotely confusing. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161380): https://lists.openembedded.org/g/openembedded-core/message/161380 Mute This Topic: https://lists.openembedded.org/mt/88906624/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] gcc: enable zstd compression of LTO bytecode
Richard Purdie writes: >> | lto1: internal compiler error: original not compressed with zstd >> >> DEPENDS =+ "mpfr gmp libmpc zlib flex-native" >> -NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native" >> +NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native >> zstd-native" >> >> LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" >> > > Should we be passing some flag to gcc explicitly to configure this > deterministicly? Both '--with-zstd' and '--without-zstd' make it deterministic (require zstd.h and abort when non-existing resp. ignore it when existing). Perhaps '--without-zstd' should be added in the hardknott and honister branches to prevent pollution by host environment. Enrico -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161379): https://lists.openembedded.org/g/openembedded-core/message/161379 Mute This Topic: https://lists.openembedded.org/mt/8010/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] python3-pyobject: Add patch to fix resource leak that causes mem leak & OOM
From: Geoff Parker
Memory leak and OOM in our code involving dbus was traced to a resource leak
in python3-gobject above v3.24.1 noted in these links.
https://github.com/LEW21/pydbus/issues/83
https://gitlab.gnome.org/GNOME/pygobject/-/issues/307
This patch fixed the leak for us.
This issue has existed at least 3 years. The author of this patch
opened an issue 2 years ago on the upstream pygobject gnome project and
submitted this patch a year ago. The maintainer seems unresponsive,
since the last upstream change to the affected file was on 2020-04-15.
Signed-off-by: Geoff Parker
---
...d-to-fix-the-invocation-object-leaks.patch | 40 +++
.../python/python3-pygobject_3.42.0.bb| 1 +
2 files changed, 41 insertions(+)
create mode 100644
meta/recipes-devtools/python/python3-pygobject/0002-workaround-to-fix-the-invocation-object-leaks.patch
diff --git
a/meta/recipes-devtools/python/python3-pygobject/0002-workaround-to-fix-the-invocation-object-leaks.patch
b/meta/recipes-devtools/python/python3-pygobject/0002-workaround-to-fix-the-invocation-object-leaks.patch
new file mode 100644
index 00..51832aaf55
--- /dev/null
+++
b/meta/recipes-devtools/python/python3-pygobject/0002-workaround-to-fix-the-invocation-object-leaks.patch
@@ -0,0 +1,40 @@
+From 3da1eaaa891b7dfdba57b16c079ff8c6100ebb45 Mon Sep 17 00:00:00 2001
+From: Frederic Martinsons
+Date: Fri, 15 Jan 2021 07:24:37 +0100
+Subject: [PATCH] Workaround to fix the invocation object leaks
+
+See https://gitlab.gnome.org/GNOME/pygobject/-/issues/307 for description
+
+Signed-off-by: Frederic Martinsons
+---
+ gi/pygi-object.c | 12 +++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/gi/pygi-object.c b/gi/pygi-object.c
+index 00b36c1b..5ca45975 100644
+--- a/gi/pygi-object.c
b/gi/pygi-object.c
+@@ -213,8 +213,18 @@ _pygi_marshal_cleanup_from_py_interface_object
(PyGIInvokeState *state,
+ /* If we processed the parameter but fail before invoking the method,
+we need to remove the ref we added */
+ if (was_processed && state->failed && data != NULL &&
+-arg_cache->transfer == GI_TRANSFER_EVERYTHING)
++arg_cache->transfer == GI_TRANSFER_EVERYTHING) {
+ g_object_unref (G_OBJECT(data));
++return;
++}
++
++/* BAD hack to solve
https://gitlab.gnome.org/GNOME/pygobject/-/issues/307 */
++if (was_processed && data != NULL && arg_cache->transfer ==
GI_TRANSFER_EVERYTHING) {
++GObject* obj = G_OBJECT(data);
++if (!g_strcmp0(G_OBJECT_TYPE_NAME(obj), "GDBusMethodInvocation") &&
obj->ref_count > 1) {
++g_object_unref (G_OBJECT(data));
++}
++}
+ }
+
+
+--
+2.25.1
+
+
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
index 74318337ba..7923f1ef6b 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb
@@ -17,6 +17,7 @@ SRCNAME="pygobject"
SRC_URI = " \
http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz
\
file://0001-Do-not-build-tests.patch \
+file://0002-workaround-to-fix-the-invocation-object-leaks.patch \
"
SRC_URI[sha256sum] =
"9b12616e32cfc792f9dc841d9c472a41a35b85ba67d3a6eb427e307a6fe4367b"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161378):
https://lists.openembedded.org/g/openembedded-core/message/161378
Mute This Topic: https://lists.openembedded.org/mt/88914094/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [OE-core] Inclusive Language Proposal for YP/OE
Bryan Evenson writes: >> >> > For BB_DISKMON_DIRS, the actions "ABORT, STOPTASKS and WARN" >> >> > would become "HALT, NO_NEW_TASKS and "WARN". >> >> >> >> I am not an native english speaker, but for "HALT" I will have to >> >> think twice whether it will pause the operation or abort it. I would >> >> stay at "ABORT" because it makes much more clear what happens. > > Would CANCEL be clearer to you than HALT? mmmh for me as a developer (and non-native english speaker), "cancel" means some ordered ending of an operation. But the condition above causes an emergency abort. I do not know how this can be described without using "abort" or some extensively long terms. >> >> > BB_HASHCONFIG_WHITELIST -> BB_HASHCONFIG_IGNORE_VARS >> >> > BB_SETSCENE_ENFORCE_WHITELIST -> BB_SETSCENE_ENFORCE_IGNORE_TASKS >> >> > BB_HASHBASE_WHITELIST -> BB_BASEHASH_IGNORE_VARS >> >> > MULTI_PROVIDER_WHITELIST -> BB_MULTI_PROVIDER_ALLOWED >> >> >> >> The new variable names sound like boolean flags, not like lists. > > Would BB_HASHCONFIG_IGNORELIST or BB_HASHCONFIG_ALLOWEDLIST make more > sense to you? yes; it is much better. But should it be an "IGNORELIST" or an "IGNORE*D*LIST"? Enrico [who is irritated how people and especially developer can waste their (and other developers) time in trying to change something which was completely fine before] -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161377): https://lists.openembedded.org/g/openembedded-core/message/161377 Mute This Topic: https://lists.openembedded.org/mt/88906624/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] oqea/runtime/oe_syslog: Improve test
We're seeing failures on the autobuilder where the log message isn't present in
the
log. This could just be a race in the compound command but it is hard to say due
to the poor log output from the test.
Splittng the command into two sections should add more of a delay whilst ssh
reconnects and may well fix the issues but this change should also improve
the log output in the failure case too so if the failure isn't solved, we should
be better able to debug it.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/runtime/cases/oe_syslog.py | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/oe_syslog.py
b/meta/lib/oeqa/runtime/cases/oe_syslog.py
index f3c2bedbaf9..150b70d9f03 100644
--- a/meta/lib/oeqa/runtime/cases/oe_syslog.py
+++ b/meta/lib/oeqa/runtime/cases/oe_syslog.py
@@ -121,11 +121,16 @@ class SyslogTestConfig(OERuntimeTestCase):
self.test_syslog_restart()
-cmd = 'logger foobar && grep foobar /var/log/test'
-status,output = self.target.run(cmd)
-msg = 'Test log string not found. Output: %s ' % output
+cmd = 'logger foobar'
+status, output = self.target.run(cmd)
+msg = 'Logger command failed, %s. Output: %s ' % (status, output)
self.assertEqual(status, 0, msg=msg)
+cmd = 'cat /var/log/test'
+status, output = self.target.run(cmd)
+if "foobar" not in output or status:
+self.fail("'foobar' not found in logfile, status %s, contents %s"
% (status, output))
+
cmd = "sed -i 's#LOGFILE=/var/log/test##' /etc/syslog-startup.conf"
self.target.run(cmd)
self.test_syslog_restart()
--
2.32.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161376):
https://lists.openembedded.org/g/openembedded-core/message/161376
Mute This Topic: https://lists.openembedded.org/mt/88912508/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 01/33] seatd: add recipe
fails on mips/arm64
https://errors.yoctoproject.org/Errors/Details/623915/
you might need something like
https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch
On Wed, Feb 2, 2022 at 10:28 AM Alexander Kanavin
wrote:
>
> This is needed to run weston properly as non-root in the absence
> of systemd-logind, and other compositors will likely require seatd
> as well.
>
> Signed-off-by: Alexander Kanavin
> ---
> meta/conf/distro/include/maintainers.inc | 1 +
> meta/recipes-core/seatd/seatd/init | 45
> meta/recipes-core/seatd/seatd_0.6.3.bb | 29 +++
> 3 files changed, 75 insertions(+)
> create mode 100644 meta/recipes-core/seatd/seatd/init
> create mode 100644 meta/recipes-core/seatd/seatd_0.6.3.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> index ae25287c11..cb289a0eee 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -684,6 +684,7 @@ RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned
> "
> RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton "
> RECIPE_MAINTAINER:pn-sbc = "Unassigned "
> RECIPE_MAINTAINER:pn-screen = "Anuj Mittal "
> +RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin "
> RECIPE_MAINTAINER:pn-sed = "Chen Qi "
> RECIPE_MAINTAINER:pn-serf = "Anuj Mittal "
> RECIPE_MAINTAINER:pn-setserial = "Yi Zhao "
> diff --git a/meta/recipes-core/seatd/seatd/init
> b/meta/recipes-core/seatd/seatd/init
> new file mode 100644
> index 00..0589c765ac
> --- /dev/null
> +++ b/meta/recipes-core/seatd/seatd/init
> @@ -0,0 +1,45 @@
> +#!/bin/sh
> +#
> +### BEGIN INIT INFO
> +# Provides: seatd
> +# Required-Start: $local_fs $remote_fs
> +# Required-Stop: $local_fs $remote_fs
> +# Default-Start: 2 3 4 5
> +# Default-Stop: 0 1 6
> +### END INIT INFO
> +
> +killproc() {
> +pid=`/bin/pidof $1`
> +[ "$pid" != "" ] && kill $pid
> +}
> +
> +case "$1" in
> + start)
> +seatd -g video -n 1 > /tmp/seatd-start-notify &
> +[ -s /tmp/seatd-start-notify ] && exit 0
> +sleep 0.1
> +[ -s /tmp/seatd-start-notify ] && exit 0
> +sleep 0.5
> +[ -s /tmp/seatd-start-notify ] && exit 0
> +sleep 5
> +[ -s /tmp/seatd-start-notify ] && exit 0
> +exit 1
> + ;;
> +
> + stop)
> +echo "Stopping seatd"
> +killproc seatd
> + ;;
> +
> + restart)
> + $0 stop
> +sleep 1
> +$0 start
> + ;;
> +
> + *)
> +echo "usage: $0 { start | stop | restart }"
> + ;;
> +esac
> +
> +exit 0
> diff --git a/meta/recipes-core/seatd/seatd_0.6.3.bb
> b/meta/recipes-core/seatd/seatd_0.6.3.bb
> new file mode 100644
> index 00..0e1a79dddf
> --- /dev/null
> +++ b/meta/recipes-core/seatd/seatd_0.6.3.bb
> @@ -0,0 +1,29 @@
> +SUMMARY = "A minimal seat management daemon, and a universal seat management
> library."
> +DESCRIPTION = "Seat management takes care of mediating access to shared
> devices (graphics, input), without requiring the applications needing access
> to be root."
> +HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd;
> +
> +LICENSE = "MIT"
> +
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
> +
> +SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master
> \
> + file://init"
> +SRCREV = "88db55f6068c1c01d85b61aa6adff0a6b2a8dce8"
> +S = "${WORKDIR}/git"
> +
> +inherit meson pkgconfig update-rc.d
> +
> +PACKAGECONFIG ?= "libseat-builtin"
> +
> +PACKAGECONFIG[libseat-builtin] =
> "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled"
> +
> +do_install:append() {
> +if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
> +install -Dm755 ${WORKDIR}/init
> ${D}/${sysconfdir}/init.d/seatd
> +fi
> +}
> +
> +INITSCRIPT_NAME = "seatd"
> +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> +INHIBIT_UPDATERCD_BBCLASS =
> "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '',
> d)}"
> +
> --
> 2.20.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161375):
https://lists.openembedded.org/g/openembedded-core/message/161375
Mute This Topic: https://lists.openembedded.org/mt/88865275/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 5/5] documentation: Update for skip_recipe rename
Hi Saul, On 2/4/22 18:01, Saul Wold wrote: This change better aligns the name of the variable with it's purpose. Since we removed the odler class, the associated documentation is also removed. Signed-off-by: Saul Wold --- meta/conf/documentation.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 6b50ad08a8b..9614448a1fe 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -331,7 +331,6 @@ PKGDATA_DIR[doc] = "Points to a shared, global-state directory that holds data g PKGDEST[doc] = "Points to the parent directory for files to be packaged after they have been split into individual packages." PKGDESTWORK[doc] = "Points to a temporary work area used by the do_package task to write output from the do_packagedata task." PN[doc] = "PN refers to a recipe name in the context of a file used by the OpenEmbedded build system as input to create a package. It refers to a package name in the context of a file created or produced by the OpenEmbedded build system." -PNBLACKLIST[doc] = "Lists recipes you do not want the OpenEmbedded build system to build." PR[doc] = "The revision of the recipe. The default value for this variable is 'r0'." PREFERRED_PROVIDER[doc] = "If multiple recipes provide an item, this variable determines which recipe should be given preference." PREFERRED_VERSION[doc] = "If there are multiple versions of recipes available, this variable determines which recipe should be given preference." @@ -385,6 +384,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS[doc] = "A list of recipe dependencies that shoul SIGGEN_EXCLUDERECIPES_ABISAFE[doc] = "A list of recipes that are completely stable and will never change." SITEINFO_BITS[doc] = "Specifies the number of bits for the target system CPU." SITEINFO_ENDIANNESS[doc] = "Specifies the endian byte order of the target system. The value should be either 'le' for 'little-endian' or 'be' for 'big-endian'." +SKIP_RECIPE[doc] = "Lists recipes you do not want the OpenEmbedded build system to build." Mmm with this sentence I would basically try to use it this way: SKIP_RECIPE += "libndf" instead of SKIP_RECIPE[libdnf] = "message to be printed" I think we can do better :) Maybe add something like "e.g. SKIP_RECIPE[my-recipe] = "This is the reason for skipping this recipe"" at the end of the sentence? Also, can you add some words in documentation/migration-guides/migration-3.5.rst in yocto-docs to explain this migration so we don't forget about it before the release :) ? Thanks! Cheers, Quentin SOC_FAMILY[doc] = "Groups together machines based upon the same family of SOC (System On Chip). You typically set this variable in a common .inc file that you include in the configuration files of all the machines." SOLIBS[doc] = "Defines the suffix for shared libraries used on the target platform." SOLIBSDEV[doc] = "Defines the suffix for the development symbolic link (symlink) for shared libraries on the target platform." -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161374): https://lists.openembedded.org/g/openembedded-core/message/161374 Mute This Topic: https://lists.openembedded.org/mt/88911226/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 2/5] imagefeatures: selftest: Change variable to be more descriptive
This changes a couple of variables to be more representive of
their usage.
Signed-off-by: Saul Wold
---
meta/lib/oeqa/selftest/cases/imagefeatures.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py
b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 18f37c6d7d9..d36d45c5516 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -198,8 +198,8 @@ class ImageFeatures(OESelftestTestCase):
image_name = 'core-image-minimal'
all_image_types = set(get_bb_var("IMAGE_TYPES", image_name).split())
-blacklist = set(('container', 'elf', 'f2fs', 'multiubi', 'tar.zst',
'wic.zst'))
-img_types = all_image_types - blacklist
+skip_image_types = set(('container', 'elf', 'f2fs', 'multiubi',
'tar.zst', 'wic.zst'))
+img_types = all_image_types - skip_image_types
config = 'IMAGE_FSTYPES += "%s"\n'\
'MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 2047"\n'\
@@ -245,8 +245,8 @@ VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock"
VIRTUAL-RUNTIME_base-utils-syslog = ""
-# Blacklist busybox
-PNBLACKLIST[busybox] = "Don't build this"
+# Skip busybox
+SKIP_RECIPE[busybox] = "Don't build this"
"""
self.write_config(config)
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161372):
https://lists.openembedded.org/g/openembedded-core/message/161372
Mute This Topic: https://lists.openembedded.org/mt/88911228/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 0/5] Use more descriptive variable for skipping recipes
This patchset in conjuction with a meta-yocto and documentation patch change the varFlag for skipping a recipe to be SKIP_RECIPE. This removes the need to have to explicitly use the class by moving the code to base.bbclass. Tested with the Autobuilder (a-quick) and by using the PNBLACKLIST variable. Sau! Saul Wold (5): skip_recipe: remove old class and rename VarFlag to SKIP_RECIPE imagefeatures: selftest: Change variable to be more descriptive multilib: Use renamed SKIP_RECIPE varFlag dnf: Use renamed SKIP_RECIPE varFlag documentation: Update for skip_recipe rename meta/classes/base.bbclass | 10 ++ meta/classes/blacklist.bbclass| 20 --- meta/classes/multilib.bbclass | 8 meta/conf/distro/defaultsetup.conf| 3 +-- meta/conf/documentation.conf | 2 +- meta/lib/oeqa/selftest/cases/imagefeatures.py | 8 meta/recipes-devtools/dnf/dnf_4.10.0.bb | 2 +- meta/recipes-devtools/libdnf/libdnf_0.65.0.bb | 2 +- 8 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 meta/classes/blacklist.bbclass -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161373): https://lists.openembedded.org/g/openembedded-core/message/161373 Mute This Topic: https://lists.openembedded.org/mt/88911229/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 1/5] skip_recipe: remove old class and rename VarFlag to SKIP_RECIPE
This change better describes what the VarFlag is doing since it
is implemeted with the SkipRecipe() function.
By moving this into base.bbclass we simplify the distro inherit.
Signed-off-by: Saul Wold
---
meta/classes/base.bbclass | 10 ++
meta/classes/blacklist.bbclass | 20
meta/conf/distro/defaultsetup.conf | 3 +--
3 files changed, 11 insertions(+), 22 deletions(-)
delete mode 100644 meta/classes/blacklist.bbclass
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 5f4956a1d31..854d14d8a51 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -438,6 +438,16 @@ python () {
if os.path.normpath(d.getVar("WORKDIR")) !=
os.path.normpath(d.getVar("B")):
d.appendVar("PSEUDO_IGNORE_PATHS", ",${B}")
+# To add a recipe to the skip list , set:
+# SKIP_RECIPE[pn] = "message"
+pn = d.getVar('PN')
+if d.getVarFlag('PNBLACKLIST', pn) is not None:
+bb.error("PNBLACKLIST is deprecated, please convert to
SKIP_RECIPE[%s]" % (pn))
+skip_msg = d.getVarFlag('SKIP_RECIPE', pn)
+if skip_msg:
+bb.debug(1, "Skipping %s %s" % (pn, skip_msg))
+raise bb.parse.SkipRecipe("Recipe will be skipped because: %s" %
(skip_msg))
+
# Handle PACKAGECONFIG
#
# These take the form:
diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass
deleted file mode 100644
index dc794228ffe..000
--- a/meta/classes/blacklist.bbclass
+++ /dev/null
@@ -1,20 +0,0 @@
-# anonymous support class from originally from angstrom
-#
-# To use the blacklist, a distribution should include this
-# class in the INHERIT_DISTRO
-#
-# No longer use ANGSTROM_BLACKLIST, instead use a table of
-# recipes in PNBLACKLIST
-#
-# Features:
-#
-# * To add a package to the blacklist, set:
-# PNBLACKLIST[pn] = "message"
-#
-
-python () {
-blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN'))
-
-if blacklist:
-raise bb.parse.SkipRecipe("Recipe is blacklisted: %s" % (blacklist))
-}
diff --git a/meta/conf/distro/defaultsetup.conf
b/meta/conf/distro/defaultsetup.conf
index b36a4e5..f6894f3ab56 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -14,9 +14,8 @@ TMPDIR .= "${TCLIBCAPPEND}"
USER_CLASSES ?= ""
PACKAGE_CLASSES ?= "package_ipk"
-INHERIT_BLACKLIST = "blacklist"
INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool"
-INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO}
${INHERIT_BLACKLIST}"
+INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO}"
INIT_MANAGER ??= "none"
require conf/distro/include/init-manager-${INIT_MANAGER}.inc
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161371):
https://lists.openembedded.org/g/openembedded-core/message/161371
Mute This Topic: https://lists.openembedded.org/mt/88911227/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 5/5] documentation: Update for skip_recipe rename
This change better aligns the name of the variable with it's purpose. Since we removed the odler class, the associated documentation is also removed. Signed-off-by: Saul Wold --- meta/conf/documentation.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 6b50ad08a8b..9614448a1fe 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -331,7 +331,6 @@ PKGDATA_DIR[doc] = "Points to a shared, global-state directory that holds data g PKGDEST[doc] = "Points to the parent directory for files to be packaged after they have been split into individual packages." PKGDESTWORK[doc] = "Points to a temporary work area used by the do_package task to write output from the do_packagedata task." PN[doc] = "PN refers to a recipe name in the context of a file used by the OpenEmbedded build system as input to create a package. It refers to a package name in the context of a file created or produced by the OpenEmbedded build system." -PNBLACKLIST[doc] = "Lists recipes you do not want the OpenEmbedded build system to build." PR[doc] = "The revision of the recipe. The default value for this variable is 'r0'." PREFERRED_PROVIDER[doc] = "If multiple recipes provide an item, this variable determines which recipe should be given preference." PREFERRED_VERSION[doc] = "If there are multiple versions of recipes available, this variable determines which recipe should be given preference." @@ -385,6 +384,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS[doc] = "A list of recipe dependencies that shoul SIGGEN_EXCLUDERECIPES_ABISAFE[doc] = "A list of recipes that are completely stable and will never change." SITEINFO_BITS[doc] = "Specifies the number of bits for the target system CPU." SITEINFO_ENDIANNESS[doc] = "Specifies the endian byte order of the target system. The value should be either 'le' for 'little-endian' or 'be' for 'big-endian'." +SKIP_RECIPE[doc] = "Lists recipes you do not want the OpenEmbedded build system to build." SOC_FAMILY[doc] = "Groups together machines based upon the same family of SOC (System On Chip). You typically set this variable in a common .inc file that you include in the configuration files of all the machines." SOLIBS[doc] = "Defines the suffix for shared libraries used on the target platform." SOLIBSDEV[doc] = "Defines the suffix for the development symbolic link (symlink) for shared libraries on the target platform." -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161370): https://lists.openembedded.org/g/openembedded-core/message/161370 Mute This Topic: https://lists.openembedded.org/mt/88911226/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 4/5] dnf: Use renamed SKIP_RECIPE varFlag
This is a more descriptive variable name updated in base.bbclass
Signed-off-by: Saul Wold
---
meta/recipes-devtools/dnf/dnf_4.10.0.bb | 2 +-
meta/recipes-devtools/libdnf/libdnf_0.65.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/dnf/dnf_4.10.0.bb
b/meta/recipes-devtools/dnf/dnf_4.10.0.bb
index 3fc24b132df..3f22c1d8f2e 100644
--- a/meta/recipes-devtools/dnf/dnf_4.10.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.10.0.bb
@@ -87,4 +87,4 @@ SYSTEMD_SERVICE:${PN} = "dnf-makecache.service
dnf-makecache.timer \
"
SYSTEMD_AUTO_ENABLE ?= "disable"
-PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm',
'', 'does not build without package_rpm in PACKAGE_CLASSES due disabled rpm
support in libsolv', d)}"
+SKIP_RECIPE[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm',
'', 'does not build without package_rpm in PACKAGE_CLASSES due disabled rpm
support in libsolv', d)}"
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb
b/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb
index 81da04c9ca1..092ad98d4b7 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb
@@ -34,5 +34,5 @@ EXTRA_OECMAKE:append:class-native = " -DWITH_GIR=OFF"
EXTRA_OECMAKE:append:class-nativesdk = " -DWITH_GIR=OFF"
BBCLASSEXTEND = "native nativesdk"
-PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm',
'', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm
support in libsolv', d)}"
+SKIP_RECIPE[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm',
'', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm
support in libsolv', d)}"
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161368):
https://lists.openembedded.org/g/openembedded-core/message/161368
Mute This Topic: https://lists.openembedded.org/mt/88911221/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 3/5] multilib: Use renamed SKIP_RECIPE varFlag
This is a more descriptive variable name updated in base.bbclass
Signed-off-by: Saul Wold
---
meta/classes/multilib.bbclass | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 4a3e582816d..ec2013198ce 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -65,11 +65,11 @@ python multilib_virtclass_handler () {
override = ":virtclass-multilib-" + variant
-blacklist = e.data.getVarFlag('PNBLACKLIST', e.data.getVar('PN'))
-if blacklist:
+skip_msg = e.data.getVarFlag('SKIP_RECIPE', e.data.getVar('PN'))
+if skip_msg:
pn_new = variant + "-" + e.data.getVar('PN')
-if not e.data.getVarFlag('PNBLACKLIST', pn_new):
-e.data.setVarFlag('PNBLACKLIST', pn_new, blacklist)
+if not e.data.getVarFlag('SKIP_RECIPE', pn_new):
+e.data.setVarFlag('SKIP_RECIPE', pn_new, skip_msg)
e.data.setVar("MLPREFIX", variant + "-")
e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161369):
https://lists.openembedded.org/g/openembedded-core/message/161369
Mute This Topic: https://lists.openembedded.org/mt/88911225/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [OE-core] Inclusive Language Proposal for YP/OE
Enrico, > -Original Message- > From: openembedded-core@lists.openembedded.org c...@lists.openembedded.org> On Behalf Of Enrico Scholz via > lists.openembedded.org > Sent: Friday, February 4, 2022 9:16 AM > To: Alexander Kanavin > Cc: Jon Mason ; Yocto-mailing-list > ; Patches and discussions about the oe-core > layer ; OpenEmbedded > Devel List > Subject: Re: [oe] [OE-core] Inclusive Language Proposal for YP/OE > > Alexander Kanavin writes: > > >> > For BB_DISKMON_DIRS, the actions "ABORT, STOPTASKS and WARN" > would > >> > become "HALT, NO_NEW_TASKS and "WARN". > >> > >> I am not an native english speaker, but for "HALT" I will have to > >> think twice whether it will pause the operation or abort it. I would > >> stay at "ABORT" because it makes much more clear what happens. > > > > I'm not taking a stand here, but just providing the context for where > > the push for avoidance of 'abort' comes from: > > https://inclusivenaming.org/word-lists/tier-1/ > > > > Keep in mind that for non-native english speakers none of these words > > are emotionally charged; they're just terms. > > Yes; these are terms. But it should be possible to understand the meaning of > these terms without using a special "inclusivenaming" > dictionary. Else, we could just use "A", "B" and "C" for the actions above > and > explain these "terms" in some documentation later. > Would CANCEL be clearer to you than HALT? > > >> > BB_HASHCONFIG_WHITELIST -> BB_HASHCONFIG_IGNORE_VARS > >> > BB_SETSCENE_ENFORCE_WHITELIST -> > BB_SETSCENE_ENFORCE_IGNORE_TASKS > >> > BB_HASHBASE_WHITELIST -> BB_BASEHASH_IGNORE_VARS > >> > MULTI_PROVIDER_WHITELIST -> BB_MULTI_PROVIDER_ALLOWED > >> > >> The new variable names sound like boolean flags, not like lists. > > > > I'd say the context should make it clear that they are lists > > It is bad when a context is required to understand the meaning of a variable. > > And where do you see a context when local.conf contains > > | BB_HASHCONFIG_IGNORE_VARS = "true" Would BB_HASHCONFIG_IGNORELIST or BB_HASHCONFIG_ALLOWEDLIST make more sense to you? Bryan > > > > Enrico -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161367): https://lists.openembedded.org/g/openembedded-core/message/161367 Mute This Topic: https://lists.openembedded.org/mt/88906624/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] recipetool/create: Scan for SDPX-License-Identifier
Am 04.02.2022 um 14:41 schrieb Richard Purdie:
On Fri, 2022-02-04 at 10:05 +0100, Stefan Herbrechtsmeier wrote:
Am 03.02.2022 um 22:24 schrieb Richard Purdie via lists.openembedded.org:
On Thu, 2022-02-03 at 09:07 -0800, Saul Wold wrote:
When a file can not be identified by checksum and they contain an SPDX
License-Identifier tag, use it as the found license.
[YOCTO #14529]
Tested with LICENSE files that contain 1 or more SPDX-License-Identifier tags
Signed-off-by: Saul Wold
---
scripts/lib/recipetool/create.py | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 507a230511..9149c2d94f 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -1221,14 +1221,20 @@ def guess_license(srctree, d):
for licfile in sorted(licfiles):
md5value = bb.utils.md5_file(licfile)
license = md5sums.get(md5value, None)
+license_list = []
if not license:
license, crunched_md5, lictext = crunch_license(licfile)
if lictext and not license:
-license = 'Unknown'
-logger.info("Please add the following line for '%s' to a
'lib/recipetool/licenses.csv' " \
-"and replace `Unknown` with the license:\n" \
-"%s,Unknown" % (os.path.relpath(licfile, srctree),
md5value))
-if license:
+spdx_re = re.compile('SPDX-License-Identifier:\s+([-A-Za-z\d.
]+)[ |\n|\r\n]*?')
+license_list = re.findall(spdx_re, "\n".join(lictext))
+if not license_list:
+license_list.append('Unknown')
+logger.info("Please add the following line for '%s' to a
'lib/recipetool/licenses.csv' " \
+"and replace `Unknown` with the license:\n" \
+"%s,Unknown" % (os.path.relpath(licfile, srctree),
md5value))
+else:
+license_list.append(license)
+for license in license_list:
licenses.append((license, os.path.relpath(licfile, srctree),
md5value))
# FIXME should we grab at least one source file with a license header and add that too?
I think to close this bug the code may need to go one step further and
effectively grep over the source tree.
Please keep in mind that we need a full license text and not only the
license name for license compliance. The current function only search
for license files with license text.
We'd probably want to list the value of any SPDX-License-Identifier: header
found in any of the source files for the user to then decide upon?
I think this is an other feature like a license checker because if you
have a SPDX-License-Identifier without a license text you have a license
violation.
This brings us to the problem that this code will interpret a file with
only a SPDX-License-Identifier as a license file with license text.
As I understand it the tool is there to help write a recipe so filling out
LICENSE and highlighting a missing full license text would be a valid approach
for the tool and helpful to the user?
Yes, but we should distinguish between license files which are guess via
hash of the content and SPDX-License-Identifier which labels the source
code’s license. In this case the SPDX-License-Identifier is non-material
text from a license file and should be filtered out inside
crunch_license function.
The collection of all used licenses via SPDX-License-Identifier is an
additional feature and we need a warning if a SPDX-License-Identifier
exists without license file.
It certainly isn't intended as full validation, just intended to assist the
creation of a recipe.
But this patch is an regress because it doesn't distinguish between a
license file with a known hash and a mostly empty file with a
SPDX-License-Identifier.
Regards
Stefan
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161366):
https://lists.openembedded.org/g/openembedded-core/message/161366
Mute This Topic: https://lists.openembedded.org/mt/7504/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [OE-core] Inclusive Language Proposal for YP/OE
Alexander Kanavin writes: >> > For BB_DISKMON_DIRS, the actions "ABORT, STOPTASKS and WARN" would >> > become "HALT, NO_NEW_TASKS and "WARN". >> >> I am not an native english speaker, but for "HALT" I will have to >> think twice whether it will pause the operation or abort it. I would >> stay at "ABORT" because it makes much more clear what happens. > > I'm not taking a stand here, but just providing the context for where > the push for avoidance of 'abort' comes from: > https://inclusivenaming.org/word-lists/tier-1/ > > Keep in mind that for non-native english speakers none of these words > are emotionally charged; they're just terms. Yes; these are terms. But it should be possible to understand the meaning of these terms without using a special "inclusivenaming" dictionary. Else, we could just use "A", "B" and "C" for the actions above and explain these "terms" in some documentation later. >> > BB_HASHCONFIG_WHITELIST -> BB_HASHCONFIG_IGNORE_VARS >> > BB_SETSCENE_ENFORCE_WHITELIST -> BB_SETSCENE_ENFORCE_IGNORE_TASKS >> > BB_HASHBASE_WHITELIST -> BB_BASEHASH_IGNORE_VARS >> > MULTI_PROVIDER_WHITELIST -> BB_MULTI_PROVIDER_ALLOWED >> >> The new variable names sound like boolean flags, not like lists. > > I'd say the context should make it clear that they are lists It is bad when a context is required to understand the meaning of a variable. And where do you see a context when local.conf contains | BB_HASHCONFIG_IGNORE_VARS = "true" Enrico -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161365): https://lists.openembedded.org/g/openembedded-core/message/161365 Mute This Topic: https://lists.openembedded.org/mt/88906624/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 17/17] libxml2: Backport python3-lxml workaround patch
From: Carlos Rafael Giani
This is a workaround for the following issue that affects python3-lxml:
https://gitlab.gnome.org/GNOME/libxml2/-/issues/255
Signed-off-by: Carlos Rafael Giani
Signed-off-by: Richard Purdie
(cherry picked from commit 2f52be7c42ea37243f9aea1898ef7052904f9290)
Signed-off-by: Anuj Mittal
---
.../0002-Work-around-lxml-API-abuse.patch | 213 ++
meta/recipes-core/libxml/libxml2_2.9.12.bb| 1 +
2 files changed, 214 insertions(+)
create mode 100644
meta/recipes-core/libxml/libxml2/0002-Work-around-lxml-API-abuse.patch
diff --git
a/meta/recipes-core/libxml/libxml2/0002-Work-around-lxml-API-abuse.patch
b/meta/recipes-core/libxml/libxml2/0002-Work-around-lxml-API-abuse.patch
new file mode 100644
index 00..f09ce9707a
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/0002-Work-around-lxml-API-abuse.patch
@@ -0,0 +1,213 @@
+From 85b1792e37b131e7a51af98a37f92472e8de5f3f Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer
+Date: Tue, 18 May 2021 20:08:28 +0200
+Subject: [PATCH] Work around lxml API abuse
+
+Make xmlNodeDumpOutput and htmlNodeDumpFormatOutput work with corrupted
+parent pointers. This used to work with the old recursive code but the
+non-recursive rewrite required parent pointers to be set correctly.
+
+Unfortunately, lxml relies on the old behavior and passes subtrees with
+a corrupted structure. Fall back to a recursive function call if an
+invalid parent pointer is detected.
+
+Fixes #255.
+
+Upstream-Status: Backport [85b1792e37b131e7a51af98a37f92472e8de5f3f]
+---
+ HTMLtree.c | 46 --
+ xmlsave.c | 31 +--
+ 2 files changed, 49 insertions(+), 28 deletions(-)
+
+diff --git a/HTMLtree.c b/HTMLtree.c
+index 24434d45..bdd639c7 100644
+--- a/HTMLtree.c
b/HTMLtree.c
+@@ -744,7 +744,7 @@ void
+ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
+xmlNodePtr cur, const char *encoding ATTRIBUTE_UNUSED,
+ int format) {
+-xmlNodePtr root;
++xmlNodePtr root, parent;
+ xmlAttrPtr attr;
+ const htmlElemDesc * info;
+
+@@ -755,6 +755,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr
doc,
+ }
+
+ root = cur;
++parent = cur->parent;
+ while (1) {
+ switch (cur->type) {
+ case XML_HTML_DOCUMENT_NODE:
+@@ -762,13 +763,25 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf,
xmlDocPtr doc,
+ if (((xmlDocPtr) cur)->intSubset != NULL) {
+ htmlDtdDumpOutput(buf, (xmlDocPtr) cur, NULL);
+ }
+-if (cur->children != NULL) {
++/* Always validate cur->parent when descending. */
++if ((cur->parent == parent) && (cur->children != NULL)) {
++parent = cur;
+ cur = cur->children;
+ continue;
+ }
+ break;
+
+ case XML_ELEMENT_NODE:
++/*
++ * Some users like lxml are known to pass nodes with a corrupted
++ * tree structure. Fall back to a recursive call to handle this
++ * case.
++ */
++if ((cur->parent != parent) && (cur->children != NULL)) {
++htmlNodeDumpFormatOutput(buf, doc, cur, encoding, format);
++break;
++}
++
+ /*
+ * Get specific HTML info for that node.
+ */
+@@ -817,6 +830,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr
doc,
+ (cur->name != NULL) &&
+ (cur->name[0] != 'p')) /* p, pre, param */
+ xmlOutputBufferWriteString(buf, "\n");
++parent = cur;
+ cur = cur->children;
+ continue;
+ }
+@@ -825,9 +839,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr
doc,
+ (info != NULL) && (!info->isinline)) {
+ if ((cur->next->type != HTML_TEXT_NODE) &&
+ (cur->next->type != HTML_ENTITY_REF_NODE) &&
+-(cur->parent != NULL) &&
+-(cur->parent->name != NULL) &&
+-(cur->parent->name[0] != 'p')) /* p, pre, param */
++(parent != NULL) &&
++(parent->name != NULL) &&
++(parent->name[0] != 'p')) /* p, pre, param */
+ xmlOutputBufferWriteString(buf, "\n");
+ }
+
+@@ -842,9 +856,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr
doc,
+ break;
+ if (((cur->name == (const xmlChar *)xmlStringText) ||
+ (cur->name != (const xmlChar *)xmlStringTextNoenc)) &&
+-((cur->parent == NULL) ||
+- ((xmlStrcasecmp(cur->parent->name, BAD_CAST "script")) &&
+- (xmlStrcasecmp(cur->parent->name, BAD_CAST "style") {
++
[OE-core] [honister][PATCH 16/17] core-image-sato-sdk: allocate more memory when in qemu
From: Ross Burton Compiling code is memory-intensive, especially kernel modules like the SystemTap probes, so give the VM 768MB of RAM. Using 1GB appears to cause PCI error, interestingly. Hopefully this solves the intermittent failures caused by OOMs during the SystemTap test. [ YOCTO #14673 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 50ff1f018a670c963e1979dee76ebd696153b4c1) Signed-off-by: Anuj Mittal --- meta/recipes-sato/images/core-image-sato-sdk.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb index b52de0def0..afab473b52 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -10,3 +10,6 @@ IMAGE_FEATURES += "dev-pkgs tools-sdk \ IMAGE_INSTALL += "kernel-devsrc" +# Compiling stuff, specifically SystemTap probes, can require lots of memory +# See https://bugzilla.yoctoproject.org/show_bug.cgi?id=14673 +QB_MEM = "-m 768" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161363): https://lists.openembedded.org/g/openembedded-core/message/161363 Mute This Topic: https://lists.openembedded.org/mt/88906986/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 15/17] vim: upgrade to patch 4269
From: Ross Burton Upgrade to the latest patch release to fix the following CVEs: - CVE-2022-0261 - CVE-2022-0318 - CVE-2022-0319 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 96442e681c3acd82b09e3becd78e902709945f1f) Signed-off-by: Anuj Mittal --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index d68fade26a..6c70bb7529 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".4118" -SRCREV = "0023f82a76cf43a12b41e71f97a2e860d0444e1b" +PV .= ".4269" +SRCREV = "48a604845e33399893d6bf293e71bcd2a412800d" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161362): https://lists.openembedded.org/g/openembedded-core/message/161362 Mute This Topic: https://lists.openembedded.org/mt/88906984/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 14/17] expat: upgrade to 2.4.4
From: Ross Burton
Fixes CVE-2022-23852 and CVE-2022-23990.
Signed-off-by: Ross Burton
Signed-off-by: Richard Purdie
(cherry picked from commit 4ed96683893e7433804ccf7a4000a2dd18318ef5)
Signed-off-by: Anuj Mittal
---
meta/recipes-core/expat/{expat_2.4.3.bb => expat_2.4.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/expat/{expat_2.4.3.bb => expat_2.4.4.bb} (91%)
diff --git a/meta/recipes-core/expat/expat_2.4.3.bb
b/meta/recipes-core/expat/expat_2.4.4.bb
similarity index 91%
rename from meta/recipes-core/expat/expat_2.4.3.bb
rename to meta/recipes-core/expat/expat_2.4.4.bb
index 088ce81500..63d291ed40 100644
--- a/meta/recipes-core/expat/expat_2.4.3.bb
+++ b/meta/recipes-core/expat/expat_2.4.4.bb
@@ -15,7 +15,7 @@ SRC_URI =
"https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TA
UPSTREAM_CHECK_URI = "https://github.com/libexpat/libexpat/releases/;
-SRC_URI[sha256sum] =
"6f262e216a494fbf42d8c22bc841b3e117c21f2467a19dc4c27c991b5622f986"
+SRC_URI[sha256sum] =
"14c58c2a0b5b8b31836514dfab41bd191836db7aa7b84ae5c47bc0327a20d64a"
EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161361):
https://lists.openembedded.org/g/openembedded-core/message/161361
Mute This Topic: https://lists.openembedded.org/mt/88906982/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 13/17] libusb1: correct SRC_URI
From: Alexander Kanavin
Signed-off-by: Alexander Kanavin
Signed-off-by: Richard Purdie
(cherry picked from commit d4c37ca1f1e97d53045521e9894dc9ed5b1c22a1)
Signed-off-by: Anuj Mittal
---
meta/recipes-support/libusb/libusb1_1.0.24.bb | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/libusb/libusb1_1.0.24.bb
b/meta/recipes-support/libusb/libusb1_1.0.24.bb
index 95a20958a1..e70021f4f7 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.24.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.24.bb
@@ -1,7 +1,7 @@
SUMMARY = "Userspace library to access USB (version 1.0)"
DESCRIPTION = "A cross-platform library to access USB devices from Linux, \
macOS, Windows, OpenBSD/NetBSD, Haiku and Solaris userspace."
-HOMEPAGE = "http://libusb.sf.net;
+HOMEPAGE = "https://libusb.info;
BUGTRACKER = "http://www.libusb.org/report;
SECTION = "libs"
@@ -10,10 +10,12 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=fbc093901857fcd118f065f900982c24"
BBCLASSEXTEND = "native nativesdk"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
+SRC_URI =
"https://github.com/libusb/libusb/releases/download/v${PV}/libusb-${PV}.tar.bz2
\
file://run-ptest \
"
+UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb/releases;
+
SRC_URI[sha256sum] =
"7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a"
S = "${WORKDIR}/libusb-${PV}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161360):
https://lists.openembedded.org/g/openembedded-core/message/161360
Mute This Topic: https://lists.openembedded.org/mt/88906981/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 12/17] yocto-check-layer: add debug output for the layers that were found
From: Ross Burton
When debugging weird yocto-check-layer output it is useful to know
what the tool found when looking for layers.
Signed-off-by: Ross Burton
Signed-off-by: Richard Purdie
(cherry picked from commit 711e2d4d7baf36f8497741c14268d7f72d0db016)
Signed-off-by: Anuj Mittal
---
scripts/yocto-check-layer | 13 +
1 file changed, 13 insertions(+)
diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer
index 2445ad5e43..f3cf139d8a 100755
--- a/scripts/yocto-check-layer
+++ b/scripts/yocto-check-layer
@@ -41,6 +41,12 @@ def test_layer(td, layer, test_software_layer_signatures):
tc.loadTests(CASES_PATHS)
return tc.runTests()
+def dump_layer_debug(layer):
+logger.debug("Found layer %s (%s)" % (layer["name"], layer["path"]))
+collections = layer.get("collections", {})
+if collections:
+logger.debug("%s collections: %s" % (layer["name"], ",
".join(collections)))
+
def main():
parser = argparse.ArgumentParser(
description="Yocto Project layer checking tool",
@@ -106,6 +112,13 @@ def main():
else:
dep_layers = layers
+logger.debug("Found additional layers:")
+for l in additional_layers:
+dump_layer_debug(l)
+logger.debug("Found dependency layers:")
+for l in dep_layers:
+dump_layer_debug(l)
+
logger.info("Detected layers:")
for layer in layers:
if layer['type'] == LayerType.ERROR_BSP_DISTRO:
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161359):
https://lists.openembedded.org/g/openembedded-core/message/161359
Mute This Topic: https://lists.openembedded.org/mt/88906980/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 10/17] linux-yocto/5.10: update to v5.10.93
From: Bruce Ashfield
Updating linux-yocto/5.10 to the latest korg -stable release that comprises
the following commits:
fd187a492557 Linux 5.10.93
bed97c903621 mtd: fixup CFI on ixp4xx
f50803b519c3 powerpc/pseries: Get entry and uaccess flush required bits
from H_GET_CPU_CHARACTERISTICS
68c1aa82be00 ALSA: hda/realtek: Re-order quirk entries for Lenovo
4d15a17d065d ALSA: hda/realtek: Add quirk for Legion Y9000X 2020
d7b41464f1b7 ALSA: hda: ALC287: Add Lenovo IdeaPad Slim 9i 14ITL5 speaker
quirk
87246ae94b73 ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus
Master after reboot from Windows
9c27e513fb33 ALSA: hda/realtek: Add speaker fixup for some Yoga 15ITL5
devices
4c7fb4d519e5 KVM: x86: remove PMU FIXED_CTR3 from msrs_to_save_all
6b8c3a185377 firmware: qemu_fw_cfg: fix kobject leak in probe error path
889c73305b48 firmware: qemu_fw_cfg: fix NULL-pointer deref on duplicate
entries
ff9588cf1592 firmware: qemu_fw_cfg: fix sysfs information leak
358a4b054abe rtlwifi: rtl8192cu: Fix WARNING when calling
local_irq_restore() with interrupts enabled
93c4506f9f8b media: uvcvideo: fix division by zero at stream start
4c3f70be6f3a video: vga16fb: Only probe for EGA and VGA 16 color graphic
cards
161e43ab8cc1 9p: only copy valid iattrs in 9P2000.L setattr implementation
0e6c0f3f4055 KVM: s390: Clarify SIGP orders versus STOP/RESTART
413b427f5fff KVM: x86: Register Processor Trace interrupt hook iff PT
enabled in guest
723acd75a062 perf: Protect perf_guest_cbs with RCU
eadde287a62e vfs: fs_context: fix up param length parsing in
legacy_parse_param
c5f38277163e remoteproc: qcom: pil_info: Don't memcpy_toio more than is
provided
5d88e24b23af orangefs: Fix the size of a memory allocation in
orangefs_bufmap_alloc()
0084fefe2960 devtmpfs regression fix: reconfigure on each mount
ee40594c95ae kbuild: Add $(KBUILD_HOSTLDFLAGS) to 'has_libelf' test
Signed-off-by: Bruce Ashfield
Signed-off-by: Richard Purdie
(cherry picked from commit 4f3dd05c163efe6da87a58ab9e1df61b83ed)
Signed-off-by: Anuj Mittal
---
.../linux/linux-yocto-rt_5.10.bb | 6 ++---
.../linux/linux-yocto-tiny_5.10.bb| 8 +++
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +--
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 695356c482..a8e8e604a3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to
linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "73ddd15bb13083c63f183814223b1f064f707964"
-SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83"
+SRCREV_machine ?= "ba47a407fe04203adb0ab5e164597c958cd9e334"
+SRCREV_meta ?= "7df27e6d296dfa16f289883c0661eed45059360c"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.10.92"
+LINUX_VERSION ?= "5.10.93"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index e4b389367b..32e42cbda4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.10.92"
+LINUX_VERSION ?= "5.10.93"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine:qemuarm ?= "05c74d1b7b9b5ce5b386e2dbb787f1b00bbfdcb8"
-SRCREV_machine ?= "3c4b46871c0220942e07fc2c73ba94ac04b0d9ca"
-SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83"
+SRCREV_machine:qemuarm ?= "ceb1f194e59c9dd3bdd83d51bb0994f3db23bf61"
+SRCREV_machine ?= "878e5c1469550bb0f8778d16d4adbe7d48b0b28d"
+SRCREV_meta ?= "7df27e6d296dfa16f289883c0661eed45059360c"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 412a872e62..3a0a43bc0b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.10/standard/base"
KBRANCH:qemux86-64 ?= "v5.10/standard/base"
KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "1e8e1a5927984c545448b4b15974addf670b0f5d"
[OE-core] [honister][PATCH 11/17] linux-firmware: Add CLM blob to linux-firmware-bcm4373 package
From: Rudolf J Streif
The Country Local Matrix (CLM) blob brcmfmac4373-sdio.clm_blob was not
included with the files for the linux-firmware-bcm4373 package
but instead packaged with linux-firmware.
Signed-off-by: Rudolf J Streif
Signed-off-by: Richard Purdie
(cherry picked from commit 18ba64d4a12e7275381cf34fe72b757accbb1544)
Signed-off-by: Anuj Mittal
---
meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb
index 65bfda1d9f..5f1b696092 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb
@@ -751,6 +751,7 @@ FILES:${PN}-bcm4356-pcie =
"${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pc
FILES:${PN}-bcm4373 =
"${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \
${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \
${nonarch_base_libdir}/firmware/cypress/cyfmac4373-sdio.bin \
+ ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.clm_blob \
"
LICENSE:${PN}-bcm-0bb4-0306 = "Firmware-cypress"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161358):
https://lists.openembedded.org/g/openembedded-core/message/161358
Mute This Topic: https://lists.openembedded.org/mt/88906979/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 09/17] linux-yocto/5.10: update to v5.10.92
From: Bruce Ashfield
Updating linux-yocto/5.10 to the latest korg -stable release that comprises
the following commits:
c982c1a83932 Linux 5.10.92
c0091233f3d8 staging: greybus: fix stack size warning with UBSAN
66d21c005d9b drm/i915: Avoid bitwise vs logical OR warning in
snb_wm_latency_quirk()
2d4fda471dc3 staging: wlan-ng: Avoid bitwise vs logical OR warning in
hfa384x_usb_throttlefn()
3609fed7ac8b media: Revert "media: uvcvideo: Set unique vdev name based in
type"
9b3c761e78d5 random: fix crash on multiple early calls to
add_bootloader_randomness()
61cca7d191c7 random: fix data race on crng init time
3de9478230c3 random: fix data race on crng_node_pool
43c494294f30 can: gs_usb: gs_can_start_xmit(): zero-initialize
hf->{flags,reserved}
45221a57b609 can: isotp: convert struct tpcon::{idx,len} to unsigned int
bd61ae808b15 can: gs_usb: fix use of uninitialized variable, detach device
on reception of invalid USB data
f68e60001735 mfd: intel-lpss: Fix too early PM enablement in the ACPI
->probe()
5f76445a31b7 veth: Do not record rx queue hint in veth_xmit
ddfa53825f3d mmc: sdhci-pci: Add PCI ID for Intel ADL
2e691f9894cc ath11k: Fix buffer overflow when scanning with extraie
a87cecf94375 USB: Fix "slab-out-of-bounds Write" bug in
usb_hcd_poll_rh_status
15982330b61d USB: core: Fix bug in resuming hub's handling of wakeup
requests
413108ce3b56 ARM: dts: exynos: Fix BCM4330 Bluetooth reset polarity in I9100
b6dd07023699 Bluetooth: bfusb: fix division by zero in send path
869e1677a058 Bluetooth: btusb: Add support for Foxconn QCA 0xe0d0
c20021ce945f Bluetooth: btusb: Add support for Foxconn MT7922A
83493918380f Bluetooth: btusb: Add two more Bluetooth parts for WCN6855
294c0dd80d8a Bluetooth: btusb: fix memory leak in
btusb_mtk_submit_wmt_recv_urb()
35ab8c9085b0 bpf: Fix out of bounds access from invalid *_or_null type
verification
c84fbba8a945 workqueue: Fix unbind_workers() VS wq_worker_running() race
c39d68ab3836 md: revert io stats accounting
Signed-off-by: Bruce Ashfield
Signed-off-by: Richard Purdie
(cherry picked from commit 35dfcd31518e66fc4dc1f2283bd3320f994c868b)
Signed-off-by: Anuj Mittal
---
.../linux/linux-yocto-rt_5.10.bb | 6 ++---
.../linux/linux-yocto-tiny_5.10.bb| 8 +++
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +--
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 420d67031e..695356c482 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to
linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "85c14e209f1ab7cee673735c4561e656b4e65217"
-SRCREV_meta ?= "de35f8006d0f932924752ddda94dd24e2da67fbc"
+SRCREV_machine ?= "73ddd15bb13083c63f183814223b1f064f707964"
+SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.10.91"
+LINUX_VERSION ?= "5.10.92"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index dabcb97a79..e4b389367b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.10.91"
+LINUX_VERSION ?= "5.10.92"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine:qemuarm ?= "2227ab16358ca3193f03d0cd8509092076aeffbb"
-SRCREV_machine ?= "b3fdab7a9f3c11a61565cead0445883a61081583"
-SRCREV_meta ?= "de35f8006d0f932924752ddda94dd24e2da67fbc"
+SRCREV_machine:qemuarm ?= "05c74d1b7b9b5ce5b386e2dbb787f1b00bbfdcb8"
+SRCREV_machine ?= "3c4b46871c0220942e07fc2c73ba94ac04b0d9ca"
+SRCREV_meta ?= "940dd7a24ebe6ad709d6912a24660dadf34ece83"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 9c43738135..412a872e62 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.10/standard/base"
KBRANCH:qemux86-64 ?= "v5.10/standard/base"
KBRANCH:qemumips64 ?=
[OE-core] [honister][PATCH 08/17] tiff: backport fix for CVE-2022-22844
From: Ross Burton
Signed-off-by: Ross Burton
Signed-off-by: Richard Purdie
(cherry picked from commit daf2880b7431aa641e02ebba8cbca40d81389088)
Signed-off-by: Anuj Mittal
---
...al-buffer-overflow-for-ASCII-tags-wh.patch | 43 +++
meta/recipes-multimedia/libtiff/tiff_4.3.0.bb | 3 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-multimedia/libtiff/files/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch
diff --git
a/meta/recipes-multimedia/libtiff/files/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch
b/meta/recipes-multimedia/libtiff/files/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch
new file mode 100644
index 00..72776f09ba
--- /dev/null
+++
b/meta/recipes-multimedia/libtiff/files/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch
@@ -0,0 +1,43 @@
+CVE: CVE-2022-22844
+Upstream-Status: Backport
+Signed-off-by: Ross Burton
+
+From b12a0326e6064b6e0b051d1184a219877472f69b Mon Sep 17 00:00:00 2001
+From: 4ugustus
+Date: Tue, 25 Jan 2022 16:25:28 +
+Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where
+ count is required (fixes #355)
+
+---
+ tools/tiffset.c | 16 +---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/tools/tiffset.c b/tools/tiffset.c
+index 8c9e23c5..e7a88c09 100644
+--- a/tools/tiffset.c
b/tools/tiffset.c
+@@ -146,9 +146,19 @@ main(int argc, char* argv[])
+
+ arg_index++;
+ if (TIFFFieldDataType(fip) == TIFF_ASCII) {
+-if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) !=
1)
+-fprintf( stderr, "Failed to set %s=%s\n",
+- TIFFFieldName(fip), argv[arg_index] );
++if(TIFFFieldPassCount( fip )) {
++size_t len;
++len = strlen(argv[arg_index]) + 1;
++if (len > UINT16_MAX || TIFFSetField(tiff,
TIFFFieldTag(fip),
++(uint16_t)len, argv[arg_index]) != 1)
++fprintf( stderr, "Failed to set %s=%s\n",
++TIFFFieldName(fip), argv[arg_index] );
++} else {
++if (TIFFSetField(tiff, TIFFFieldTag(fip),
++argv[arg_index]) != 1)
++fprintf( stderr, "Failed to set %s=%s\n",
++TIFFFieldName(fip), argv[arg_index] );
++}
+ } else if (TIFFFieldWriteCount(fip) > 0
+ || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) {
+ int ret = 1;
+--
+2.25.1
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb
b/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb
index 6852758c6a..ef8e8460fb 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM =
"file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf"
CVE_PRODUCT = "libtiff"
SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
- "
+
file://0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch"
+
SRC_URI[sha256sum] =
"0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8"
# exclude betas
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161355):
https://lists.openembedded.org/g/openembedded-core/message/161355
Mute This Topic: https://lists.openembedded.org/mt/88906976/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 07/17] icu: fix make_icudata dependencies
From: Kory Maincent
The make_icudata task is set before the configure task then the
dependencies for this task are not populate yet.
Fixed it by adding do_prepare_recipe_sysroot task dependency to the
make_icudata task.
Signed-off-by: Kory Maincent
Signed-off-by: Richard Purdie
(cherry picked from commit c134f62062a6359d2d5831ba4cb9694035e4f25a)
Signed-off-by: Anuj Mittal
---
meta/recipes-support/icu/icu_69.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/icu/icu_69.1.bb
b/meta/recipes-support/icu/icu_69.1.bb
index 4daf0fe82e..848ae9ab19 100644
--- a/meta/recipes-support/icu/icu_69.1.bb
+++ b/meta/recipes-support/icu/icu_69.1.bb
@@ -147,4 +147,4 @@ do_make_icudata() {
:
}
-addtask make_icudata before do_configure after do_patch
+addtask make_icudata before do_configure after do_patch
do_prepare_recipe_sysroot
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161354):
https://lists.openembedded.org/g/openembedded-core/message/161354
Mute This Topic: https://lists.openembedded.org/mt/88906975/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 06/17] glibc : Fix CVE-2021-3999
From: Pgowda
Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=8c8a71c85f2ed5cc90d08d82ce645513fc907cb6]
Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=472e799a5f2102bc0c3206dbd5a801765fceb39c]
Signed-off-by: pgowda
Signed-off-by: Richard Purdie
(cherry picked from commit e9532134b86211801206ff540c4c284f43006f7b)
Signed-off-by: Anuj Mittal
---
.../glibc/glibc/0001-CVE-2021-3999.patch | 36 ++
.../glibc/glibc/0002-CVE-2021-3999.patch | 357 ++
meta/recipes-core/glibc/glibc_2.34.bb | 2 +
3 files changed, 395 insertions(+)
create mode 100644 meta/recipes-core/glibc/glibc/0001-CVE-2021-3999.patch
create mode 100644 meta/recipes-core/glibc/glibc/0002-CVE-2021-3999.patch
diff --git a/meta/recipes-core/glibc/glibc/0001-CVE-2021-3999.patch
b/meta/recipes-core/glibc/glibc/0001-CVE-2021-3999.patch
new file mode 100644
index 00..64749390b5
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0001-CVE-2021-3999.patch
@@ -0,0 +1,36 @@
+From 8c8a71c85f2ed5cc90d08d82ce645513fc907cb6 Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar
+Date: Mon, 24 Jan 2022 10:57:09 +0530
+Subject: [PATCH] tst-realpath-toolong: Fix hurd build
+
+Define PATH_MAX to a constant if it isn't already defined, like in hurd.
+
+Signed-off-by: Siddhesh Poyarekar
+(cherry picked from commit 976db046bc3a3738f69255ae00b0a09b8e77fd9c)
+
+Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=8c8a71c85f2ed5cc90d08d82ce645513fc907cb6]
+CVE: CVE-2021-3999
+
+Signed-off-by: Pgowda
+---
+ stdlib/tst-realpath-toolong.c | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/stdlib/tst-realpath-toolong.c b/stdlib/tst-realpath-toolong.c
+index 8bed772460..4388890294 100644
+--- a/stdlib/tst-realpath-toolong.c
b/stdlib/tst-realpath-toolong.c
+@@ -29,6 +29,10 @@
+
+ #define BASENAME "tst-realpath-toolong."
+
++#ifndef PATH_MAX
++# define PATH_MAX 1024
++#endif
++
+ int
+ do_test (void)
+ {
+--
+2.27.0
+
diff --git a/meta/recipes-core/glibc/glibc/0002-CVE-2021-3999.patch
b/meta/recipes-core/glibc/glibc/0002-CVE-2021-3999.patch
new file mode 100644
index 00..ef3a504fdf
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0002-CVE-2021-3999.patch
@@ -0,0 +1,357 @@
+From 472e799a5f2102bc0c3206dbd5a801765fceb39c Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar
+Date: Fri, 21 Jan 2022 23:32:56 +0530
+Subject: [PATCH] getcwd: Set errno to ERANGE for size == 1 (CVE-2021-3999)
+
+No valid path returned by getcwd would fit into 1 byte, so reject the
+size early and return NULL with errno set to ERANGE. This change is
+prompted by CVE-2021-3999, which describes a single byte buffer
+underflow and overflow when all of the following conditions are met:
+
+- The buffer size (i.e. the second argument of getcwd) is 1 byte
+- The current working directory is too long
+- '/' is also mounted on the current working directory
+
+Sequence of events:
+
+- In sysdeps/unix/sysv/linux/getcwd.c, the syscall returns ENAMETOOLONG
+ because the linux kernel checks for name length before it checks
+ buffer size
+
+- The code falls back to the generic getcwd in sysdeps/posix
+
+- In the generic func, the buf[0] is set to '\0' on line 250
+
+- this while loop on line 262 is bypassed:
+
+while (!(thisdev == rootdev && thisino == rootino))
+
+ since the rootfs (/) is bind mounted onto the directory and the flow
+ goes on to line 449, where it puts a '/' in the byte before the
+ buffer.
+
+- Finally on line 458, it moves 2 bytes (the underflowed byte and the
+ '\0') to the buf[0] and buf[1], resulting in a 1 byte buffer overflow.
+
+- buf is returned on line 469 and errno is not set.
+
+This resolves BZ #28769.
+
+Reviewed-by: Andreas Schwab
+Reviewed-by: Adhemerval Zanella
+Signed-off-by: Qualys Security Advisory
+Signed-off-by: Siddhesh Poyarekar
+(cherry picked from commit 23e0e8f5f1fb5ed150253d986ecccdc90c2dcd5e)
+
+Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=472e799a5f2102bc0c3206dbd5a801765fceb39c]
+CVE: CVE-2021-3999
+
+Signed-off-by: Pgowda
+---
+ NEWS | 6 +
+ sysdeps/posix/getcwd.c| 7 +
+ sysdeps/unix/sysv/linux/Makefile | 7 +-
+ .../unix/sysv/linux/tst-getcwd-smallbuff.c| 241 ++
+ 4 files changed, 260 insertions(+), 1 deletion(-)
+ create mode 100644 sysdeps/unix/sysv/linux/tst-getcwd-smallbuff.c
+
+diff --git a/NEWS b/NEWS
+index b4f81c2668..8d7467d2c1 100644
+--- a/NEWS
b/NEWS
+@@ -214,6 +214,12 @@ Security related changes:
+ function could result in a memory leak and potential access of
+ uninitialized memory. Reported by Qualys.
+
++ CVE-2021-3999: Passing a buffer of size exactly 1 byte to the getcwd
++ function may result in an off-by-one buffer underflow and overflow
++ when the current working directory is longer than PATH_MAX and also
++ corresponds
[OE-core] [honister][PATCH 05/17] glibc : Fix CVE-2021-3998
From: Pgowda
Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=062ff490c1467059f6cd64bb9c3d85f6cc6cf97a]
Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=f7a79879c0b2bef0dadd6caaaeeb0d26423e04e5]
Signed-off-by: pgowda
Signed-off-by: Richard Purdie
(cherry picked from commit 20cc83dd8d323d7ea86b3625f4e8da94c160def9)
Signed-off-by: Anuj Mittal
---
.../glibc/glibc/0001-CVE-2021-3998.patch | 282 ++
.../glibc/glibc/0002-CVE-2021-3998.patch | 138 +
meta/recipes-core/glibc/glibc_2.34.bb | 2 +
3 files changed, 422 insertions(+)
create mode 100644 meta/recipes-core/glibc/glibc/0001-CVE-2021-3998.patch
create mode 100644 meta/recipes-core/glibc/glibc/0002-CVE-2021-3998.patch
diff --git a/meta/recipes-core/glibc/glibc/0001-CVE-2021-3998.patch
b/meta/recipes-core/glibc/glibc/0001-CVE-2021-3998.patch
new file mode 100644
index 00..c6bd5916e3
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0001-CVE-2021-3998.patch
@@ -0,0 +1,282 @@
+From fb7bff12e81c677a6622f724edd4d4987dd9d971 Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar
+Date: Tue, 18 Jan 2022 13:29:36 +0530
+Subject: [PATCH] support: Add helpers to create paths longer than PATH_MAX
+
+Add new helpers support_create_and_chdir_toolong_temp_directory and
+support_chdir_toolong_temp_directory to create and descend into
+directory trees longer than PATH_MAX.
+
+Reviewed-by: Adhemerval Zanella
+Signed-off-by: Siddhesh Poyarekar
+
+Upstream-Status: Backport
[https://sourceware.org/git/?p=glibc.git;a=commit;h=062ff490c1467059f6cd64bb9c3d85f6cc6cf97a]
+CVE: CVE-2021-3998
+
+Signed-off-by: Pgowda
+---
+ support/temp_file.c | 159 +---
+ support/temp_file.h | 9 +++
+ 2 files changed, 159 insertions(+), 9 deletions(-)
+
+diff --git a/support/temp_file.c b/support/temp_file.c
+index e7bb8aadb9..e41128c2d4 100644
+--- a/support/temp_file.c
b/support/temp_file.c
+@@ -1,5 +1,6 @@
+ /* Temporary file handling for tests.
+Copyright (C) 1998-2021 Free Software Foundation, Inc.
++ Copyright The GNU Tools Authors.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+@@ -20,15 +21,17 @@
+some 32-bit platforms. */
+ #define _FILE_OFFSET_BITS 64
+
++#include
+ #include
+ #include
+ #include
+
++#include
+ #include
+ #include
+ #include
+ #include
+-#include
++#include
+
+ /* List of temporary files. */
+ static struct temp_name_list
+@@ -36,14 +39,20 @@ static struct temp_name_list
+ struct temp_name_list *next;
+ char *name;
+ pid_t owner;
++ bool toolong;
+ } *temp_name_list;
+
+ /* Location of the temporary files. Set by the test skeleton via
+support_set_test_dir. The string is not be freed. */
+ static const char *test_dir = _PATH_TMP;
+
+-void
+-add_temp_file (const char *name)
++/* Name of subdirectories in a too long temporary directory tree. */
++static char toolong_subdir[NAME_MAX + 1];
++static bool toolong_initialized;
++static size_t toolong_path_max;
++
++static void
++add_temp_file_internal (const char *name, bool toolong)
+ {
+ struct temp_name_list *newp
+ = (struct temp_name_list *) xcalloc (sizeof (*newp), 1);
+@@ -53,12 +62,19 @@ add_temp_file (const char *name)
+ newp->name = newname;
+ newp->next = temp_name_list;
+ newp->owner = getpid ();
++ newp->toolong = toolong;
+ temp_name_list = newp;
+ }
+ else
+ free (newp);
+ }
+
++void
++add_temp_file (const char *name)
++{
++ add_temp_file_internal (name, false);
++}
++
+ int
+ create_temp_file_in_dir (const char *base, const char *dir, char **filename)
+ {
+@@ -90,8 +106,8 @@ create_temp_file (const char *base, char
+ return create_temp_file_in_dir (base, test_dir, filename);
+ }
+
+-char *
+-support_create_temp_directory (const char *base)
++static char *
++create_temp_directory_internal (const char *base, bool toolong)
+ {
+ char *path = xasprintf ("%s/%sXX", test_dir, base);
+ if (mkdtemp (path) == NULL)
+@@ -99,16 +115,132 @@ support_create_temp_directory (const cha
+ printf ("error: mkdtemp (\"%s\"): %m", path);
+ exit (1);
+ }
+- add_temp_file (path);
++ add_temp_file_internal (path, toolong);
+ return path;
+ }
+
+-/* Helper functions called by the test skeleton follow. */
++char *
++support_create_temp_directory (const char *base)
++{
++ return create_temp_directory_internal (base, false);
++}
++
++static void
++ensure_toolong_initialized (void)
++{
++ if (!toolong_initialized)
++FAIL_EXIT1 ("uninitialized toolong directory tree\n");
++}
++
++static void
++initialize_toolong (const char *base)
++{
++ long name_max = pathconf (base, _PC_NAME_MAX);
++ name_max = (name_max < 0 ? 64
++: (name_max < sizeof (toolong_subdir) ? name_max
++ : sizeof (toolong_subdir) - 1));
++
++ long path_max = pathconf (base,
[OE-core] [honister][PATCH 04/17] sstate: Improve failure to obtain archive message/handling
From: Richard Purdie
The bb.fatal() case where sstate failed to find/use an archive in setcene tasks
is suboptimal. Bitbakes handling of setscene tasks will be to warn but the fatal
will turn this into an error, despite the real task being rerun.
In these failure cases other messages would usually have been printed so turn
this into a warning and raise a handled exception status so that bitbake knows
to fail the task but not print more messages.
Signed-off-by: Richard Purdie
(cherry picked from commit 7875baeca7a3ed216b2442fb8771e51efbfa5a4f)
Signed-off-by: Anuj Mittal
---
meta/classes/sstate.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 566a58dafb..103de01264 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -788,7 +788,9 @@ def sstate_setscene(d):
shared_state = sstate_state_fromvars(d)
accelerate = sstate_installpkg(shared_state, d)
if not accelerate:
-bb.fatal("No suitable staging package found")
+msg = "No sstate archive obtainable, will run full task instead."
+bb.warn(msg)
+raise bb.BBHandledException(msg)
python sstate_task_prefunc () {
shared_state = sstate_state_fromvars(d)
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161351):
https://lists.openembedded.org/g/openembedded-core/message/161351
Mute This Topic: https://lists.openembedded.org/mt/88906972/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 03/17] insane.bbclass: Correct package_qa_check_empty_dirs()
From: Peter Kjellerstedt
The oe.qa.add_message() method is not available in Honister, use
package_qa_add_message() instead.
Signed-off-by: Peter Kjellerstedt
Signed-off-by: Anuj Mittal
---
meta/classes/insane.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index bfaf2577d0..2c8f5338e5 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -945,7 +945,7 @@ def package_qa_check_empty_dirs(pkg, d, messages):
recommendation = (d.getVar('QA_EMPTY_DIRS_RECOMMENDATION:' + dir)
or
"but it is expected to be empty")
msg = "%s installs files in %s, %s" % (pkg, dir, recommendation)
-oe.qa.add_message(messages, "empty-dirs", msg)
+package_qa_add_message(messages, "empty-dirs", msg)
def package_qa_check_encoding(keys, encode, d):
def check_encoding(key, enc):
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161350):
https://lists.openembedded.org/g/openembedded-core/message/161350
Mute This Topic: https://lists.openembedded.org/mt/88906970/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 00/17] Patch review
Next set of changes for honister. Please review.
No problems seen while testing.
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3185
Thanks,
Anuj
The following changes since commit 2d3c5b078feb34cb729902292d2805c9288ebc4c:
glibc : Fix CVE-2022-23219 (2022-01-25 11:11:18 +0800)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib anujm/honister
Alexander Kanavin (1):
libusb1: correct SRC_URI
Bruce Ashfield (3):
kernel: introduce python3-dtschema-wrapper
linux-yocto/5.10: update to v5.10.92
linux-yocto/5.10: update to v5.10.93
Carlos Rafael Giani (1):
libxml2: Backport python3-lxml workaround patch
Kory Maincent (1):
icu: fix make_icudata dependencies
Peter Kjellerstedt (2):
sstate: A third fix for for touching files inside pseudo
insane.bbclass: Correct package_qa_check_empty_dirs()
Pgowda (2):
glibc : Fix CVE-2021-3998
glibc : Fix CVE-2021-3999
Richard Purdie (1):
sstate: Improve failure to obtain archive message/handling
Ross Burton (5):
tiff: backport fix for CVE-2022-22844
yocto-check-layer: add debug output for the layers that were found
expat: upgrade to 2.4.4
vim: upgrade to patch 4269
core-image-sato-sdk: allocate more memory when in qemu
Rudolf J Streif (1):
linux-firmware: Add CLM blob to linux-firmware-bcm4373 package
meta/classes/insane.bbclass | 2 +-
meta/classes/sstate.bbclass | 18 +-
meta/conf/distro/include/maintainers.inc | 1 +
.../expat/{expat_2.4.3.bb => expat_2.4.4.bb} | 2 +-
.../glibc/glibc/0001-CVE-2021-3998.patch | 282 ++
.../glibc/glibc/0001-CVE-2021-3999.patch | 36 ++
.../glibc/glibc/0002-CVE-2021-3998.patch | 138 +++
.../glibc/glibc/0002-CVE-2021-3999.patch | 357 ++
meta/recipes-core/glibc/glibc_2.34.bb | 4 +
.../0002-Work-around-lxml-API-abuse.patch | 213 +++
meta/recipes-core/libxml/libxml2_2.9.12.bb| 1 +
.../python3-dtschema-wrapper/dt-doc-validate | 20 +
.../dtc/python3-dtschema-wrapper/dt-mk-schema | 20 +
.../dtc/python3-dtschema-wrapper/dt-validate | 20 +
.../dtc/python3-dtschema-wrapper_2021.10.bb | 17 +
.../linux-firmware/linux-firmware_20211216.bb | 1 +
.../linux/linux-yocto-rt_5.10.bb | 6 +-
.../linux/linux-yocto-tiny_5.10.bb| 8 +-
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +-
...al-buffer-overflow-for-ASCII-tags-wh.patch | 43 +++
meta/recipes-multimedia/libtiff/tiff_4.3.0.bb | 3 +-
.../images/core-image-sato-sdk.bb | 3 +
meta/recipes-support/icu/icu_69.1.bb | 2 +-
meta/recipes-support/libusb/libusb1_1.0.24.bb | 6 +-
meta/recipes-support/vim/vim.inc | 4 +-
scripts/yocto-check-layer | 13 +
26 files changed, 1211 insertions(+), 33 deletions(-)
rename meta/recipes-core/expat/{expat_2.4.3.bb => expat_2.4.4.bb} (91%)
create mode 100644 meta/recipes-core/glibc/glibc/0001-CVE-2021-3998.patch
create mode 100644 meta/recipes-core/glibc/glibc/0001-CVE-2021-3999.patch
create mode 100644 meta/recipes-core/glibc/glibc/0002-CVE-2021-3998.patch
create mode 100644 meta/recipes-core/glibc/glibc/0002-CVE-2021-3999.patch
create mode 100644
meta/recipes-core/libxml/libxml2/0002-Work-around-lxml-API-abuse.patch
create mode 100644
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate
create mode 100644
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema
create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate
create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
create mode 100644
meta/recipes-multimedia/libtiff/files/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags-wh.patch
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161347):
https://lists.openembedded.org/g/openembedded-core/message/161347
Mute This Topic: https://lists.openembedded.org/mt/88906967/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 02/17] sstate: A third fix for for touching files inside pseudo
From: Peter Kjellerstedt
This continues where commit676757f "sstate: fix touching files inside
pseudo" and commit 29fc8599 "sstate: another fix for touching files
inside pseudo" left off.
The previous changes switched from trying to check if the sstate file is
writable before touching it, to always touching the sstate file and
ignoring any errors. However, if the sstate file is actually a symbolic
link that links to nothing, this would actually result in an empty
sstate file being created. And this in turn leads to that future
setscene tasks will fail when they try to unpack the empty file.
Change the code so that if an sstate file linking to nothing already
exists, it is overwritten with the new sstate file. Also change it so
that the temporary file that is used is always removed, even if ln
fails to link the sstate file to it.
Signed-off-by: Peter Kjellerstedt
Signed-off-by: Richard Purdie
Signed-off-by: Anuj Mittal
---
meta/classes/sstate.bbclass | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index ba2c9fee35..566a58dafb 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -852,14 +852,18 @@ sstate_create_package () {
fi
chmod 0664 $TFILE
# Skip if it was already created by some other process
- if [ ! -e ${SSTATE_PKG} ]; then
+ if [ -h ${SSTATE_PKG} ] && [ ! -e ${SSTATE_PKG} ]; then
+ # There is a symbolic link, but it links to nothing.
+ # Forcefully replace it with the new file.
+ ln -f $TFILE ${SSTATE_PKG} || true
+ elif [ ! -e ${SSTATE_PKG} ]; then
# Move into place using ln to attempt an atomic op.
# Abort if it already exists
- ln $TFILE ${SSTATE_PKG} && rm $TFILE
+ ln $TFILE ${SSTATE_PKG} || true
else
- rm $TFILE
+ touch ${SSTATE_PKG} 2>/dev/null || true
fi
- touch ${SSTATE_PKG} 2>/dev/null || true
+ rm $TFILE
}
python sstate_sign_package () {
@@ -889,7 +893,7 @@ python sstate_report_unihash() {
sstate_unpack_package () {
tar -xvzf ${SSTATE_PKG}
# update .siginfo atime on local/NFS mirror if it is a symbolic link
- [ ! -h ${SSTATE_PKG}.siginfo ] || touch -a ${SSTATE_PKG}.siginfo
2>/dev/null || true
+ [ ! -h ${SSTATE_PKG}.siginfo ] || [ ! -e ${SSTATE_PKG}.siginfo ] ||
touch -a ${SSTATE_PKG}.siginfo 2>/dev/null || true
# update each symbolic link instead of any referenced file
touch --no-dereference ${SSTATE_PKG} 2>/dev/null || true
[ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig
2>/dev/null || true
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161349):
https://lists.openembedded.org/g/openembedded-core/message/161349
Mute This Topic: https://lists.openembedded.org/mt/88906969/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 01/17] kernel: introduce python3-dtschema-wrapper
From: Bruce Ashfield
The 5.16 kernel introduced mandatory schema checking on any dtb file
built through the kernel.
That funcionality is provided via python3-dt-schema.
The dependencies to enable that functionality is not small, and may
not always be desired (in particular on architectures that do not
support dtbs, or in development cycles). It may also be useful for
allowing a non-conformant dts to be compiled.
This commit introduces a set of wrapper scripts that when added
as a depenency to the kernel, can pass both the validation testing
and validation steps of a dts.
Signed-off-by: Bruce Ashfield
Signed-off-by: Richard Purdie
Backported from oe-core commit 2566563ad49d.
Signed-off-by: Paul Barker
Signed-off-by: Anuj Mittal
---
meta/conf/distro/include/maintainers.inc | 1 +
.../python3-dtschema-wrapper/dt-doc-validate | 20 +++
.../dtc/python3-dtschema-wrapper/dt-mk-schema | 20 +++
.../dtc/python3-dtschema-wrapper/dt-validate | 20 +++
.../dtc/python3-dtschema-wrapper_2021.10.bb | 17
5 files changed, 78 insertions(+)
create mode 100644
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate
create mode 100644
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema
create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate
create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index b3b7711a0c..2b54d2d12f 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -592,6 +592,7 @@ RECIPE_MAINTAINER:pn-python3-cython = "Oleksandr Kravchuk
+# License: MIT (see COPYING.MIT at the root of the repository for terms)
+
+for arg; do
+case "$arg" in
+--version)
+echo "v2021.10"
+;;
+esac
+done
+
+# TBD: left for future consideration
+# exec dt-doc-validate.real "$@"
+
+# we always succeed
+exit 0
+
diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema
b/meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema
new file mode 100644
index 00..24b89d8619
--- /dev/null
+++ b/meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema
@@ -0,0 +1,20 @@
+#!/bin/sh
+# dt-mk-schema wrapper to allow kernel dt-validation to pass
+#
+# Copyright (C) 2021 Bruce Ashfield
+# License: MIT (see COPYING.MIT at the root of the repository for terms)
+
+for arg; do
+case "$arg" in
+--version)
+echo "v2021.10"
+;;
+esac
+done
+
+# TBD: left for future consideration
+# exec dt-mk-schema.real "$@"
+
+# we always succeed
+exit 0
+
diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate
b/meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate
new file mode 100644
index 00..8a4710a7ed
--- /dev/null
+++ b/meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate
@@ -0,0 +1,20 @@
+#!/bin/sh
+# dt-validate wrapper to allow kernel dt-validation to pass
+#
+# Copyright (C) 2021 Bruce Ashfield
+# License: MIT (see COPYING.MIT at the root of the repository for terms)
+
+for arg; do
+case "$arg" in
+--version)
+echo "v2021.10"
+;;
+esac
+done
+
+# TBD: left for future consideration
+# exec dt-validate.real "$@"
+
+# we always succeed
+exit 0
+
diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
new file mode 100644
index 00..c869274d09
--- /dev/null
+++ b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Wrapper for tooling for devicetree validation using YAML and
jsonschema"
+HOMEPAGE = "https://yoctoproject.org;
+LICENSE = "MIT"
+LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI = "file://dt-doc-validate \
+ file://dt-mk-schema \
+ file://dt-validate"
+
+do_install() {
+install -d ${D}${bindir}/
+install -m 755 ${WORKDIR}/dt-doc-validate ${D}${bindir}/
+install -m 755 ${WORKDIR}/dt-mk-schema ${D}${bindir}/
+install -m 755 ${WORKDIR}/dt-validate ${D}${bindir}/
+}
+
+BBCLASSEXTEND = "native nativesdk"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161348):
https://lists.openembedded.org/g/openembedded-core/message/161348
Mute This Topic: https://lists.openembedded.org/mt/88906968/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [OE-core] Inclusive Language Proposal for YP/OE
On Fri, 4 Feb 2022 at 14:21, Enrico Scholz via lists.openembedded.org wrote: > "Jon Mason" writes: > > > For BB_DISKMON_DIRS, the actions "ABORT, STOPTASKS and WARN" would > > become "HALT, NO_NEW_TASKS and "WARN". > > I am not an native english speaker, but for "HALT" I will have to think > twice whether it will pause the operation or abort it. I would stay at > "ABORT" because it makes much more clear what happens. > I'm not taking a stand here, but just providing the context for where the push for avoidance of 'abort' comes from: https://inclusivenaming.org/word-lists/tier-1/ Keep in mind that for non-native english speakers none of these words are emotionally charged; they're just terms. Not so for native speakers. > > BB_HASHCONFIG_WHITELIST -> BB_HASHCONFIG_IGNORE_VARS > > BB_SETSCENE_ENFORCE_WHITELIST -> BB_SETSCENE_ENFORCE_IGNORE_TASKS > > BB_HASHBASE_WHITELIST -> BB_BASEHASH_IGNORE_VARS > > MULTI_PROVIDER_WHITELIST -> BB_MULTI_PROVIDER_ALLOWED > > The new variable names sound like boolean flags, not like lists. > I'd say the context should make it clear that they are lists (e.g. either the initialization, or usage via iteration). Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161346): https://lists.openembedded.org/g/openembedded-core/message/161346 Mute This Topic: https://lists.openembedded.org/mt/88906624/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] recipetool/create: Scan for SDPX-License-Identifier
On Fri, 2022-02-04 at 10:05 +0100, Stefan Herbrechtsmeier wrote:
> Hi Richard,
>
> Am 03.02.2022 um 22:24 schrieb Richard Purdie via lists.openembedded.org:
> > On Thu, 2022-02-03 at 09:07 -0800, Saul Wold wrote:
> > > When a file can not be identified by checksum and they contain an SPDX
> > > License-Identifier tag, use it as the found license.
> > >
> > > [YOCTO #14529]
> > >
> > > Tested with LICENSE files that contain 1 or more SPDX-License-Identifier
> > > tags
> > >
> > > Signed-off-by: Saul Wold
> > > ---
> > > scripts/lib/recipetool/create.py | 16 +++-
> > > 1 file changed, 11 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/scripts/lib/recipetool/create.py
> > > b/scripts/lib/recipetool/create.py
> > > index 507a230511..9149c2d94f 100644
> > > --- a/scripts/lib/recipetool/create.py
> > > +++ b/scripts/lib/recipetool/create.py
> > > @@ -1221,14 +1221,20 @@ def guess_license(srctree, d):
> > > for licfile in sorted(licfiles):
> > > md5value = bb.utils.md5_file(licfile)
> > > license = md5sums.get(md5value, None)
> > > +license_list = []
> > > if not license:
> > > license, crunched_md5, lictext = crunch_license(licfile)
> > > if lictext and not license:
> > > -license = 'Unknown'
> > > -logger.info("Please add the following line for '%s' to a
> > > 'lib/recipetool/licenses.csv' " \
> > > -"and replace `Unknown` with the license:\n" \
> > > -"%s,Unknown" % (os.path.relpath(licfile, srctree),
> > > md5value))
> > > -if license:
> > > +spdx_re =
> > > re.compile('SPDX-License-Identifier:\s+([-A-Za-z\d. ]+)[ |\n|\r\n]*?')
> > > +license_list = re.findall(spdx_re, "\n".join(lictext))
> > > +if not license_list:
> > > +license_list.append('Unknown')
> > > +logger.info("Please add the following line for '%s'
> > > to a 'lib/recipetool/licenses.csv' " \
> > > +"and replace `Unknown` with the license:\n" \
> > > +"%s,Unknown" % (os.path.relpath(licfile,
> > > srctree), md5value))
> > > +else:
> > > +license_list.append(license)
> > > +for license in license_list:
> > > licenses.append((license, os.path.relpath(licfile,
> > > srctree), md5value))
> > >
> > > # FIXME should we grab at least one source file with a license
> > > header and add that too?
> >
> > I think to close this bug the code may need to go one step further and
> > effectively grep over the source tree.
>
> Please keep in mind that we need a full license text and not only the
> license name for license compliance. The current function only search
> for license files with license text.
>
> > We'd probably want to list the value of any SPDX-License-Identifier: header
> > found in any of the source files for the user to then decide upon?
>
> I think this is an other feature like a license checker because if you
> have a SPDX-License-Identifier without a license text you have a license
> violation.
>
> This brings us to the problem that this code will interpret a file with
> only a SPDX-License-Identifier as a license file with license text.
As I understand it the tool is there to help write a recipe so filling out
LICENSE and highlighting a missing full license text would be a valid approach
for the tool and helpful to the user?
It certainly isn't intended as full validation, just intended to assist the
creation of a recipe.
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161345):
https://lists.openembedded.org/g/openembedded-core/message/161345
Mute This Topic: https://lists.openembedded.org/mt/7504/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] Inclusive Language Proposal for YP/OE
"Jon Mason" writes: > For BB_DISKMON_DIRS, the actions "ABORT, STOPTASKS and WARN" would > become "HALT, NO_NEW_TASKS and "WARN". I am not an native english speaker, but for "HALT" I will have to think twice whether it will pause the operation or abort it. I would stay at "ABORT" because it makes much more clear what happens. > BB_HASHCONFIG_WHITELIST -> BB_HASHCONFIG_IGNORE_VARS > BB_SETSCENE_ENFORCE_WHITELIST -> BB_SETSCENE_ENFORCE_IGNORE_TASKS > BB_HASHBASE_WHITELIST -> BB_BASEHASH_IGNORE_VARS > MULTI_PROVIDER_WHITELIST -> BB_MULTI_PROVIDER_ALLOWED The new variable names sound like boolean flags, not like lists. > SSTATE_DUPWHITELIST -> SSTATE_ALLOW_OVERLAP_FILES > CVE_CHECK_PN_WHITELIST -> CVE_CHECK_SKIPRECIPE > CVE_CHECK_WHITELIST -> CVE_CHECK_IGNORECVE > SYSROOT_DIRS_BLACKLIST -> SYSROOT_DIRS_IGNORE > LICENSE_FLAGS_WHITELIST -> LICENSE_FLAGS_ACCEPTED > UNKNOWN_CONFIGURE_WHITELIST -> UNKNOWN_CONFIGURE_OPT_IGNORE > SDK_LOCAL_CONF_BLACKLIST -> ESDK_LOCALCONF_REMOVE > SDK_LOCAL_CONF_WHITELIST -> ESDK_LOCALCONF_ALLOW > SDK_INHERIT_BLACKLIST -> ESDK_CLASS_INHERIT_DISABLE ditto; sounds like flags but not like lists Enrico -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161344): https://lists.openembedded.org/g/openembedded-core/message/161344 Mute This Topic: https://lists.openembedded.org/mt/88650128/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-licences: remove ambiguous "BSD" license
Our "BSD" license is the 3-clause BSD license, but many recipes were using "BSD" for any variation of the license. We've mostly moved recipes away from the vague "BSD" license to concrete names such as "BSD-3-Clause", so delete the BSD license to force the remaining users to update their license statements. [ YOCTO #14539 ] Signed-off-by: Ross Burton --- meta/files/common-licenses/BSD | 26 -- 1 file changed, 26 deletions(-) delete mode 100644 meta/files/common-licenses/BSD diff --git a/meta/files/common-licenses/BSD b/meta/files/common-licenses/BSD deleted file mode 100644 index c7a0aa4f941..000 --- a/meta/files/common-licenses/BSD +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) The Regents of the University of California. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. 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. -3. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161343): https://lists.openembedded.org/g/openembedded-core/message/161343 Mute This Topic: https://lists.openembedded.org/mt/88905349/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] recipetool/create: Scan for SDPX-License-Identifier
Hi Richard,
Am 03.02.2022 um 22:24 schrieb Richard Purdie via lists.openembedded.org:
On Thu, 2022-02-03 at 09:07 -0800, Saul Wold wrote:
When a file can not be identified by checksum and they contain an SPDX
License-Identifier tag, use it as the found license.
[YOCTO #14529]
Tested with LICENSE files that contain 1 or more SPDX-License-Identifier tags
Signed-off-by: Saul Wold
---
scripts/lib/recipetool/create.py | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 507a230511..9149c2d94f 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -1221,14 +1221,20 @@ def guess_license(srctree, d):
for licfile in sorted(licfiles):
md5value = bb.utils.md5_file(licfile)
license = md5sums.get(md5value, None)
+license_list = []
if not license:
license, crunched_md5, lictext = crunch_license(licfile)
if lictext and not license:
-license = 'Unknown'
-logger.info("Please add the following line for '%s' to a
'lib/recipetool/licenses.csv' " \
-"and replace `Unknown` with the license:\n" \
-"%s,Unknown" % (os.path.relpath(licfile, srctree),
md5value))
-if license:
+spdx_re = re.compile('SPDX-License-Identifier:\s+([-A-Za-z\d.
]+)[ |\n|\r\n]*?')
+license_list = re.findall(spdx_re, "\n".join(lictext))
+if not license_list:
+license_list.append('Unknown')
+logger.info("Please add the following line for '%s' to a
'lib/recipetool/licenses.csv' " \
+"and replace `Unknown` with the license:\n" \
+"%s,Unknown" % (os.path.relpath(licfile, srctree),
md5value))
+else:
+license_list.append(license)
+for license in license_list:
licenses.append((license, os.path.relpath(licfile, srctree),
md5value))
# FIXME should we grab at least one source file with a license header and add that too?
I think to close this bug the code may need to go one step further and
effectively grep over the source tree.
Please keep in mind that we need a full license text and not only the
license name for license compliance. The current function only search
for license files with license text.
We'd probably want to list the value of any SPDX-License-Identifier: header
found in any of the source files for the user to then decide upon?
I think this is an other feature like a license checker because if you
have a SPDX-License-Identifier without a license text you have a license
violation.
This brings us to the problem that this code will interpret a file with
only a SPDX-License-Identifier as a license file with license text.
Regards
Stefan
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161342):
https://lists.openembedded.org/g/openembedded-core/message/161342
Mute This Topic: https://lists.openembedded.org/mt/7504/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] [hardknott] qemu CVE backports
On Fri, 2022-02-04 at 03:36 +, Anuj Mittal wrote: > On Wed, 2022-02-02 at 12:01 -0500, Sakib Sajal wrote: > > Hi Anuj, > > > > The patches did go through. However, the patches are sent in two > > different threads, the first patch in one thread and patches 2 to 8 > > in > > another thread. Please merge the commits accordingly. > > Thank you. I have included them for testing. > It looks like this series is causing test_boot_machine_slirp oe- selftest to fail. https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/3083 https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/3125 Can you please take a look? Thanks, Anuj -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161341): https://lists.openembedded.org/g/openembedded-core/message/161341 Mute This Topic: https://lists.openembedded.org/mt/88861937/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] recipetool/create: Scan for SDPX-License-Identifier
Hi Saul,
Am 03.02.2022 um 18:07 schrieb Saul Wold via lists.openembedded.org:
When a file can not be identified by checksum and they contain an SPDX
License-Identifier tag, use it as the found license.
[YOCTO #14529]
Tested with LICENSE files that contain 1 or more SPDX-License-Identifier tags
Can you please give an example for an project with use a
SPDX-License-Identifier inside a license file.
Signed-off-by: Saul Wold
---
scripts/lib/recipetool/create.py | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 507a230511..9149c2d94f 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -1221,14 +1221,20 @@ def guess_license(srctree, d):
for licfile in sorted(licfiles):
md5value = bb.utils.md5_file(licfile)
license = md5sums.get(md5value, None)
+license_list = []
Could you please use an other name. We already have licenses and it is
hard to distinguish the difference between licenses and license_list.
if not license:
license, crunched_md5, lictext = crunch_license(licfile)
if lictext and not license:
-license = 'Unknown'
-logger.info("Please add the following line for '%s' to a
'lib/recipetool/licenses.csv' " \
-"and replace `Unknown` with the license:\n" \
-"%s,Unknown" % (os.path.relpath(licfile, srctree),
md5value))
-if license:
+spdx_re = re.compile('SPDX-License-Identifier:\s+([-A-Za-z\d.
]+)[ |\n|\r\n]*?')
+license_list = re.findall(spdx_re, "\n".join(lictext))
+if not license_list:
+license_list.append('Unknown')
+logger.info("Please add the following line for '%s' to a
'lib/recipetool/licenses.csv' " \
+"and replace `Unknown` with the license:\n" \
+"%s,Unknown" % (os.path.relpath(licfile, srctree),
md5value))
+else:
+license_list.append(license)
+for license in license_list:
licenses.append((license, os.path.relpath(licfile, srctree),
md5value))
# FIXME should we grab at least one source file with a license header and add that too?
Regards
Stefan
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161340):
https://lists.openembedded.org/g/openembedded-core/message/161340
Mute This Topic: https://lists.openembedded.org/mt/7504/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
