Re: [OE-core][PATCH] core-image-tiny-initramfs: delete populate_sdk task

2022-01-04 Thread Chen Qi

On 12/29/21 5:36 AM, Ross Burton wrote:

On Thu, 16 Dec 2021 at 05:09, Chen Qi  wrote:

Currently, if we do `bitbake core-image-tiny-initramfs' and then
install the generated SDK, the following error appears.

   tar: ./sysroots/core2-64-poky-linux/dev/console: Cannot mknod: Operation not 
permitted

The populate_sdk task does not make much sense for this recipe and
considering the fact the its SDK cannot be installed, we'd better just
delete the task.

Feels to me that this is working around a problem instead of fixing the problem.

This happens for -tiny-initramfs because the root fs contains a
populated /dev tree, with device nodes in.  There is no hard
association between "has a static /dev" and "SDKs are meaningless", so
a better fix would be to remove /dev from the SDK entirely, instead of
removing SDKs from one image, when this is a general problem.

Ross


Hi Ross,

I've sent out a new patch to remove '/dev' from SDK.

Regards,

Qi


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160179): 
https://lists.openembedded.org/g/openembedded-core/message/160179
Mute This Topic: https://lists.openembedded.org/mt/87761444/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] populate_sdk_base: remove useless dirs such as /dev

2022-01-04 Thread Chen Qi
We met a problem that core-image-tiny-initramfs's SDK cannot be
installed. The error message is like below.

  tar: ./sysroots/core2-64-poky-linux/dev/console: Cannot mknod: Operation not 
permitted

In fact, the '/dev' direcotry is useless for SDK. So remove it.

This patches uses a variable, SDK_USELESS_DIRS, to hold useless dir entries
so that it could be extended. For example, '/usr/bin' could be added if wanted.

Signed-off-by: Chen Qi 
---
 meta/classes/populate_sdk_base.bbclass | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta/classes/populate_sdk_base.bbclass 
b/meta/classes/populate_sdk_base.bbclass
index fafdd96749..d4065b9b13 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -92,6 +92,8 @@ SDK_HOST_MANIFEST = 
"${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.host.manifest"
 SDK_EXT_TARGET_MANIFEST = 
"${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.target.manifest"
 SDK_EXT_HOST_MANIFEST = 
"${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.host.manifest"
 
+SDK_USELESS_DIRS ?= "/dev"
+
 python write_target_sdk_manifest () {
 from oe.sdk import sdk_list_installed_packages
 from oe.utils import format_pkg_list
@@ -103,6 +105,12 @@ python write_target_sdk_manifest () {
 output.write(format_pkg_list(pkgs, 'ver'))
 }
 
+delete_useless () {
+for d in ${SDK_USELESS_DIRS}; do
+rm -rf ${SDK_OUTPUT}${SDKTARGETSYSROOT}$d
+done
+}
+
 python write_sdk_test_data() {
 from oe.data import export2json
 testdata = "%s/%s.testdata.json" % (d.getVar('SDKDEPLOYDIR'), 
d.getVar('TOOLCHAIN_OUTPUTNAME'))
@@ -122,8 +130,9 @@ python write_host_sdk_manifest () {
 }
 
 POPULATE_SDK_POST_TARGET_COMMAND:append = " write_sdk_test_data ; "
-POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk  = " 
write_target_sdk_manifest ; "
+POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk  = " 
write_target_sdk_manifest; delete_useless; "
 POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk = " 
write_host_sdk_manifest; "
+
 SDK_PACKAGING_COMMAND = "${@'${SDK_PACKAGING_FUNC};' if 
'${SDK_PACKAGING_FUNC}' else ''}"
 SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; archive_sdk; 
${SDK_PACKAGING_COMMAND} "
 
-- 
2.33.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160178): 
https://lists.openembedded.org/g/openembedded-core/message/160178
Mute This Topic: https://lists.openembedded.org/mt/88209004/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][PATCH] gcc: Fix CVE-2021-42574

2022-01-04 Thread Pgowda
Hi Khem Raj,

> Key is When git send-email asks for UTF-8 encoding for the patch then do not 
> enter “y” but just press
> Enter

Thanks for informing about the method to post UTF-8 format patches.

Posted the patch as per your suggestion at :-
https://lists.openembedded.org/g/openembedded-core/message/160175

Thanks,
Pgowda

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160177): 
https://lists.openembedded.org/g/openembedded-core/message/160177
Mute This Topic: https://lists.openembedded.org/mt/88011740/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] do_prepare_recipe_sysroot takes >5min @100% CPU

2022-01-04 Thread Jacob Kroon

Den 2022-01-04 kl. 18:47, skrev Andreas Müller:

Hi,

with relatively actual states of layers/bitbake I see huge delays in
my builds on tasks do_prepare_recipe_sysroot and sometimes or do_patch
- even if recipe does not have patches.

The time the tasks take is 5-10min and each of them load one CPU with
100%. Is this something others have noticed or even better: any hint
how to get over?



Some years ago I ran into

https://bugzilla.yoctoproject.org/show_bug.cgi?id=13843

It is probably not related, but maybe you can use gdb/py-bt in a similar 
way and get a Python backtrace so as to at least get a hint of why it is 
taking so long.


Jacob

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160176): 
https://lists.openembedded.org/g/openembedded-core/message/160176
Mute This Topic: https://lists.openembedded.org/mt/88195633/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core][hardknott][PATCH V4] busybox: backport patches to fix CVEs

2022-01-04 Thread Chen Qi
Backport patches to fix the following CVEs:
CVE-2021-42373
CVE-2021-42378
CVE-2021-42379
CVE-2021-42380
CVE-2021-42381
CVE-2021-42382
CVE-2021-42383
CVE-2021-42384
CVE-2021-42385
CVE-2021-42386

Signed-off-by: Chen Qi 
---
 .../busybox/busybox/0001-awk-fix-CVEs.patch   | 3266 +
 .../0002-man-fix-segfault-in-man-1.patch  |   30 +
 meta/recipes-core/busybox/busybox_1.33.2.bb   |2 +
 3 files changed, 3298 insertions(+)
 create mode 100644 meta/recipes-core/busybox/busybox/0001-awk-fix-CVEs.patch
 create mode 100644 
meta/recipes-core/busybox/busybox/0002-man-fix-segfault-in-man-1.patch

diff --git a/meta/recipes-core/busybox/busybox/0001-awk-fix-CVEs.patch 
b/meta/recipes-core/busybox/busybox/0001-awk-fix-CVEs.patch
new file mode 100644
index 00..c07b53ebfd
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/0001-awk-fix-CVEs.patch
@@ -0,0 +1,3266 @@
+From cf542caeed195af05fa6205341f829ccee53f8c2 Mon Sep 17 00:00:00 2001
+From: Chen Qi 
+Date: Tue, 4 Jan 2022 17:48:03 -0800
+Subject: [PATCH] awk: fix CVEs
+
+The awk CVEs is hard to be separated, thus we use the following method
+to format the current patch.
+git rev-list --reverse 1_33_2..1_34_1 -- editors/awk.c | xargs git cherry-pick
+git reset HEAD~66 && git add . && git commit
+
+CVE: CVE-2021-42378
+CVE: CVE-2021-42379
+CVE: CVE-2021-42380
+CVE: CVE-2021-42381
+CVE: CVE-2021-42382
+CVE: CVE-2021-42383
+CVE: CVE-2021-42384
+CVE: CVE-2021-42385
+CVE: CVE-2021-42386
+
+Upstream-Status: Backport
+
+Signed-off-by: Chen Qi 
+---
+ editors/awk.c  | 2060 +++-
+ testsuite/awk.tests|   62 +-
+ testsuite/printf.tests |5 +
+ 3 files changed, 1264 insertions(+), 863 deletions(-)
+
+diff --git a/editors/awk.c b/editors/awk.c
+index 2c15f9e4e..f6314ac72 100644
+--- a/editors/awk.c
 b/editors/awk.c
+@@ -66,6 +66,8 @@
+ #endif
+ #ifndef debug_printf_parse
+ # define debug_printf_parse(...) (fprintf(stderr, __VA_ARGS__))
++#else
++# define debug_parse_print_tc(...) ((void)0)
+ #endif
+ 
+ 
+@@ -91,7 +93,6 @@ enum {
+ };
+ 
+ #define   MAXVARFMT   240
+-#define   MINNVBLOCK  64
+ 
+ /* variable flags */
+ #define   VF_NUMBER   0x0001  /* 1 = primary type is number */
+@@ -101,7 +102,7 @@ enum {
+ #define   VF_USER 0x0200  /* 1 = user input (may be numeric 
string) */
+ #define   VF_SPECIAL  0x0400  /* 1 = requires extra handling when 
changed */
+ #define   VF_WALK 0x0800  /* 1 = variable has alloc'd x.walker 
list */
+-#define   VF_FSTR 0x1000  /* 1 = var::string points to fstring 
buffer */
++#define   VF_FSTR 0x1000  /* 1 = don't free() var::string (not 
malloced, or is owned by something else) */
+ #define   VF_CHILD0x2000  /* 1 = function arg; x.parent points to 
source */
+ #define   VF_DIRTY0x4000  /* 1 = variable was set explicitly */
+ 
+@@ -118,8 +119,8 @@ typedef struct walker_list {
+ /* Variable */
+ typedef struct var_s {
+   unsigned type;/* flags */
+-  double number;
+   char *string;
++  double number;
+   union {
+   int aidx;   /* func arg idx (for compilation stage) 
*/
+   struct xhash_s *array;  /* array ptr */
+@@ -138,6 +139,7 @@ typedef struct chain_s {
+ /* Function */
+ typedef struct func_s {
+   unsigned nargs;
++  smallint defined;
+   struct chain_s body;
+ } func;
+ 
+@@ -177,7 +179,7 @@ typedef struct node_s {
+   struct node_s *n;
+   var *v;
+   int aidx;
+-  char *new_progname;
++  const char *new_progname;
+   regex_t *re;
+   } l;
+   union {
+@@ -190,91 +192,120 @@ typedef struct node_s {
+   } a;
+ } node;
+ 
+-/* Block of temporary variables */
+-typedef struct nvblock_s {
+-  int size;
+-  var *pos;
+-  struct nvblock_s *prev;
+-  struct nvblock_s *next;
+-  var nv[];
+-} nvblock;
+-
+ typedef struct tsplitter_s {
+   node n;
+   regex_t re[2];
+ } tsplitter;
+ 
+ /* simple token classes */
+-/* Order and hex values are very important!!!  See next_token() */
+-#define   TC_SEQSTART (1 << 0)/* ( */
+-#define   TC_SEQTERM  (1 << 1)/* ) */
+-#define   TC_REGEXP   (1 << 2)/* /.../ */
+-#define   TC_OUTRDR   (1 << 3)/* | > >> */
+-#define   TC_UOPPOST  (1 << 4)/* unary postfix 
operator */
+-#define   TC_UOPPRE1  (1 << 5)/* unary prefix 
operator */
+-#define   TC_BINOPX   (1 << 6)/* two-opnd operator */
+-#define   TC_IN   (1 << 7)
+-#define   TC_COMMA(1 << 8)
+-#define   TC_PIPE (1 << 9)/* input redirection 
pipe */
+-#define   TC_UOPPRE2  (1 << 10)   /* unary prefix 
operator */
+-#define   TC_ARRTERM  (1 << 11

[OE-core] [PATCH] scripts: Update to use exec_module() instead of load_module()

2022-01-04 Thread Richard Purdie
This is deprecated in python 3.12 and Fedora 35 is throwing warnings so
move to the new functions.

Signed-off-by: Richard Purdie 
---
 scripts/lib/scriptutils.py| 4 +++-
 scripts/lib/wic/pluginbase.py | 5 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py
index 3164171eb28..da778ea25ec 100644
--- a/scripts/lib/scriptutils.py
+++ b/scripts/lib/scriptutils.py
@@ -82,7 +82,9 @@ def load_plugins(logger, plugins, pluginpath):
 logger.debug('Loading plugin %s' % name)
 spec = importlib.machinery.PathFinder.find_spec(name, 
path=[pluginpath] )
 if spec:
-return spec.loader.load_module()
+mod = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(mod)
+return mod
 
 def plugin_name(filename):
 return os.path.splitext(os.path.basename(filename))[0]
diff --git a/scripts/lib/wic/pluginbase.py b/scripts/lib/wic/pluginbase.py
index d9b4e57747e..d0651da4b71 100644
--- a/scripts/lib/wic/pluginbase.py
+++ b/scripts/lib/wic/pluginbase.py
@@ -9,6 +9,7 @@ __all__ = ['ImagerPlugin', 'SourcePlugin']
 
 import os
 import logging
+import types
 
 from collections import defaultdict
 from importlib.machinery import SourceFileLoader
@@ -54,7 +55,9 @@ class PluginMgr:
 mname = fname[:-3]
 mpath = os.path.join(ppath, fname)
 logger.debug("loading plugin module %s", mpath)
-SourceFileLoader(mname, mpath).load_module()
+loader = SourceFileLoader(mname, mpath)
+mod = types.ModuleType(loader.name)
+loader.exec_module(mod)
 
 return PLUGINS.get(ptype)
 
-- 
2.32.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160173): 
https://lists.openembedded.org/g/openembedded-core/message/160173
Mute This Topic: https://lists.openembedded.org/mt/88202823/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [OE-core] [PATCH 2/2] package.bbclass: don't skip kernel and kernel modules

2022-01-04 Thread Saul Wold



On 12/22/21 01:09, Richard Purdie wrote:

On Tue, 2021-12-21 at 11:08 -0800, Saul Wold wrote:

Stop ignoring or skipping the kernel and kernel modules code in the
split debug and striping functions, this will allow create_spdx to
process the kernel and modules.

Signed-off-by: Saul Wold 
---
  meta/classes/package.bbclass | 8 ++--
  1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 84eafbd529..4b7fe4f1e1 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -390,10 +390,6 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, 
debugappend, debugsrcdir,
  dvar = d.getVar('PKGD')
  objcopy = d.getVar("OBJCOPY")
  
-# We ignore kernel modules, we don't generate debug info files.

-if file.find("/lib/modules/") != -1 and file.endswith(".ko"):
-return (file, sources)
-
  newmode = None
  if not os.access(file, os.W_OK) or os.access(file, os.R_OK):
  origmode = os.stat(file)[stat.ST_MODE]
@@ -1147,7 +1143,7 @@ python split_and_strip_files () {
  
  if file.endswith(".ko") and file.find("/lib/modules/") != -1:

  kernmods.append(file)
-continue
+
  if oe.package.is_static_lib(file):
  staticlibs.append(file)
  continue
@@ -1165,7 +1161,7 @@ python split_and_strip_files () {
  continue
  # Check its an executable
  if (s[stat.ST_MODE] & stat.S_IXUSR) or (s[stat.ST_MODE] & 
stat.S_IXGRP) or (s[stat.ST_MODE] & stat.S_IXOTH) \
-or ((file.startswith(libdir) or file.startswith(baselibdir)) and 
(".so" in f or ".node" in f)):
+or ((file.startswith(libdir) or file.startswith(baselibdir)) and (".so" in 
f or ".node" in f)) or (f.startswith('vmlinux') or ".ko" in f):
  
  if cpath.islink(file):

  checkelflinks[file] = ltarget


edgerouter:
https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/4513
https://autobuilder.yoctoproject.org/typhoon/#/builders/111/builds/2507/steps/11/logs/stdio

So I have been digging into this and it seems that an option was added a 
decade ago or so to strip the kernel/vmlinux when it's too big, this was 
done for at least the routerstationpro according to bug #3515 [0], and 
persists with the edgerouter, although I am not sure if it would still 
actually be required as the edgerouter also uses the 
KERNEL_ALT_IMAGETYPE to create a smaller binary kernel image.


The change I proposed causes the all kernels to be stripped all the time 
as part of the split_and_strip_files(). As I see it there few different 
options:


1) Set KERNEL_IMAGE_EXTRA_STRIP_SECTIONS = "" in create_spdx.bbclass
  - This solves the problem with create_spdx.bbclass is in use, but not 
the general case


2) Remove the KERNEL_IMAGE_EXTRA_STRIP_SECTIONS from edgerouter.conf
  - Will solve the edgerouter case but may not solve other usages 
unknown to me.

  - Does anyone know of other machines/layers usage of this variable?

3) deprecate the kernel.bbclass:do_strip function in favor of using the 
split_and_strip_files() of package.bbclass


4) Change error to warning in packaging.bbclass for the kernel only
  - This would explain that a kernel image (vmlinux) is already 
stripped and extended package data would not be available for for SPDX 
creation.


RP, Bruce, Joshua: Thoughts?

Sau!

[0] https://bugzilla.yoctoproject.org/show_bug.cgi?id=3515



qemux86 musl cryptodev:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/4512/steps/11/logs/stdio

qemux86-64 musl cryptodev:
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/4526

qemux86 cryptodev:
https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/4476/steps/11/logs/stdio


I tried these and have not been able to reproduce the failure.




selftest failure in linux-yocto:
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/2981/steps/14/logs/stdio
(file truncated makes it sound like a race?)

stap kernel module failure:
https://autobuilder.yoctoproject.org/typhoon/#/builders/110/builds/3395/steps/13/logs/stdio
(race/intermittent?)

another kernel module race:
https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/4480/steps/16/logs/stdio

Might need to try this on the AB once I resolve the kernel stripping 
issue above.


Sau!


Cheers,

Richard





--
Sau!

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160172): 
https://lists.openembedded.org/g/openembedded-core/message/160172
Mute This Topic: https://lists.openembedded.org/mt/87884056/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] [PATCH] maintainers.inc: update email address

2022-01-04 Thread Tim Orling
Signed-off-by: Tim Orling 
---
 meta/conf/distro/include/maintainers.inc | 70 
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/meta/conf/distro/include/maintainers.inc 
b/meta/conf/distro/include/maintainers.inc
index 70d185cab45..0af6974a3d3 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -47,9 +47,9 @@ RECIPE_MAINTAINER:pn-argp-standalone = "Khem Raj 
"
 RECIPE_MAINTAINER:pn-asciidoc = "Yi Zhao "
 RECIPE_MAINTAINER:pn-aspell = "Anuj Mittal "
 RECIPE_MAINTAINER:pn-at = "Chen Qi "
-RECIPE_MAINTAINER:pn-at-spi2-atk = "Tim Orling "
-RECIPE_MAINTAINER:pn-at-spi2-core = "Tim Orling "
-RECIPE_MAINTAINER:pn-atk = "Tim Orling "
+RECIPE_MAINTAINER:pn-at-spi2-atk = "Tim Orling "
+RECIPE_MAINTAINER:pn-at-spi2-core = "Tim Orling "
+RECIPE_MAINTAINER:pn-atk = "Tim Orling "
 RECIPE_MAINTAINER:pn-attr = "Chen Qi "
 RECIPE_MAINTAINER:pn-autoconf = "Robert Yang "
 RECIPE_MAINTAINER:pn-autoconf-archive = "Robert Yang 
"
@@ -312,7 +312,7 @@ RECIPE_MAINTAINER:pn-libcap-ng-python = "Yi Zhao 
"
 RECIPE_MAINTAINER:pn-libcgroup = "Alexander Kanavin "
 RECIPE_MAINTAINER:pn-libcheck = "Yi Zhao "
 RECIPE_MAINTAINER:pn-libcomps = "Alexander Kanavin "
-RECIPE_MAINTAINER:pn-libconvert-asn1-perl = "Tim Orling 
"
+RECIPE_MAINTAINER:pn-libconvert-asn1-perl = "Tim Orling 
"
 RECIPE_MAINTAINER:pn-libcroco = "Anuj Mittal "
 RECIPE_MAINTAINER:pn-libdaemon = "Alexander Kanavin "
 RECIPE_MAINTAINER:pn-libdazzle = "Alexander Kanavin "
@@ -322,7 +322,7 @@ RECIPE_MAINTAINER:pn-libdrm = "Otavio Salvador 
"
 RECIPE_MAINTAINER:pn-python3 = "Oleksandr Kravchuk 
"
 RECIPE_MAINTAINER:pn-python3-async = "Oleksandr Kravchuk 
"
-RECIPE_MAINTAINER:pn-python3-atomicwrites = "Tim Orling 
"
-RECIPE_MAINTAINER:pn-python3-attrs = "Tim Orling "
+RECIPE_MAINTAINER:pn-python3-atomicwrites = "Tim Orling 
"
+RECIPE_MAINTAINER:pn-python3-attrs = "Tim Orling "
 RECIPE_MAINTAINER:pn-python3-cython = "Oleksandr Kravchuk 
"
 RECIPE_MAINTAINER:pn-python3-dbus = "Zang Ruochen "
 RECIPE_MAINTAINER:pn-python3-dbusmock = "Oleksandr Kravchuk 
"
@@ -604,10 +604,10 @@ RECIPE_MAINTAINER:pn-python3-pyrsistent = "Bruce Ashfield 

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160171): 
https://lists.openembedded.org/g/openembedded-core/message/160171
Mute This Topic: https://lists.openembedded.org/mt/88198608/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] do_prepare_recipe_sysroot takes >5min @100% CPU

2022-01-04 Thread Andreas Müller
Hi,

with relatively actual states of layers/bitbake I see huge delays in
my builds on tasks do_prepare_recipe_sysroot and sometimes or do_patch
- even if recipe does not have patches.

The time the tasks take is 5-10min and each of them load one CPU with
100%. Is this something others have noticed or even better: any hint
how to get over?

Cheers

Andreas

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160170): 
https://lists.openembedded.org/g/openembedded-core/message/160170
Mute This Topic: https://lists.openembedded.org/mt/88195633/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 4/4] webkitgtk: Add reproducibility fix

2022-01-04 Thread Khem Raj
On Tue, Jan 4, 2022 at 6:16 AM Richard Purdie
 wrote:
>
> When the date rolled from one year to another this highlighted a 
> reproducibility
> issue. This could be better fixed by using SOURCE_DATE_EPOCH from the 
> environment
> but I'm not sure how you do that in ruby. Help from someone with that 
> knowledge
> to submit that upstream very welcome.
>
> Signed-off-by: Richard Purdie 
> ---
>  .../webkit/webkitgtk/reproducibility.patch| 22 +++
>  meta/recipes-sato/webkit/webkitgtk_2.34.2.bb  |  1 +
>  2 files changed, 23 insertions(+)
>  create mode 100644 meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch 
> b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
> new file mode 100644
> index 000..e866a1a193a
> --- /dev/null
> +++ b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
> @@ -0,0 +1,22 @@
> +Injection a year based on the current date isn't reproducible. Hack this
> +to a specific year for now for reproducibilty and to avoid autobuilder 
> failures.
> +
> +The correct fix would be to use SOURCE_DATE_EPOCH from the environment and
> +then this could be submitted upstream, sadly my ruby isn't up to that.
> +
> +Upstream-Status: Pending [could be reworked]
> +Signed-off-by: Richard Purdie 
> +
> +Index: webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb
> +===
> +--- webkitgtk-2.34.2.orig/Source/JavaScriptCore/generator/GeneratedFile.rb
>  webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb
> +@@ -25,7 +25,7 @@ require 'date'
> + require 'digest'
> +
> + $LICENSE = <<-EOF
> +-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved.
> ++Copyright (C) 2021 Apple Inc. All rights reserved.

perhaps eliminating the year completely is better.

> +
> + Redistribution and use in source and binary forms, with or without
> + modification, are permitted provided that the following conditions
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb 
> b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> index a9b151e3c3c..aa071395227 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
> @@ -18,6 +18,7 @@ SRC_URI = 
> "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
> file://reduce-memory-overheads.patch \
> file://musl-lower-stack-usage.patch \
> file://0001-Fix-build-without-opengl-or-es.patch \
> +   file://reproducibility.patch \
> "
>
>  SRC_URI[sha256sum] = 
> "584677d6e7cae12e27cdcc8e05b4cf73b54849a24afc3d7a40cec91016deff00"
> --
> 2.32.0
>
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160169): 
https://lists.openembedded.org/g/openembedded-core/message/160169
Mute This Topic: https://lists.openembedded.org/mt/88190252/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] Yocto Project Status WW01`22

2022-01-04 Thread Stephen Jolley
Current Dev Position: YP 3.5 M2

Next Deadline: 17th Jan. 2022 YP 3.5 M2 build

 

Next Team Meetings:

*   Bug Triage meeting Thursday Jan. 6th 7:30 am PDT (

https://zoom.us/j/454367603?pwd=ZGxoa2ZXL3FkM3Y0bFd5aVpHVVZ6dz09)
*   Monthly Project Meeting Tuesday Jan. 4th at 8 am PDT (

https://zoom.us/j/990892712?pwd=cHU1MjhoM2x6ck81bkcrYjRrcmJsUT09
 )
*   Weekly Engineering Sync Tuesday Jan. 11th at 8 am PDT (

https://zoom.us/j/990892712?pwd=cHU1MjhoM2x6ck81bkcrYjRrcmJsUT09
 )
*   Twitch -  See https://www.twitch.tv/theyoctojester

 

Key Status/Updates:

*   YP 3.5 M1 and YP 3.1.13 were released.
*   We have two weeks before the 3.5 M2 build.
*   The autobuilder has undergone significant changes. There are some
not unexpected  issues with the new distros now in use there such as python
3.12 deprecations which trigger warnings on Fedora 35. One of the workers
does appear to have what is potentially a hardware issue and not all the
workers have migrated to SSDs yet (about 50% so far) so there will be some
further disruption as this takes place.
*   On modern kernels, we now have the capability within bitbake to
disable networking on a per task basis without extra user privileges. There
is discussion on the mailing list on how we should enable this and whether
it should be on an opt-in or opt-out basis. There is a proof of concept
patchset for the opt-out basis and some good arguments for and against the
opt-in approach.
*   The new year triggered some reproducible build failures in openssl
and webkit due to changing copyright years in the source files, which is a
sign of how detailed our reproducibility tests are.
*   There is a patchset implementing reproducibility for go which is a
welcome improvement and much less invasive than previous approaches.
*   Intermittent issues continue to be at record high levels and help is
very much welcome in trying to resolve them. You can see the list of
failures we're continuing to see by searching for the "AB-INT" tag in
bugzilla:

https://bugzilla.yoctoproject.org/buglist.cgi?quicksearch=AB-INT

 

Ways to contribute:

*   There are bugs identified as possible for newcomers to the project:

https://wiki.yoctoproject.org/wiki/Newcomers
*   There are bugs that are currently unassigned for YP 3.5. See:

https://wiki.yoctoproject.org/wiki/Bug_Triage#Medium.2B_3.5_Unassigned_Enhan
cements.2FBugs
*   We'd welcome new maintainers for recipes in OE-Core. Please see the
list at:

http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/conf/distro/include/main
tainers.inc and discuss with the existing maintainer, or ask on the OE-Core
mailing list. We will likely move a chunk of these to "Unassigned" soon to
help facilitate this.

 

YP 3.5 Milestone Dates:

*   YP 3.5 M1 is released
*   YP 3.5 M2 build date 2022/01/17
*   YP 3.5 M2 Release date 2022/01/28
*   YP 3.5 M3 build date 2022/02/21
*   YP 3.5 M3 Release date 2022/03/04
*   YP 3.5 M4 build date 2022/04/04
*   YP 3.5 M4 Release date 2022/04/29

 

Upcoming dot releases:

*   YP 3.1.13 is released
*   YP 3.1.14 build date 2022/01/24
*   YP 3.1.14 Release date 2022/02/04
*   YP 3.4.2 build date 2022/02/07
*   YP 3.4.2 Release date 2022/02/18
*   YP 3.3.5 build date 2022/02/14
*   YP 3.3.5 Release date 2022/02/25
*   YP 3.1.15 build date 2022/03/14
*   YP 3.1.15 Release date 2022/03/25
*   YP 3.4.3 build date 2022/03/21
*   YP 3.4.3 Release date 2022/04/01
*   YP 3.3.6 build date 2022/03/28
*   YP 3.3.6 Release date 2022/04/08
*   YP 3.1.16 build date 2022/04/25
*   YP 3.1.16 Release date 2022/05/06

 

Tracking Metrics:

*   WDD 2653 (last week 2653) (

https://wiki.yoctoproject.org/charts/combo.html)
*   OE-Core/Poky Patch Metrics

*   Total patches found: 1227 (last week 1230)
*   Patches in the Pending State: 347 (28%) [last week 348 (28%)]

 

The Yocto Project's technical governance is through its Technical Steering
Committee, more information is available at:

 
https://wiki.yoctoproject.org/wiki/TSC

 

The Status reports are now stored on the wiki at:

https://wiki.yoctoproject.org/wiki/Weekly_Status

 

[If anyone has suggestions for other information you'd like to see on this
weekl

Re: [OE-core] [PATCH 4/4] webkitgtk: Add reproducibility fix

2022-01-04 Thread Quentin Schulz

Hi Richard,

On 1/4/22 15:16, Richard Purdie wrote:

When the date rolled from one year to another this highlighted a reproducibility
issue. This could be better fixed by using SOURCE_DATE_EPOCH from the 
environment
but I'm not sure how you do that in ruby. Help from someone with that knowledge
to submit that upstream very welcome.



Small side note, it seems like "copyright years" aren't actually any 
useful, see https://hynek.me/til/copyright-years/ and 
https://www.linuxfoundation.org/blog/copyright-notices-in-open-source-software-projects/.


I guess we can just notify the project to stop using the date entirely 
in the copyright to avoid those issues and hope they'll just agree :)


Cheers,
Quentin

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160167): 
https://lists.openembedded.org/g/openembedded-core/message/160167
Mute This Topic: https://lists.openembedded.org/mt/88190252/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] [PATCH v2] libsdl2: Move to CMake build

2022-01-04 Thread Andreas Müller
Signed-off-by: Andreas Müller 
---
v1->v2:
* Fix '==' typo - Thanks Jacob!
* remove autotools patch

 .../libsdl2/libsdl2/more-gen-depends.patch| 60 ---
 .../libsdl2/libsdl2_2.0.18.bb | 51 ++--
 2 files changed, 19 insertions(+), 92 deletions(-)
 delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch

diff --git a/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch 
b/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch
deleted file mode 100644
index 8ca52ebde7..00
--- a/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From e0f4b6d18ce6f025c78773e909b9c395ad833c7a Mon Sep 17 00:00:00 2001
-From: Ross Burton 
-Date: Mon, 29 Jul 2019 08:38:32 +0800
-Subject: [PATCH] configure: fix dependencies
-
-Many source files include e.g. wayland-protocols.h which should be found in the
-sysroot but SDL wants to build its own headers from the XML definitions.
-
-However the rules to generate those headers are only dependencies of the
-top-level libSDL2.la object so can be built in parallel with the rest of the
-objects, which can lead to interesting errors if the header is parsed by the
-compiler whilst it's being written by another process:
-
-| gen/wayland-client-protocol.h:3: error: unterminated #ifndef
-|  #ifndef WAYLAND_CLIENT_PROTOCOL_H
-
-Solve this by adding more dependencies so the generated files are built before
-the primary objects.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton 
-[Moved to configure.ac]
-Signed-off-by: Anuj Mittal 

- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9e782c6..997915a 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -4061,7 +4061,7 @@ DEPENDS=`echo $SOURCES | tr ' ' '\n'`
- for EXT in asm cc m c S; do
- OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.'$EXT',$(objects)/\1.lo,g'`
- DEPENDS=`echo "$DEPENDS" | sed "s,^\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.$EXT\\$,
--\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created
-+\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created \\$(GEN_OBJECTS)
-   \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) 
\\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- done
- 
-@@ -4078,14 +4078,14 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.lo,g'`
- SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.c,
--\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created
-+\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)
-   \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) 
\\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
- SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
- SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ 
]]*\)\.c,$(objects)/\1.lo,g'`
- SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ 
]]*\\)\\.c,
--\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created
-+\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)
-   \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) 
\\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- # Set runtime shared library paths as needed
--- 
-2.7.4
-
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb 
b/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
index 5e645b443c..1e22a0593f 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
@@ -16,28 +16,25 @@ LIC_FILES_CHKSUM:append = " 
${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', 'f
 
 PROVIDES = "virtual/libsdl2"
 
-SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
-   file://more-gen-depends.patch \
-"
+SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz";
 
 S = "${WORKDIR}/SDL2-${PV}"
 
 SRC_URI[sha256sum] = 
"94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c"
 
-inherit autotools lib_package binconfig-disabled pkgconfig
+inherit cmake lib_package binconfig-disabled pkgconfig
 
 BINCONFIG = "${bindir}/sdl2-config"
 
 CVE_PRODUCT = "simple_directmedia_layer sdl"
 
-EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
---disable-diskaudio --disable-nas --disable-esd-shared 
--disable-esdtest \
---disable-video-dummy \
---disable-video-rpi \
---enable-pthreads \
---disable-rpath \
---disable-sndio \
---disable-fcitx --disable-ibus \
+EXTRA_OECMAKE = "-DSDL_OSS=OFF -DSDL_ESD=OFF -DSDL_ARTS=OFF \
+ -DSDL_DISKAUDIO=OFF -DSDL_NAS=OFF -DSDL_ESD_SHARED=OFF \
+ 

[OE-core] [PATCH 2/4] meson: Handle qemu riscv issues

2022-01-04 Thread Richard Purdie
In qemu, they merged the 32 and 64 bit riscv variants into one target for meson
purposes but this isn't officially supported by upstream meson. In normal builds
this would just be a warning but in OE, this is fatal.

Avoid the fatal errors for now and build as qemu intended whilst this is 
resolved
by the upstreams.

Signed-off-by: Richard Purdie 
---
 .../0001-Make-CPU-family-warnings-fatal.patch | 28 +++
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git 
a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch 
b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index c5be526b103..848dccfbe72 100644
--- 
a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ 
b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -11,30 +11,34 @@ Signed-off-by: Ross Burton 
  mesonbuild/environment.py | 4 +---
  2 files changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 307aac3..66fb7ec 100644
 a/mesonbuild/envconfig.py
-+++ b/mesonbuild/envconfig.py
-@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject):
+Index: meson-0.60.2/mesonbuild/envconfig.py
+===
+--- meson-0.60.2.orig/mesonbuild/envconfig.py
 meson-0.60.2/mesonbuild/envconfig.py
+@@ -266,8 +266,8 @@ class MachineInfo(HoldableObject):
+ 'but is missing {}.'.format(minimum_literal - set(literal)))
  
  cpu_family = literal['cpu_family']
- if cpu_family not in known_cpu_families:
+-if cpu_family not in known_cpu_families:
 -mlog.warning(f'Unknown CPU family {cpu_family}, please report 
this at https://github.com/mesonbuild/meson/issues/new')
++if cpu_family not in known_cpu_families and cpu_family != "riscv":
 +raise EnvironmentException('Unknown CPU family {}, see 
https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for 
directions.'.format(cpu_family))
  
  endian = literal['endian']
  if endian not in ('little', 'big'):
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 71286a5..179917e 100644
 a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -352,9 +352,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+Index: meson-0.60.2/mesonbuild/environment.py
+===
+--- meson-0.60.2.orig/mesonbuild/environment.py
 meson-0.60.2/mesonbuild/environment.py
+@@ -354,10 +354,8 @@ def detect_cpu_family(compilers: Compile
+ if any_compiler_has_define(compilers, '__64BIT__'):
  trial = 'ppc64'
  
- if trial not in known_cpu_families:
+-if trial not in known_cpu_families:
 -mlog.warning(f'Unknown CPU family {trial!r}, please report this at '
 - 'https://github.com/mesonbuild/meson/issues/new with the 
'
 - 'output of `uname -a` and `cat /proc/cpuinfo`')
++if trial not in known_cpu_families and trail != "riscv":
 +raise EnvironmentException('Unknown CPU family %s, see 
https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
  
  return trial
-- 
2.32.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160163): 
https://lists.openembedded.org/g/openembedded-core/message/160163
Mute This Topic: https://lists.openembedded.org/mt/88190249/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/4] webkitgtk: Add reproducibility fix

2022-01-04 Thread Richard Purdie
When the date rolled from one year to another this highlighted a reproducibility
issue. This could be better fixed by using SOURCE_DATE_EPOCH from the 
environment
but I'm not sure how you do that in ruby. Help from someone with that knowledge
to submit that upstream very welcome.

Signed-off-by: Richard Purdie 
---
 .../webkit/webkitgtk/reproducibility.patch| 22 +++
 meta/recipes-sato/webkit/webkitgtk_2.34.2.bb  |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/reproducibility.patch

diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch 
b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
new file mode 100644
index 000..e866a1a193a
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
@@ -0,0 +1,22 @@
+Injection a year based on the current date isn't reproducible. Hack this
+to a specific year for now for reproducibilty and to avoid autobuilder 
failures.
+
+The correct fix would be to use SOURCE_DATE_EPOCH from the environment and
+then this could be submitted upstream, sadly my ruby isn't up to that.
+
+Upstream-Status: Pending [could be reworked]
+Signed-off-by: Richard Purdie 
+
+Index: webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb
+===
+--- webkitgtk-2.34.2.orig/Source/JavaScriptCore/generator/GeneratedFile.rb
 webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb
+@@ -25,7 +25,7 @@ require 'date'
+ require 'digest'
+ 
+ $LICENSE = <<-EOF
+-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved.
++Copyright (C) 2021 Apple Inc. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
index a9b151e3c3c..aa071395227 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb
@@ -18,6 +18,7 @@ SRC_URI = 
"https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://reduce-memory-overheads.patch \
file://musl-lower-stack-usage.patch \
file://0001-Fix-build-without-opengl-or-es.patch \
+   file://reproducibility.patch \
"
 
 SRC_URI[sha256sum] = 
"584677d6e7cae12e27cdcc8e05b4cf73b54849a24afc3d7a40cec91016deff00"
-- 
2.32.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160165): 
https://lists.openembedded.org/g/openembedded-core/message/160165
Mute This Topic: https://lists.openembedded.org/mt/88190252/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/4] package_deb/ipk/rpm: Add more minimal do_build dependencies back

2022-01-04 Thread Richard Purdie
The dependencies for do_build became a little too minimal after the
removal of recrdeptask since "bitbake go" would not package go-runtime
despite it being in DEPENDS and the resulting package having a dependency
on it.

A reasonable compromise is probably rdeptask instead of recrdeptask
which is a lot lower overhead but makes the build target more useful
and importantly, lets world builds do what you'd expect them to.

Signed-off-by: Richard Purdie 
---
 meta/classes/package_deb.bbclass | 1 +
 meta/classes/package_ipk.bbclass | 1 +
 meta/classes/package_rpm.bbclass | 1 +
 3 files changed, 3 insertions(+)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 1ae6393d37d..2e75e222bcb 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -316,6 +316,7 @@ do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}"
 do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}"
 do_package_write_deb[depends] += 
"${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 
'do_populate_sysroot')}"
 addtask package_write_deb after do_packagedata do_package 
do_deploy_source_date_epoch before do_build
+do_build[rdeptask] += "do_package_write_deb"
 
 PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot"
 PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot"
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 902b7f94c84..f67cb0e5c90 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -275,6 +275,7 @@ do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}"
 do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}"
 do_package_write_ipk[depends] += 
"${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 
'do_populate_sysroot')}"
 addtask package_write_ipk after do_packagedata do_package 
do_deploy_source_date_epoch before do_build
+do_build[rdeptask] += "do_package_write_ipk"
 
 PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot"
 PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot"
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b0754421a33..e9ff1f7e65c 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -749,6 +749,7 @@ do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}"
 do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}"
 do_package_write_rpm[depends] += 
"${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 
'do_populate_sysroot')}"
 addtask package_write_rpm after do_packagedata do_package 
do_deploy_source_date_epoch before do_build
+do_build[rdeptask] += "do_package_write_rpm"
 
 PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot"
 PACKAGEINDEXDEPS += "createrepo-c-native:do_populate_sysroot"
-- 
2.32.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160162): 
https://lists.openembedded.org/g/openembedded-core/message/160162
Mute This Topic: https://lists.openembedded.org/mt/88190248/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/4] openssl: Add reproducibility fix

2022-01-04 Thread Richard Purdie
When the date rolled from one year to another, it highlighted a reproducibility
issue in openssl. Patch a workaround for this to avoid autobuilder failures. 
Help
submitting upstream welcome.

Signed-off-by: Richard Purdie 
---
 .../openssl/openssl/reproducibility.patch | 22 +++
 .../openssl/openssl_3.0.1.bb  |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 
meta/recipes-connectivity/openssl/openssl/reproducibility.patch

diff --git a/meta/recipes-connectivity/openssl/openssl/reproducibility.patch 
b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch
new file mode 100644
index 000..8accbc9df20
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch
@@ -0,0 +1,22 @@
+Using localtime() means the output can depend on the timezone of the build 
machine.
+Using gmtime() is safer. For complete reproducibility use SOURCE_DATE_EPOCH if 
set.
+
+Signed-off-by: Richard Purdie 
+Upstream-Status: Pending [should be suitable]
+
+Index: openssl-3.0.1/apps/progs.pl
+===
+--- openssl-3.0.1.orig/apps/progs.pl
 openssl-3.0.1/apps/progs.pl
+@@ -21,7 +21,10 @@ die "Unrecognised option, must be -C or
+ my %commands = ();
+ my $cmdre= qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/;
+ my $apps_openssl = shift @ARGV;
+-my $YEAR = [localtime()]->[5] + 1900;
++my $YEAR = [gmtime()]->[5] + 1900;
++if (defined($ENV{SOURCE_DATE_EPOCH}) && $ENV{SOURCE_DATE_EPOCH} !~ /\D/) {
++$YEAR = [gmtime($ENV{SOURCE_DATE_EPOCH})]->[5] + 1900;
++}
+ 
+ # because the program apps/openssl has object files as sources, and
+ # they then have the corresponding C files as source, we need to chain
diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.1.bb 
b/meta/recipes-connectivity/openssl/openssl_3.0.1.bb
index 162435480c4..7727ec43e87 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.0.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.0.1.bb
@@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz 
\

file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
file://afalg.patch \
file://0001-Configure-do-not-tweak-mips-cflags.patch \
+   file://reproducibility.patch \
"
 
 SRC_URI:append:class-nativesdk = " \
-- 
2.32.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160164): 
https://lists.openembedded.org/g/openembedded-core/message/160164
Mute This Topic: https://lists.openembedded.org/mt/88190250/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 05/24] e2fsprogs: upgrade 1.46.4 -> 1.46.5

2022-01-04 Thread Richard Purdie
On Mon, 2022-01-03 at 13:18 -0300, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador 
> ---
>  ...ct_io-expect-correct-expected-output.patch | 69 ---
>  ...-missing-check-for-permission-denied.patch |  3 +-
>  .../e2fsprogs/e2fsprogs/quiet-debugfs.patch   |  3 +-
>  ...2fsprogs_1.46.4.bb => e2fsprogs_1.46.5.bb} |  9 +--
>  4 files changed, 7 insertions(+), 77 deletions(-)
>  delete mode 100644 
> meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
>  rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.46.4.bb => 
> e2fsprogs_1.46.5.bb} (94%)

Unfortunately this also breaks all the ptests:

https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2963/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2691/steps/12/logs/stdio

(arm and x86)

Cheers,

Richard


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160161): 
https://lists.openembedded.org/g/openembedded-core/message/160161
Mute This Topic: https://lists.openembedded.org/mt/88115417/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] libsdl2: Move to CMake build

2022-01-04 Thread Andreas Müller
Please ignore - it went out too early

On Tue, Jan 4, 2022 at 10:21 AM Andreas Müller  wrote:
>
> Signed-off-by: Andreas Müller 
> ---
>  .../libsdl2/libsdl2_2.0.18.bb | 47 +++
>  1 file changed, 18 insertions(+), 29 deletions(-)
>
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb 
> b/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
> index 5e645b443c..d1af282a1c 100644
> --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
> +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
> @@ -24,20 +24,19 @@ S = "${WORKDIR}/SDL2-${PV}"
>
>  SRC_URI[sha256sum] = 
> "94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c"
>
> -inherit autotools lib_package binconfig-disabled pkgconfig
> +inherit cmake lib_package binconfig-disabled pkgconfig
>
>  BINCONFIG = "${bindir}/sdl2-config"
>
>  CVE_PRODUCT = "simple_directmedia_layer sdl"
>
> -EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
> ---disable-diskaudio --disable-nas --disable-esd-shared 
> --disable-esdtest \
> ---disable-video-dummy \
> ---disable-video-rpi \
> ---enable-pthreads \
> ---disable-rpath \
> ---disable-sndio \
> ---disable-fcitx --disable-ibus \
> +EXTRA_OECMAKE = "-DSDL_OSS=OFF -DSDL_ESD=OFF -DSDL_ARTS=OFF \
> + -DSDL_DISKAUDIO=OFF -DSDL_NAS=OFF -DSDL_ESD_SHARED=OFF \
> + -DSDL_DUMMYVIDEO=OFF \
> + -DSDL_RPI=OFF \
> + -DSDL_PTHREADS=ON \
> + -DSDL_RPATH=OFF \
> + -DSDL_SNDIO=OFF \
>  "
>
>  # opengl packageconfig factored out to make it easy for distros
> @@ -52,27 +51,17 @@ PACKAGECONFIG ??= " \
>  ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', 
> d)} \
>  ${@bb.utils.contains("TUNE_FEATURES", "neon","arm-neon","",d)} \
>  "
> -PACKAGECONFIG[alsa]   = "--enable-alsa 
> --disable-alsatest,--disable-alsa,alsa-lib,"
> -PACKAGECONFIG[arm-neon]   = "--enable-arm-neon,--disable-arm-neon"
> -PACKAGECONFIG[directfb]   = 
> "--enable-video-directfb,--disable-video-directfb,directfb,directfb"
> -PACKAGECONFIG[gles2]  = 
> "--enable-video-opengles,--disable-video-opengles,virtual/libgles2"
> -PACKAGECONFIG[jack]   = "--enable-jack,--disable-jack,jack"
> -PACKAGECONFIG[kmsdrm] = 
> "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm"
> -PACKAGECONFIG[opengl] = 
> "--enable-video-opengl,--disable-video-opengl,virtual/libgl"
> -PACKAGECONFIG[pulseaudio] = 
> "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
> -PACKAGECONFIG[wayland]= 
> "--enable-video-wayland,--disable-video-wayland,wayland-native wayland 
> wayland-protocols libxkbcommon"
> -PACKAGECONFIG[x11]= 
> "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr 
> libxrender"
> +PACKAGECONFIG[alsa]   = "-DSDL_ALSA=ON,-DSDL_ALSA=OFF,alsa-lib,"
> +PACKAGECONFIG[arm-neon]   = "-DSDL_ARMNEON=ON,-DSDL_ARMNEON=OFF"
> +PACKAGECONFIG[directfb]   = 
> "-DSDL_DIRECTFB=ON,-DSDL_DIRECTFB=OFF,directfb,directfb"
> +PACKAGECONFIG[gles2]  = 
> "-DSDL_OPENGLES=ON,-DSDL_OPENGLES=OFF,virtual/libgles2"
> +PACKAGECONFIG[jack]   = "-DSDL_JACK=ON,-DSDL_JACK=OFF,jack"
> +PACKAGECONFIG[kmsdrm] = "-DSDL_KMSDRM=ON,-DSDL_KMSDRM=OFF,libdrm 
> virtual/libgbm"
> +PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/libgl"
> +PACKAGECONFIG[pulseaudio] = 
> "-DSDL_PULSEAUDIO=ON,-DSDL_PULSEAUDIO=OFF,pulseaudio"
> +PACKAGECONFIG[wayland]= 
> "-DSDL_WAYLAND=ON,-DSDL_WAYLAND=OFF,wayland-native wayland wayland-protocols 
> libxkbcommon"
> +PACKAGECONFIG[x11]= "-DSDL_X11=ON,-DSDL_X11=OFF,virtual/libx11 
> libxext libxrandr libxrender"
>
> -EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
>  CFLAGS:append:class-native = " -DNO_SHARED_MEMORY"
>
> -do_configure:prepend() {
> -# Remove old libtool macros.
> -MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 
> ltversion.m4"
> -for i in ${MACROS}; do
> -   rm -f ${S}/acinclude/$i
> -done
> -export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
> -}
> -
>  BBCLASSEXTEND = "native nativesdk"
> --
> 2.31.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160160): 
https://lists.openembedded.org/g/openembedded-core/message/160160
Mute This Topic: https://lists.openembedded.org/mt/88180295/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] [V3][PATCH] rpm: fix CVE-2021-3521

2022-01-04 Thread Richard Purdie
On Tue, 2022-01-04 at 09:48 +0800, Changqing Li wrote:
> On 12/31/21 11:38 PM, Richard Purdie wrote:
> > [Please note: This e-mail is from an EXTERNAL e-mail address]
> > 
> > On Fri, 2021-12-31 at 10:21 +0800, Changqing Li wrote:
> > > From: Changqing Li 
> > > 
> > > Signed-off-by: Changqing Li 
> > > ---
> > >   .../rpm/files/0001-CVE-2021-3521.patch|  57 +++
> > >   .../rpm/files/0002-CVE-2021-3521.patch|  64 
> > >   .../rpm/files/0003-CVE-2021-3521.patch| 329 ++
> > >   meta/recipes-devtools/rpm/rpm_4.17.0.bb   |   3 +
> > >   4 files changed, 453 insertions(+)
> > >   create mode 100644 
> > > meta/recipes-devtools/rpm/files/0001-CVE-2021-3521.patch
> > >   create mode 100644 
> > > meta/recipes-devtools/rpm/files/0002-CVE-2021-3521.patch
> > >   create mode 100644 
> > > meta/recipes-devtools/rpm/files/0003-CVE-2021-3521.patch
> > > 
> > > diff --git a/meta/recipes-devtools/rpm/files/0001-CVE-2021-3521.patch 
> > > b/meta/recipes-devtools/rpm/files/0001-CVE-2021-3521.patch
> > > new file mode 100644
> > > index 00..b374583017
> > > --- /dev/null
> > > +++ b/meta/recipes-devtools/rpm/files/0001-CVE-2021-3521.patch
> > > @@ -0,0 +1,57 @@
> > > +From 9a6871126f472feea057d5f803505ec8cc78f083 Mon Sep 17 00:00:00 2001
> > > +From: Panu Matilainen 
> > > +Date: Thu, 30 Sep 2021 09:56:20 +0300
> > > +Subject: [PATCH 1/3] Refactor pgpDigParams construction to helper 
> > > function
> > > +
> > > +No functional changes, just to reduce code duplication and needed by
> > > +the following commits.
> > > +
> > > +CVE: CVE-2021-3521
> > > +Upstream-Status: 
> > > Backport[https://github.com/rpm-software-management/rpm/commit/9f03f42e2]
> > > +
> > > +Signed-off-by: Changqing Li 
> > > +---
> > > + rpmio/rpmpgp.c | 13 +
> > > + 1 file changed, 9 insertions(+), 4 deletions(-)
> > > +
> > > +diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
> > > +index d0688ebe9a..e472b5320f 100644
> > > +--- a/rpmio/rpmpgp.c
> > >  b/rpmio/rpmpgp.c
> > > +@@ -1041,6 +1041,13 @@ unsigned int pgpDigParamsAlgo(pgpDigParams digp, 
> > > unsigned int algotype)
> > > + return algo;
> > > + }
> > > +
> > > ++static pgpDigParams pgpDigParamsNew(uint8_t tag)
> > > ++{
> > > ++pgpDigParams digp = xcalloc(1, sizeof(*digp));
> > > ++digp->tag = tag;
> > > ++return digp;
> > > ++}
> > > ++
> > > + int pgpPrtParams(const uint8_t * pkts, size_t pktlen, unsigned int 
> > > pkttype,
> > > +  pgpDigParams * ret)
> > > + {
> > > +@@ -1058,8 +1065,7 @@ int pgpPrtParams(const uint8_t * pkts, size_t 
> > > pktlen, unsigned int pkttype,
> > > + if (pkttype && pkt.tag != pkttype) {
> > > + break;
> > > + } else {
> > > +-digp = xcalloc(1, sizeof(*digp));
> > > +-digp->tag = pkt.tag;
> > > ++digp = pgpDigParamsNew(pkt.tag);
> > > + }
> > > + }
> > > +
> > > +@@ -1105,8 +,7 @@ int pgpPrtParamsSubkeys(const uint8_t *pkts, 
> > > size_t pktlen,
> > > + digps = xrealloc(digps, alloced * sizeof(*digps));
> > > + }
> > > +
> > > +-digps[count] = xcalloc(1, sizeof(**digps));
> > > +-digps[count]->tag = PGPTAG_PUBLIC_SUBKEY;
> > > ++digps[count] = pgpDigParamsNew(PGPTAG_PUBLIC_SUBKEY);
> > > + /* Copy UID from main key to subkey */
> > > + digps[count]->userid = xstrdup(mainkey->userid);
> > > +
> > > +--
> > > +2.17.1
> > > +
> > > diff --git a/meta/recipes-devtools/rpm/files/0002-CVE-2021-3521.patch 
> > > b/meta/recipes-devtools/rpm/files/0002-CVE-2021-3521.patch
> > > new file mode 100644
> > > index 00..b93a1d5404
> > > --- /dev/null
> > > +++ b/meta/recipes-devtools/rpm/files/0002-CVE-2021-3521.patch
> > > @@ -0,0 +1,64 @@
> > > +From c4b1bee51bbdd732b94b431a951481af99117703 Mon Sep 17 00:00:00 2001
> > > +From: Panu Matilainen 
> > > +Date: Thu, 30 Sep 2021 09:51:10 +0300
> > > +Subject: [PATCH 2/3] Process MPI's from all kinds of signatures
> > > +
> > > +No immediate effect but needed by the following commits.
> > > +
> > > +CVE: CVE-2021-3521
> > > +Upstream-Status: 
> > > Backport[https://github.com/rpm-software-management/rpm/commit/b5e8bc74b]
> > > +
> > The new tests also trigger for the missing space above after Backport. It 
> > does
> > make me wonder why you don't see those test failures. I've tweaked the 
> > patches
> > in master-next to fix this.
> Thanks.
> 
> I don't receive mail about the failure, seems the patchwork is not working.

You should have seen the error when you tried building/testing the patch
locally...

Cheers,

Richard



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160159): 
https://lists.openembedded.org/g/openembedded-core/message/160159
Mute This Topic: https://lists.openembedded.org/mt/88047255/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[a

[OE-core] [PATCH] libsdl2: Move to CMake build

2022-01-04 Thread Andreas Müller
Signed-off-by: Andreas Müller 
---
 .../libsdl2/libsdl2_2.0.18.bb | 47 +++
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb 
b/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
index 5e645b443c..d1af282a1c 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
@@ -24,20 +24,19 @@ S = "${WORKDIR}/SDL2-${PV}"
 
 SRC_URI[sha256sum] = 
"94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c"
 
-inherit autotools lib_package binconfig-disabled pkgconfig
+inherit cmake lib_package binconfig-disabled pkgconfig
 
 BINCONFIG = "${bindir}/sdl2-config"
 
 CVE_PRODUCT = "simple_directmedia_layer sdl"
 
-EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
---disable-diskaudio --disable-nas --disable-esd-shared 
--disable-esdtest \
---disable-video-dummy \
---disable-video-rpi \
---enable-pthreads \
---disable-rpath \
---disable-sndio \
---disable-fcitx --disable-ibus \
+EXTRA_OECMAKE = "-DSDL_OSS=OFF -DSDL_ESD=OFF -DSDL_ARTS=OFF \
+ -DSDL_DISKAUDIO=OFF -DSDL_NAS=OFF -DSDL_ESD_SHARED=OFF \
+ -DSDL_DUMMYVIDEO=OFF \
+ -DSDL_RPI=OFF \
+ -DSDL_PTHREADS=ON \
+ -DSDL_RPATH=OFF \
+ -DSDL_SNDIO=OFF \
 "
 
 # opengl packageconfig factored out to make it easy for distros
@@ -52,27 +51,17 @@ PACKAGECONFIG ??= " \
 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', 
d)} \
 ${@bb.utils.contains("TUNE_FEATURES", "neon","arm-neon","",d)} \
 "
-PACKAGECONFIG[alsa]   = "--enable-alsa 
--disable-alsatest,--disable-alsa,alsa-lib,"
-PACKAGECONFIG[arm-neon]   = "--enable-arm-neon,--disable-arm-neon"
-PACKAGECONFIG[directfb]   = 
"--enable-video-directfb,--disable-video-directfb,directfb,directfb"
-PACKAGECONFIG[gles2]  = 
"--enable-video-opengles,--disable-video-opengles,virtual/libgles2"
-PACKAGECONFIG[jack]   = "--enable-jack,--disable-jack,jack"
-PACKAGECONFIG[kmsdrm] = 
"--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm"
-PACKAGECONFIG[opengl] = 
"--enable-video-opengl,--disable-video-opengl,virtual/libgl"
-PACKAGECONFIG[pulseaudio] = 
"--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
-PACKAGECONFIG[wayland]= 
"--enable-video-wayland,--disable-video-wayland,wayland-native wayland 
wayland-protocols libxkbcommon"
-PACKAGECONFIG[x11]= 
"--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr 
libxrender"
+PACKAGECONFIG[alsa]   = "-DSDL_ALSA=ON,-DSDL_ALSA=OFF,alsa-lib,"
+PACKAGECONFIG[arm-neon]   = "-DSDL_ARMNEON=ON,-DSDL_ARMNEON=OFF"
+PACKAGECONFIG[directfb]   = 
"-DSDL_DIRECTFB=ON,-DSDL_DIRECTFB=OFF,directfb,directfb"
+PACKAGECONFIG[gles2]  = 
"-DSDL_OPENGLES=ON,-DSDL_OPENGLES=OFF,virtual/libgles2"
+PACKAGECONFIG[jack]   = "-DSDL_JACK=ON,-DSDL_JACK=OFF,jack"
+PACKAGECONFIG[kmsdrm] = "-DSDL_KMSDRM=ON,-DSDL_KMSDRM=OFF,libdrm 
virtual/libgbm"
+PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/libgl"
+PACKAGECONFIG[pulseaudio] = 
"-DSDL_PULSEAUDIO=ON,-DSDL_PULSEAUDIO=OFF,pulseaudio"
+PACKAGECONFIG[wayland]= "-DSDL_WAYLAND=ON,-DSDL_WAYLAND=OFF,wayland-native 
wayland wayland-protocols libxkbcommon"
+PACKAGECONFIG[x11]= "-DSDL_X11=ON,-DSDL_X11=OFF,virtual/libx11 libxext 
libxrandr libxrender"
 
-EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
 CFLAGS:append:class-native = " -DNO_SHARED_MEMORY"
 
-do_configure:prepend() {
-# Remove old libtool macros.
-MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-for i in ${MACROS}; do
-   rm -f ${S}/acinclude/$i
-done
-export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
-}
-
 BBCLASSEXTEND = "native nativesdk"
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160158): 
https://lists.openembedded.org/g/openembedded-core/message/160158
Mute This Topic: https://lists.openembedded.org/mt/88180295/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] xserver-xorg: update to 21.1.2

2022-01-04 Thread Zoltan Boszormenyi via lists.openembedded.org

2021. 12. 18. 21:52 keltezéssel, Oleksandr Kravchuk írta:

Signed-off-by: Oleksandr Kravchuk 
---
  .../{xserver-xorg_21.1.1.bb => xserver-xorg_21.1.2.bb}  | 2 +-


21.1.3 was released recently.


  1 file changed, 1 insertion(+), 1 deletion(-)
  rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.1.bb => 
xserver-xorg_21.1.2.bb} (92%)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.2.bb
similarity index 92%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.2.bb
index 196d1edff5..60c18c0a47 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.2.bb
@@ -3,7 +3,7 @@ require xserver-xorg.inc
  SRC_URI += 
"file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
 file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
 "
-SRC_URI[sha256sum] = 
"782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755"
+SRC_URI[sha256sum] = 
"c20bf46a9fe8e74bf4e75430637e58d49a02d806609dc161462bceb1ef7e8db0"
  
  # These extensions are now integrated into the server, so declare the migration

  # path for in-place upgrades.








-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160157): 
https://lists.openembedded.org/g/openembedded-core/message/160157
Mute This Topic: https://lists.openembedded.org/mt/8782/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-