[OE-core] [PATCH v2] ldconfig-native: Add usrmerge support

[Johannes Pointner via lists.openembedded.org]

From: Johannes Pointner 

If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to LIBDIR.
ldconfig-native uses hardcoded paths for SLIBDIR and LIBDIR that are fine for
the not usrmerge case. But if usrmerge is enabled ldconfig-native generates a
ld.so.cache, which is done in rootfs.py, that looks like this:
236 libs found in cache `/etc/ld.so.cache'
   libzstd.so.1 (libc6) => /lib/libzstd.so.1
   libz.so.1 (libc6) => /lib/libz.so.1
   libxtables.so.12 (libc6) => /lib/libxtables.so.12
   libxslt.so.1 (libc6) => /lib/libxslt.so.1
   libxml2.so.2 (libc6) => /lib/libxml2.so.2

This breaks for example the Qt QLibraryInfo paths if Qt is configured
'relocatable' and leads to the issue that the QtWebEngine can find the
QtWebEngineProcess, Qt WebEngine resources,...

Therefore don't let ldconfig-native parse SLIBDIR if it is a symlink.

Signed-off-by: Johannes Pointner 
---
v2: fixed sendemail.from and enhanced explanation

 .../ldconfig-add-usrmerge-support.patch   | 37 +++
 .../glibc/ldconfig-native_2.12.1.bb   |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 
meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch

diff --git 
a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
 
b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
new file mode 100644
index 00..3041d433fd
--- /dev/null
+++ 
b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
@@ -0,0 +1,37 @@
+From 6e543f39f6bec6eb2e02eea02029c7f4ec533b66 Mon Sep 17 00:00:00 2001
+From: Johannes Pointner 
+Date: Fri, 1 Dec 2023 11:02:39 +0100
+Subject: [PATCH] ldconfig: add usrmerge support
+
+Check whether SLIBDIR is a symlink, which is the case if usrmerge
+is enabled, and if so, ignore it.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Johannes Pointner 
+---
+ ldconfig.c | 8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ldconfig.c b/ldconfig.c
+index e826410..72ac67b 100644
+--- a/ldconfig.c
 b/ldconfig.c
+@@ -1371,10 +1371,16 @@ main (int argc, char **argv)
+ 
+   if (!opt_only_cline)
+ {
++  struct stat buf;
++  int ret;
+   parse_conf (config_file, true);
+ 
+   /* Always add the standard search paths.  */
+-  add_system_dir (SLIBDIR);
++  /* Check whether SLIBDIR is a symlink, which is the case if usrmerge
++   is enabled, and if so, ignore it. */
++  ret = lstat(SLIBDIR ,);
++  if(ret == -1 || !S_ISLNK(buf.st_mode))
++add_system_dir (SLIBDIR);
+   if (strcmp (SLIBDIR, LIBDIR))
+   add_system_dir (LIBDIR);
+   add_system_dir (SLIBDIR32);
diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb 
b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
index 4db67c3ad4..85fc87257d 100644
--- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
@@ -16,6 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
file://add-64-bit-flag-for-ELF64-entries.patch \
file://no-aux-cache.patch \
file://add-riscv-support.patch \
+   file://ldconfig-add-usrmerge-support.patch \
 "
 
 
-- 
2.43.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191870): 
https://lists.openembedded.org/g/openembedded-core/message/191870
Mute This Topic: https://lists.openembedded.org/mt/103009101/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 v3] openssh: Add PACKAGECONFIG option to customize sshd mode

[Yu, Mingli]

From: Mingli Yu 

Add systemd-sshd-socket-mode PACKAGECONFIG option to choose sshd.socket
and systemd-sshd-service-mode PACKAGECONFIG option to choose installing
sshd.service.

The systemd-sshd-socket-mode PACKAGECONFIG option is enabled by default
and user can customize the above two PACKAGECONFIG option to choose the
sshd mode.

Signed-off-by: Mingli Yu 
---
 .../openssh/openssh_9.5p1.bb  | 24 ++-
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb 
b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
index 2c1c821ea9..8273cc0f64 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
@@ -50,16 +50,20 @@ INITSCRIPT_NAME:${PN}-sshd = "sshd"
 INITSCRIPT_PARAMS:${PN}-sshd = "defaults 9"
 
 SYSTEMD_PACKAGES = "${PN}-sshd"
-SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service"
+SYSTEMD_SERVICE:${PN}-sshd = 
"${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket', 
'', d)} 
${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service',
 '', d)}"
 
 inherit autotools-brokensep ptest pkgconfig
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+# systemd-sshd-socket-mode means sshd.socket and systemd-sshd-service-mode
+# corresponding to sshd.service
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} 
systemd-sshd-socket-mode"
 PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
 PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
 PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
 PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
 PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
+PACKAGECONFIG[systemd-sshd-socket-mode] = ""
+PACKAGECONFIG[systemd-sshd-service-mode] = ""
 
 EXTRA_AUTORECONF += "--exclude=aclocal"
 
@@ -124,15 +128,23 @@ do_install:append () {
echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
 
install -d ${D}${systemd_system_unitdir}
-   install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_system_unitdir}
-   install -c -m 0644 ${WORKDIR}/sshd.service ${D}${systemd_system_unitdir}
-   install -c -m 0644 ${WORKDIR}/sshd@.service 
${D}${systemd_system_unitdir}
+   if 
${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)};
 then
+   install -c -m 0644 ${WORKDIR}/sshd.socket 
${D}${systemd_system_unitdir}
+   install -c -m 0644 ${WORKDIR}/sshd@.service 
${D}${systemd_system_unitdir}
+   sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+   -e 's,@SBINDIR@,${sbindir},g' \
+   -e 's,@BINDIR@,${bindir},g' \
+   -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
+${D}${systemd_system_unitdir}/sshd.socket
+   elif 
${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','true','false',d)};
 then
+   install -c -m 0644 ${WORKDIR}/sshd.service 
${D}${systemd_system_unitdir}
+   fi
install -c -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_system_unitdir}
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
-e 's,@SBINDIR@,${sbindir},g' \
-e 's,@BINDIR@,${bindir},g' \
-e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
-   ${D}${systemd_system_unitdir}/sshd.socket 
${D}${systemd_system_unitdir}/*.service
+   ${D}${systemd_system_unitdir}/*.service
 
sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
${D}${sysconfdir}/init.d/sshd
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191869): 
https://lists.openembedded.org/g/openembedded-core/message/191869
Mute This Topic: https://lists.openembedded.org/mt/103008224/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] libxcrypt.inc: use alternatives to resolve crypt.3 conflict

[Changqing Li]

From: Changqing Li 

To fix:

Error: Transaction test error:
  file /usr/share/man/man3/crypt.3 from install of
  libcrypt-doc-4.4.33-r0.x86_64 conflicts with file from package
  man-pages-6.04-r0.x86_64

Signed-off-by: Changqing Li 
---
 meta/recipes-core/libxcrypt/libxcrypt.inc | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc 
b/meta/recipes-core/libxcrypt/libxcrypt.inc
index ba93d91aef..1a45df2618 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = 
"file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-alternatives
 
 SRC_URI = 
"git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
 SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf"
@@ -26,4 +26,9 @@ CPPFLAGS:append:class-nativesdk = " -Wno-error"
 API = "--disable-obsolete-api"
 EXTRA_OECONF += "${API}"
 
+ALTERNATIVE_PRIORITY = "200"
+ALTERNATIVE:${PN}-doc = "crypt.3 crypt_r.3"
+ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
+ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3"
+
 BBCLASSEXTEND = "native nativesdk"
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191868): 
https://lists.openembedded.org/g/openembedded-core/message/191868
Mute This Topic: https://lists.openembedded.org/mt/103008188/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] libxcrypt.inc: use alternatives to resolve crypt.3 conflict

[Changqing Li]

On 12/6/23 02:27, Khem Raj wrote:

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know 
the content is safe.

On Tue, Dec 5, 2023 at 3:48 AM Ross Burton  wrote:

On 5 Dec 2023, at 01:41, Changqing Li via 
lists.openembedded.org  
wrote:

From: Changqing Li

To fix:

Error: Transaction test error:
  file /usr/share/man/man3/crypt.3 from install of
  libcrypt-doc-4.4.33-r0.x86_64 conflicts with file from package
  man-pages-6.04-r0.x86_64

This feels like the wrong solution.  It feels like one of these packages has 
the “better” documentation and that should be the one that ships the 
documentation.

right, I think these should be deleted from man-pages recipe, I think
there could be more such conflicts with
man-pages especially from glibc recipe.


In old version of man-pages's README,  it mentioned:

Note that sometimes these pages are duplicates of pages also distributed 
in other

packages. Be careful not to overwrite more up-to-date versions.

So we set man-pages to lower priority,  so the doc in the related 
packages are used.



And if we delete them from man-pages recipes, it will make man-pages 
missing these docs


when eg: libcrypt-doc is not installed.

in man-pages recipe, ALTERNATIVE_PRIORITY set to 100. So I send an V2 to 
update


ALTERNATIVE_PRIORITY of libcrypt-doc to 200.

Regards

Changqing


Ross



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191867): 
https://lists.openembedded.org/g/openembedded-core/message/191867
Mute This Topic: https://lists.openembedded.org/mt/102984309/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] [master][PATCH 2/2] rootfs-postcommands.bbclass: add post func remove_unused_dnf_log_lock

[Changqing Li]

On 12/5/23 17:55, Alexander Kanavin wrote:

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know 
the content is safe.

On Tue, 5 Dec 2023 at 06:46, Changqing Li
  wrote:


So  I add this patch
https://git.openembedded.org/openembedded-core/commit/?id=406a72a9a47c2735b7e18cefc682b1df00d5a9aa
to remove the lock file in rootfs.

Since for dnf-native,  it will not have reboot process,  so it is better
to remove it at post process of rootfs, to  make an clean rootfs.

The review comments that led to the revert are still valid, and this
message does not address them. The concern was that the removal via
rootfs postprocess is too late. If dnf leaves lock files around, they
should be removed just after the dnf execution.


Hi, Alex

Thanks.  Agree that the lock file should be removed after dnf execution. 
This is a bug of dnf. I had raise a bug upstream in Jul:


https://github.com/rpm-software-management/dnf/issues/1963.

This patch more like an workaround before dnf fix this issue, and this 
log_lock.pid in rootfs


has no function impact, just a dirty file in rootfs.

Regards

Sandy


Alex

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

[OE-core] Patchtest results for [PATCH V3] cairo: upgrade 1.16.0 -> 1.18.0

[Patchtest]

Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch 
/home/patchtest/share/mboxes/V3-cairo-upgrade-1.16.0---1.18.0.patch

FAIL: test CVE tag format: Missing or incorrectly formatted CVE tag in patch 
file. Correct or include the CVE tag in the patch with format: "CVE: 
CVE--" (test_patch.TestPatch.test_cve_tag_format)

PASS: pretest src uri left files 
(test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test Signed-off-by presence 
(test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence 
(test_patch.TestPatch.test_signed_off_by_presence)
PASS: test Upstream-Status presence 
(test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence 
(test_mbox.TestMbox.test_commit_message_presence)
PASS: test lic files chksum modified not mentioned 
(test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files 
(test_metadata.TestMetadata.test_src_uri_left_files)

SKIP: pretest pylint: No python related patches, skipping test 
(test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found 
(test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test 
(test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test 
(test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test 
(test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now 
(test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test 
(test_metadata.TestMetadata.test_summary_presence)
SKIP: test target mailing list: Series merged, no reason to check other mailing 
lists (test_mbox.TestMbox.test_target_mailing_list)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191865): 
https://lists.openembedded.org/g/openembedded-core/message/191865
Mute This Topic: https://lists.openembedded.org/mt/103005081/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 V3] cairo: upgrade 1.16.0 -> 1.18.0

[qi...@fujitsu.com]

From: qiutt 

Changelog for 1.18.0 [1]:
  The cairo-sphinx tool has been removed
  Cairo now implements Type 3 color fonts for PDF
  The XML surface has been removed
  The Tee surface is now automatically enabled
  The Quartz surface is improved
  Cairo now hides all private symbols by default on every platform
  Fixed multiple issues

As a part of 1.18.0, the following patches should be dropped.
  CVE-2018-19876.patch : 
https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645
  CVE-2019-6461.patch  : 
https://gitlab.freedesktop.org/cairo/cairo/-/commit/09643ee1abdd5daacebfcb564448f29be9a79bac
  CVE-2019-6462.patch  : 
https://gitlab.freedesktop.org/cairo/cairo/-/commit/bbeaf08190d3006a80b80a77724801cd477a37b8
  CVE-2020-35492.patch : 
https://gitlab.freedesktop.org/cairo/cairo/-/commit/c986a7310bb06582b7d8a566d5f007ba4e5e75bf

Add patch for 1.18.0.
  0002-meson.build-fix-x11-build.patch [3] : Fix cross compile error

These options are all gone [2]: directfb, valgrind, egl, glesv2, opengl, trace

Build tool is changed : autotools -> meson

 [1] https://www.cairographics.org/news/cairo-1.18.0/
 [2] https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/meson_options.txt
 [3] https://gitlab.freedesktop.org/cairo/cairo/-/issues/613

Signed-off-by: qiutt 
---
 .../0002-meson.build-fix-x11-build.patch  | 29 +
 .../cairo/cairo/CVE-2018-19876.patch  | 34 --
 .../cairo/cairo/CVE-2019-6461.patch   | 20 --
 .../cairo/cairo/CVE-2019-6462.patch   | 40 
 .../cairo/cairo/CVE-2020-35492.patch  | 60 -
 .../{cairo_1.16.0.bb => cairo_1.18.0.bb}  | 64 +--
 6 files changed, 46 insertions(+), 201 deletions(-)
 create mode 100644 
meta/recipes-graphics/cairo/cairo/0002-meson.build-fix-x11-build.patch
 delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
 delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch
 delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch
 delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2020-35492.patch
 rename meta/recipes-graphics/cairo/{cairo_1.16.0.bb => cairo_1.18.0.bb} (51%)

diff --git 
a/meta/recipes-graphics/cairo/cairo/0002-meson.build-fix-x11-build.patch 
b/meta/recipes-graphics/cairo/cairo/0002-meson.build-fix-x11-build.patch
new file mode 100644
index 00..f2fc64248d
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo/0002-meson.build-fix-x11-build.patch
@@ -0,0 +1,29 @@
+From 840e3ad20f8536d9857876ca2f5161896b68ab9b Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt 
+Date: Sun, 12 Nov 2023 10:44:13 +0100
+Subject: [PATCH] meson.build: fix x11 build
+
+../../br-test-pkg/arm-aarch64/build/cairo-1.18.0/meson.build:381:13: ERROR: 
Can not run test applications in this cross environment.
+
+Upstream-Status: Submitted 
[https://gitlab.freedesktop.org/cairo/cairo/-/issues/613]
+Signed-off-by: Thomas Devoogdt 
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 9efe91978..9864b8699 100644
+--- a/meson.build
 b/meson.build
+@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found()
+ 
+   # Can skip the run check by providing the result in a cross file or
+   # native file as bool property value.
+-  prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto')
++  prop = meson.get_external_property('ipc_rmid_deferred_release', 'false')
+   # We don't know the type of prop (bool, string) but need to differentiate
+   # between a set value (bool) or the fallback value (string), so convert to
+   # a string and check the string value.
+-- 
+2.34.1
+
diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch 
b/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
deleted file mode 100644
index 4252a5663b..00
--- a/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-CVE: CVE-2018-19876
-Upstream-Status: Backport
-Signed-off-by: Ross Burton 
-
-From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos 
-Date: Mon, 19 Nov 2018 12:33:07 +0100
-Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
- cairo_ft_apply_variations
-
-Fixes a crash when using freetype >= 2.9

- src/cairo-ft-font.c | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 325dd61b4..981973f78 100644
 a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -2393,7 +2393,11 @@ skip:
- done:
- free (coords);
- free (current_coords);
-+#if HAVE_FT_DONE_MM_VAR
-+FT_Done_MM_Var (face->glyph->library, ft_mm_var);
-+#else
- free (ft_mm_var);
-+#endif
- }
- }
- 
--- 
-2.11.0
-
diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch 
b/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch
deleted file mode 100644
index 

Re: [OE-core][kirkstone 0/4] linux-yocto: -stable updates

[Steve Sakoman]

On Tue, Dec 5, 2023 at 8:02 AM Bruce Ashfield  wrote:
>
> In message: Re: [OE-core][kirkstone 0/4] linux-yocto: -stable updates
> on 05/12/2023 Steve Sakoman wrote:
>
> > On Mon, Dec 4, 2023 at 6:40 PM  wrote:
> > >
> > > From: Bruce Ashfield 
> > >
> > > Steve,
> > >
> > > Much like my last pull request to Richard, this has been
> > > generated from a newly provisioned machine after my old machine
> > > of 10 years had a disk failure.
> > >
> > > Let me know if you have any issues with this, and I'll debug
> > > what I missed when configuring the new box.
> >
> > Hi Bruce,
> >
> > I'm also seeing an issue with 5.15.141.
> >
> > Local testing fails with:
> >
> > WARNING: linux-yocto-5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0
> > do_fetch: Failed to fetch URL
> > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=kernel-meta,
> > attempting MIRRORS if available
> > ERROR: linux-yocto-5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0
> > do_fetch: Fetcher failure: Unable to find revision
> > 92bd0a656f0f9db955fb53c52be71cce9296bdb2 in branch yocto-5.15 even
> > from upstream
> > ERROR: linux-yocto-5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0
> > do_fetch: Bitbake Fetcher Error: FetchError('Unable to fetch URL from
> > any source.', 
> > 'git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=kernel-meta')
> > ERROR: Logfile of failure stored in:
> > /home/steve/builds/poky-contrib-kirkstone/build/tmp/work/qemux86_64-poky-linux/linux-yocto/5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0/temp/log.do_fetch.3515498
>
> This was a repository misconfiguration. Only the current
> branch of the kernel-cache was pushed, where I've always
> had all branches to be pushed by default before.
>
> I've tweaked it, and the revision should be in place now.

Thanks Bruce!  Both dunfell and kirkstone are looking good --
autobuilder hasn't completed yet, but I think we are well past the
kernel build.

Appreciate the quick turnaround!

Steve

> > > Bruce Ashfield (4):
> > >   linux-yocto/5.10: update to v5.10.198
> > >   linux-yocto/5.10: update to v5.10.200
> > >   linux-yocto/5.10: update to v5.10.202
> > >   linux-yocto/5.15: update to v5.15.141
> > >
> > >  .../linux/linux-yocto-rt_5.10.bb  |  6 ++---
> > >  .../linux/linux-yocto-rt_5.15.bb  |  6 ++---
> > >  .../linux/linux-yocto-tiny_5.10.bb|  8 +++---
> > >  .../linux/linux-yocto-tiny_5.15.bb|  6 ++---
> > >  meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 -
> > >  meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +--
> > >  6 files changed, 38 insertions(+), 38 deletions(-)
> > >
> > > --
> > > 2.39.2
> > >

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191863): 
https://lists.openembedded.org/g/openembedded-core/message/191863
Mute This Topic: https://lists.openembedded.org/mt/102986489/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/3] linux-firmware: Create bnx2x subpackage

[Jason Andryuk]

bnx2x is another broadcom ethernet adapter with its own firmware.  Place
it into its own subpackage.

Signed-off-by: Jason Andryuk 
---
 .../linux-firmware/linux-firmware_20231030.bb  | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb 
b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb
index a1229e4827..6667f00612 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb
@@ -341,6 +341,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
  ${PN}-ice-enhanced-license ${PN}-ice-enhanced \
  ${PN}-adsp-sst-license ${PN}-adsp-sst \
  ${PN}-bnx2 \
+ ${PN}-bnx2x \
  ${PN}-liquidio \
  ${PN}-nvidia-license \
  ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \
@@ -1104,6 +1105,12 @@ FILES:${PN}-whence-license = 
"${nonarch_base_libdir}/firmware/WHENCE"
 RDEPENDS:${PN}-bnx2 += "${PN}-whence-license"
 RPROVIDES:${PN}-bnx2 = "${PN}-bnx2-mips"
 
+LICENSE:${PN}-bnx2x = "WHENCE"
+
+FILES:${PN}-bnx2x = "${nonarch_base_libdir}/firmware/bnx2x/bnx2x*.fw"
+
+RDEPENDS:${PN}-bnx2x += "${PN}-whence-license"
+
 # For cirrus
 LICENSE:${PN}-cirrus = "Firmware-cirrus"
 LICENSE:${PN}-cirrus-license = "Firmware-cirrus"
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191862): 
https://lists.openembedded.org/g/openembedded-core/message/191862
Mute This Topic: https://lists.openembedded.org/mt/102997937/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/3] linux-firmware: Change bnx2 packaging

[Jason Andryuk]

The bnx2 module uses both the mips and rv2p files, so package them all
together.  Remove -mips from the package name, but add an RPROVIDES for
compatibility.

Signed-off-by: Jason Andryuk 
---
 .../linux-firmware/linux-firmware_20231030.bb  | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb 
b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb
index b849c086b6..a1229e4827 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb
@@ -340,7 +340,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
  ${PN}-ice-license ${PN}-ice \
  ${PN}-ice-enhanced-license ${PN}-ice-enhanced \
  ${PN}-adsp-sst-license ${PN}-adsp-sst \
- ${PN}-bnx2-mips \
+ ${PN}-bnx2 \
  ${PN}-liquidio \
  ${PN}-nvidia-license \
  ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \
@@ -1087,18 +1087,22 @@ RDEPENDS:${PN}-bcm4356-pcie += "${PN}-cypress-license"
 LICENSE:${PN}-bcm4373 = "Firmware-cypress"
 RDEPENDS:${PN}-bcm4373 += "${PN}-cypress-license"
 
-# For Broadcom bnx2-mips
+# For Broadcom bnx2
 #
 # which is a separate case to the other Broadcom firmwares since its
 # license is contained in the shared WHENCE file.
 
-LICENSE:${PN}-bnx2-mips = "WHENCE"
+LICENSE:${PN}-bnx2 = "WHENCE"
 LICENSE:${PN}-whence-license = "WHENCE"
 
-FILES:${PN}-bnx2-mips = 
"${nonarch_base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw"
+FILES:${PN}-bnx2 = " \
+${nonarch_base_libdir}/firmware/bnx2/bnx2-mips*.fw \
+${nonarch_base_libdir}/firmware/bnx2/bnx2-rv2p*.fw \
+"
 FILES:${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE"
 
-RDEPENDS:${PN}-bnx2-mips += "${PN}-whence-license"
+RDEPENDS:${PN}-bnx2 += "${PN}-whence-license"
+RPROVIDES:${PN}-bnx2 = "${PN}-bnx2-mips"
 
 # For cirrus
 LICENSE:${PN}-cirrus = "Firmware-cirrus"
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191861): 
https://lists.openembedded.org/g/openembedded-core/message/191861
Mute This Topic: https://lists.openembedded.org/mt/102997935/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/3] linux-firmware: Package iwlwifi .pnvm files

[Jason Andryuk]

The iwlwifi uses the .pnvm files for newer AX210+ cards, so package them
into the iwlwifi-misc subpackage.

Signed-off-by: Jason Andryuk 
---
 .../recipes-kernel/linux-firmware/linux-firmware_20231030.bb | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb 
b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb
index c0394b9b3b..b849c086b6 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb
@@ -1187,7 +1187,10 @@ FILES:${PN}-iwlwifi-7265d   = 
"${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.u
 FILES:${PN}-iwlwifi-8000c   = 
"${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode"
 FILES:${PN}-iwlwifi-8265   = 
"${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode"
 FILES:${PN}-iwlwifi-9000   = 
"${nonarch_base_libdir}/firmware/iwlwifi-9000-*.ucode"
-FILES:${PN}-iwlwifi-misc   = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode"
+FILES:${PN}-iwlwifi-misc   = " \
+${nonarch_base_libdir}/firmware/iwlwifi-*.ucode \
+${nonarch_base_libdir}/firmware/iwlwifi-*.pnvm \
+"
 
 RDEPENDS:${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license"
 RDEPENDS:${PN}-iwlwifi-3160-7= "${PN}-iwlwifi-license"
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191860): 
https://lists.openembedded.org/g/openembedded-core/message/191860
Mute This Topic: https://lists.openembedded.org/mt/102997933/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/3] linux-firmware:

[Jason Andryuk]

This is a small series to fixup up linux-firmware packaging:
The first adds some .pnvm files needed along with the .ucode by newer
iwlwifi cards to the linux-firmware-iwlwifi-misc package.

The second renames s/bnx2-mips/bnx2/ and includes more files needed by
the driver.

The third creates a new bnx2x package.

Jason Andryuk (3):
  linux-firmware: Package iwlwifi .pnvm files
  linux-firmware: Change bnx2 packaging
  linux-firmware: Create bnx2x subpackage

 .../linux-firmware/linux-firmware_20231030.bb | 26 ++-
 1 file changed, 20 insertions(+), 6 deletions(-)

-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191859): 
https://lists.openembedded.org/g/openembedded-core/message/191859
Mute This Topic: https://lists.openembedded.org/mt/102997931/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] libxcrypt.inc: use alternatives to resolve crypt.3 conflict

[Khem Raj]

On Tue, Dec 5, 2023 at 3:48 AM Ross Burton  wrote:
>
> On 5 Dec 2023, at 01:41, Changqing Li via lists.openembedded.org 
>  wrote:
> >
> > From: Changqing Li 
> >
> > To fix:
> >
> > Error: Transaction test error:
> >  file /usr/share/man/man3/crypt.3 from install of
> >  libcrypt-doc-4.4.33-r0.x86_64 conflicts with file from package
> >  man-pages-6.04-r0.x86_64
>
> This feels like the wrong solution.  It feels like one of these packages has 
> the “better” documentation and that should be the one that ships the 
> documentation.

right, I think these should be deleted from man-pages recipe, I think
there could be more such conflicts with
man-pages especially from glibc recipe.

>
> Ross
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191858): 
https://lists.openembedded.org/g/openembedded-core/message/191858
Mute This Topic: https://lists.openembedded.org/mt/102984309/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 dunfell v2] linux-yocto/5.4: update to v5.4.262

[Bruce Ashfield]

From: Bruce Ashfield 

Updating  to the latest korg -stable release that comprises
the following commits:

8e221b47173d Linux 5.4.262
b053223b7cf4 netfilter: nf_tables: bogus EBUSY when deleting flowtable 
after flush (for 5.4)
c35df8b8c572 netfilter: nf_tables: disable toggling dormant table state 
more than once
e10f661adc55 netfilter: nf_tables: fix table flag updates
46c2947fcd71 netfilter: nftables: update table flags from the commit phase
b09e6ccf0d12 netfilter: nf_tables: double hook unregistration in netns path
b05a24cc453e netfilter: nf_tables: unregister flowtable hooks on netns exit
a995a68e8a3b netfilter: nf_tables: fix memleak when more than 255 elements 
expired
b95d7af657a8 netfilter: nft_set_hash: try later when GC hits EAGAIN on 
iteration
61a7b3de20e2 netfilter: nft_set_rbtree: use read spinlock to avoid datapath 
contention
03caf75da105 netfilter: nft_set_rbtree: skip sync GC for new elements in 
this transaction
021d734c7eaa netfilter: nf_tables: defer gc run if previous batch is still 
pending
38ed6a5f836f netfilter: nf_tables: use correct lock to protect gc_list
4b6346dc1edf netfilter: nf_tables: GC transaction race with abort path
b76dcf466223 netfilter: nf_tables: GC transaction race with netns dismantle
29ff9b8efb84 netfilter: nf_tables: fix GC transaction races with netns and 
netlink event exit path
1398a0eee290 netfilter: nf_tables: remove busy mark and gc batch API
85520a1f1d87 netfilter: nft_set_hash: mark set element as dead when 
deleting from packet path
c357648929c8 netfilter: nf_tables: adapt set backend to use GC transaction 
API
bbdb3b65aa91 netfilter: nf_tables: GC transaction API to avoid race with 
control plane
1da4874d05da netfilter: nf_tables: don't skip expired elements during walk
acaee227cf79 netfilter: nft_set_rbtree: fix overlap expiration walk
899aa5638568 netfilter: nft_set_rbtree: fix null deref on element insertion
181859bdfb97 netfilter: nft_set_rbtree: Switch to node list walk for 
overlap detection
3c7ec098e3b5 netfilter: nf_tables: drop map element references from 
preparation phase
6b880f3b2c04 netfilter: nftables: rename set element data 
activation/deactivation functions
e1eed9e0b5e8 netfilter: nf_tables: pass context to nft_set_destroy()
961c4511c757 tracing: Have trace_event_file have ref counters
7676a41d90c5 drm/amdgpu: fix error handling in amdgpu_bo_list_get()
36383005f1db ext4: remove gdb backup copy for meta bg in 
setup_new_flex_group_blocks
e95f74653dff ext4: correct the start block of counting reserved clusters
1fbfdcc3d65e ext4: correct return value of ext4_convert_meta_bg
dfdfd3f21830 ext4: correct offset of gdb backup in non meta_bg group to 
update_backups
85c12e80c474 ext4: apply umask if ACL support is disabled
d2aed8814f02 Revert "net: r8169: Disable multicast filter for RTL8168H and 
RTL8107E"
b9e5f633b35d nfsd: fix file memleak on client_opens_release
339d7d40d3dc media: venus: hfi: add checks to handle capabilities from 
firmware
cab97cdd409a media: venus: hfi: fix the check to handle session buffer 
requirement
5d39d0c1f43f media: venus: hfi_parser: Add check to keep the number of 
codecs within range
497b12d47cc6 media: sharp: fix sharp encoding
92d8a0478fb3 media: lirc: drop trailing space from scancode transmit
cac054d10324 i2c: i801: fix potential race in 
i801_block_transaction_byte_by_byte
b132e462363f net: dsa: lan9303: consequently nested-lock physical MDIO
229738d71702 Revert ncsi: Propagate carrier gain/loss events to the NCSI 
controller
4074957ec6bb Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE
356a2ee5fc36 Bluetooth: btusb: Add RTW8852BE device 13d3:3570 to device 
tables
afe92b66a5d8 bluetooth: Add device 13d3:3571 to device tables
dc073a2626d3 bluetooth: Add device 0bda:887b to device tables
75d26f7f6118 Bluetooth: btusb: Add Realtek RTL8852BE support ID 
0x0cb8:0xc559
323710a6b4c6 Bluetooth: btusb: add Realtek 8822CE to usb_device_id table
981ee23b8d48 Bluetooth: btusb: Add flag to define wideband speech capability
0fe69c99cc13 tty: serial: meson: fix hard LOCKUP on crtscts mode
8f40bbf7dc01 serial: meson: Use platform_get_irq() to get the interrupt
a1113f2c9b2c tty: serial: meson: retrieve port FIFO size from DT
13391526d817 serial: meson: remove redundant initialization of variable id
6245d0d70fe8 ALSA: hda/realtek - Enable internal speaker of ASUS K6500ZC
4ef452297de4 ALSA: info: Fix potential deadlock at disconnection
c7df9523fed2 parisc/pgtable: Do not drop upper 5 address bits of physical 
address
c32dfec86714 parisc: Prevent booting 64-bit kernels on PA1.x machines
d570d139cb38 i3c: master: cdns: Fix reading status register
ad6941b192ca mm/cma: use nth_page() in place of direct struct page 
manipulation
36512866607e dmaengine: stm32-mdma: correct desc 

Re: [OE-core][dunfell 3/3] linux-yocto/5.4: update to v5.4.262

[Bruce Ashfield]

In message: Re: [OE-core][dunfell 3/3] linux-yocto/5.4: update to v5.4.262
on 05/12/2023 Steve Sakoman wrote:

> Hi Bruce,
> 
> I'm getting a failure on the autobuilder for this version bump:
> 
> https://errors.yoctoproject.org/Errors/Details/745216/
> 
> ERROR: Package Version (5.4.262+gitAUTOINC+9f1a56eeea_102ea8999f) does
> not match of kernel being built (5.4.260). Please update the PV
> variable to match the kernel source or set
> KERNEL_VERSION_SANITY_SKIP="1" in your recipe.

Another configuration error.

All of the v5.4/ branches weren't in my merge repository,
so they weren't all updated.

Drop this patch, and I'll send a v2 with full SRCREV updates
in a little while.

Bruce

> 
> Steve
> 
> On Mon, Dec 4, 2023 at 6:43 PM  wrote:
> >
> > From: Bruce Ashfield 
> >
> > Updating  to the latest korg -stable release that comprises
> > the following commits:
> >
> > 8e221b47173d Linux 5.4.262
> > b053223b7cf4 netfilter: nf_tables: bogus EBUSY when deleting flowtable 
> > after flush (for 5.4)
> > c35df8b8c572 netfilter: nf_tables: disable toggling dormant table state 
> > more than once
> > e10f661adc55 netfilter: nf_tables: fix table flag updates
> > 46c2947fcd71 netfilter: nftables: update table flags from the commit 
> > phase
> > b09e6ccf0d12 netfilter: nf_tables: double hook unregistration in netns 
> > path
> > b05a24cc453e netfilter: nf_tables: unregister flowtable hooks on netns 
> > exit
> > a995a68e8a3b netfilter: nf_tables: fix memleak when more than 255 
> > elements expired
> > b95d7af657a8 netfilter: nft_set_hash: try later when GC hits EAGAIN on 
> > iteration
> > 61a7b3de20e2 netfilter: nft_set_rbtree: use read spinlock to avoid 
> > datapath contention
> > 03caf75da105 netfilter: nft_set_rbtree: skip sync GC for new elements 
> > in this transaction
> > 021d734c7eaa netfilter: nf_tables: defer gc run if previous batch is 
> > still pending
> > 38ed6a5f836f netfilter: nf_tables: use correct lock to protect gc_list
> > 4b6346dc1edf netfilter: nf_tables: GC transaction race with abort path
> > b76dcf466223 netfilter: nf_tables: GC transaction race with netns 
> > dismantle
> > 29ff9b8efb84 netfilter: nf_tables: fix GC transaction races with netns 
> > and netlink event exit path
> > 1398a0eee290 netfilter: nf_tables: remove busy mark and gc batch API
> > 85520a1f1d87 netfilter: nft_set_hash: mark set element as dead when 
> > deleting from packet path
> > c357648929c8 netfilter: nf_tables: adapt set backend to use GC 
> > transaction API
> > bbdb3b65aa91 netfilter: nf_tables: GC transaction API to avoid race 
> > with control plane
> > 1da4874d05da netfilter: nf_tables: don't skip expired elements during 
> > walk
> > acaee227cf79 netfilter: nft_set_rbtree: fix overlap expiration walk
> > 899aa5638568 netfilter: nft_set_rbtree: fix null deref on element 
> > insertion
> > 181859bdfb97 netfilter: nft_set_rbtree: Switch to node list walk for 
> > overlap detection
> > 3c7ec098e3b5 netfilter: nf_tables: drop map element references from 
> > preparation phase
> > 6b880f3b2c04 netfilter: nftables: rename set element data 
> > activation/deactivation functions
> > e1eed9e0b5e8 netfilter: nf_tables: pass context to nft_set_destroy()
> > 961c4511c757 tracing: Have trace_event_file have ref counters
> > 7676a41d90c5 drm/amdgpu: fix error handling in amdgpu_bo_list_get()
> > 36383005f1db ext4: remove gdb backup copy for meta bg in 
> > setup_new_flex_group_blocks
> > e95f74653dff ext4: correct the start block of counting reserved clusters
> > 1fbfdcc3d65e ext4: correct return value of ext4_convert_meta_bg
> > dfdfd3f21830 ext4: correct offset of gdb backup in non meta_bg group to 
> > update_backups
> > 85c12e80c474 ext4: apply umask if ACL support is disabled
> > d2aed8814f02 Revert "net: r8169: Disable multicast filter for RTL8168H 
> > and RTL8107E"
> > b9e5f633b35d nfsd: fix file memleak on client_opens_release
> > 339d7d40d3dc media: venus: hfi: add checks to handle capabilities from 
> > firmware
> > cab97cdd409a media: venus: hfi: fix the check to handle session buffer 
> > requirement
> > 5d39d0c1f43f media: venus: hfi_parser: Add check to keep the number of 
> > codecs within range
> > 497b12d47cc6 media: sharp: fix sharp encoding
> > 92d8a0478fb3 media: lirc: drop trailing space from scancode transmit
> > cac054d10324 i2c: i801: fix potential race in 
> > i801_block_transaction_byte_by_byte
> > b132e462363f net: dsa: lan9303: consequently nested-lock physical MDIO
> > 229738d71702 Revert ncsi: Propagate carrier gain/loss events to the 
> > NCSI controller
> > 4074957ec6bb Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE
> > 356a2ee5fc36 Bluetooth: btusb: Add RTW8852BE device 13d3:3570 to device 
> > tables
> > afe92b66a5d8 bluetooth: Add device 13d3:3571 to device tables
> > dc073a2626d3 

Re: [OE-core] [PATCH 0/7] linux-yocto: consolidated pull request

[Bruce Ashfield]

On Tue, Dec 5, 2023 at 12:55 PM Alexandre Belloni
 wrote:
>
> Hello Bruce,
>
> I got this: Unable to find revision 867a6bdef9701f378f5a9ce66a713daa22598649 
> in branch yocto-6.5
> This seems correct, did you forget to push anything?

I just replied to Steve.

It's my new machine having different defaults, so not all branches pushed
when I ran my scripts.

It should be in place now.

Bruce

>
> On 04/12/2023 23:26:55-0500, Bruce Ashfield wrote:
> > From: Bruce Ashfield 
> >
> > Richard,
> >
> > Here's my latest -stable updates for 6.1 and 6.5 as well as the bump
> > of the dev kernel to v6.7
> >
> > I have more pending changes: the 6.6 reference kernel and associated
> > libc-headers updates, as well as the eventual drop of 6.1 from the
> > tree.
> >
> > But this is my first full cycle on my new configured and cobbled
> > together builder after my disk failure. So to keep things simple,
> > I've limited this first pull request to try and see if anything
> > has been missed in my setup.
> >
> > Bruce
> >
> > The following changes since commit f89d9240b1208e9df28afed840376ca91842e5dd:
> >
> >   vte: Separate out gtk4 pieces of vte into individual packages (2023-12-04 
> > 12:45:27 +)
> >
> > are available in the Git repository at:
> >
> >   https://git.yoctoproject.org/poky-contrib zedd/kernel
> >   https://git.yoctoproject.org/poky-contrib/log/?h=zedd/kernel
> >
> > Bruce Ashfield (7):
> >   linux-yocto/6.5: cfg: split runtime and symbol debug
> >   linux-yocto/6.5: update to v6.5.11
> >   linux-yocto/6.1: update to v6.1.62
> >   linux-yocto-dev: bump to v6.7
> >   linux-yocto/6.5: update to v6.5.12
> >   linux-yocto/6.5: update to v6.5.13
> >   linux-yocto/6.1: update to v6.1.65
> >
> >  meta/recipes-kernel/linux/linux-yocto-dev.bb  |  4 +--
> >  .../linux/linux-yocto-rt_6.1.bb   |  6 ++--
> >  .../linux/linux-yocto-rt_6.5.bb   |  6 ++--
> >  .../linux/linux-yocto-tiny_6.1.bb |  6 ++--
> >  .../linux/linux-yocto-tiny_6.5.bb |  6 ++--
> >  meta/recipes-kernel/linux/linux-yocto_6.1.bb  | 28 +--
> >  meta/recipes-kernel/linux/linux-yocto_6.5.bb  | 28 +--
> >  7 files changed, 42 insertions(+), 42 deletions(-)
> >
> > --
> > 2.39.2
> >
>
> >
> > 
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com



-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

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

[OE-core] Patchtest results for [PATCH v2] tiff: Backport fixes for CVE-2023-6277

[Patchtest]

Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch 
/home/patchtest/share/mboxes/v2-tiff-Backport-fixes-for-CVE-2023-6277.patch

FAIL: test commit message presence: Please include a commit message on your 
patch explaining the change (test_mbox.TestMbox.test_commit_message_presence)

PASS: pretest src uri left files 
(test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence 
(test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence 
(test_patch.TestPatch.test_signed_off_by_presence)
PASS: test Upstream-Status presence 
(test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test lic files chksum modified not mentioned 
(test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files 
(test_metadata.TestMetadata.test_src_uri_left_files)

SKIP: pretest pylint: No python related patches, skipping test 
(test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found 
(test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test 
(test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test 
(test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test 
(test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now 
(test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test 
(test_metadata.TestMetadata.test_summary_presence)
SKIP: test target mailing list: Series merged, no reason to check other mailing 
lists (test_mbox.TestMbox.test_target_mailing_list)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191854): 
https://lists.openembedded.org/g/openembedded-core/message/191854
Mute This Topic: https://lists.openembedded.org/mt/102997124/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][kirkstone 0/4] linux-yocto: -stable updates

[Bruce Ashfield]

In message: Re: [OE-core][kirkstone 0/4] linux-yocto: -stable updates
on 05/12/2023 Steve Sakoman wrote:

> On Mon, Dec 4, 2023 at 6:40 PM  wrote:
> >
> > From: Bruce Ashfield 
> >
> > Steve,
> >
> > Much like my last pull request to Richard, this has been
> > generated from a newly provisioned machine after my old machine
> > of 10 years had a disk failure.
> >
> > Let me know if you have any issues with this, and I'll debug
> > what I missed when configuring the new box.
> 
> Hi Bruce,
> 
> I'm also seeing an issue with 5.15.141.
> 
> Local testing fails with:
> 
> WARNING: linux-yocto-5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0
> do_fetch: Failed to fetch URL
> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=kernel-meta,
> attempting MIRRORS if available
> ERROR: linux-yocto-5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0
> do_fetch: Fetcher failure: Unable to find revision
> 92bd0a656f0f9db955fb53c52be71cce9296bdb2 in branch yocto-5.15 even
> from upstream
> ERROR: linux-yocto-5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0
> do_fetch: Bitbake Fetcher Error: FetchError('Unable to fetch URL from
> any source.', 
> 'git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=kernel-meta')
> ERROR: Logfile of failure stored in:
> /home/steve/builds/poky-contrib-kirkstone/build/tmp/work/qemux86_64-poky-linux/linux-yocto/5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0/temp/log.do_fetch.3515498

This was a repository misconfiguration. Only the current
branch of the kernel-cache was pushed, where I've always
had all branches to be pushed by default before.

I've tweaked it, and the revision should be in place now.

Bruce

> 
> Steve
> 
> >
> > Bruce
> >
> > Bruce Ashfield (4):
> >   linux-yocto/5.10: update to v5.10.198
> >   linux-yocto/5.10: update to v5.10.200
> >   linux-yocto/5.10: update to v5.10.202
> >   linux-yocto/5.15: update to v5.15.141
> >
> >  .../linux/linux-yocto-rt_5.10.bb  |  6 ++---
> >  .../linux/linux-yocto-rt_5.15.bb  |  6 ++---
> >  .../linux/linux-yocto-tiny_5.10.bb|  8 +++---
> >  .../linux/linux-yocto-tiny_5.15.bb|  6 ++---
> >  meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 -
> >  meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +--
> >  6 files changed, 38 insertions(+), 38 deletions(-)
> >
> > --
> > 2.39.2
> >

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191853): 
https://lists.openembedded.org/g/openembedded-core/message/191853
Mute This Topic: https://lists.openembedded.org/mt/102986489/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 0/7] linux-yocto: consolidated pull request

[Alexandre Belloni via lists.openembedded.org]

Hello Bruce,

I got this: Unable to find revision 867a6bdef9701f378f5a9ce66a713daa22598649 in 
branch yocto-6.5
This seems correct, did you forget to push anything?

On 04/12/2023 23:26:55-0500, Bruce Ashfield wrote:
> From: Bruce Ashfield 
> 
> Richard,
> 
> Here's my latest -stable updates for 6.1 and 6.5 as well as the bump
> of the dev kernel to v6.7
> 
> I have more pending changes: the 6.6 reference kernel and associated
> libc-headers updates, as well as the eventual drop of 6.1 from the
> tree.
> 
> But this is my first full cycle on my new configured and cobbled
> together builder after my disk failure. So to keep things simple,
> I've limited this first pull request to try and see if anything
> has been missed in my setup.
> 
> Bruce
> 
> The following changes since commit f89d9240b1208e9df28afed840376ca91842e5dd:
> 
>   vte: Separate out gtk4 pieces of vte into individual packages (2023-12-04 
> 12:45:27 +)
> 
> are available in the Git repository at:
> 
>   https://git.yoctoproject.org/poky-contrib zedd/kernel
>   https://git.yoctoproject.org/poky-contrib/log/?h=zedd/kernel
> 
> Bruce Ashfield (7):
>   linux-yocto/6.5: cfg: split runtime and symbol debug
>   linux-yocto/6.5: update to v6.5.11
>   linux-yocto/6.1: update to v6.1.62
>   linux-yocto-dev: bump to v6.7
>   linux-yocto/6.5: update to v6.5.12
>   linux-yocto/6.5: update to v6.5.13
>   linux-yocto/6.1: update to v6.1.65
> 
>  meta/recipes-kernel/linux/linux-yocto-dev.bb  |  4 +--
>  .../linux/linux-yocto-rt_6.1.bb   |  6 ++--
>  .../linux/linux-yocto-rt_6.5.bb   |  6 ++--
>  .../linux/linux-yocto-tiny_6.1.bb |  6 ++--
>  .../linux/linux-yocto-tiny_6.5.bb |  6 ++--
>  meta/recipes-kernel/linux/linux-yocto_6.1.bb  | 28 +--
>  meta/recipes-kernel/linux/linux-yocto_6.5.bb  | 28 +--
>  7 files changed, 42 insertions(+), 42 deletions(-)
> 
> -- 
> 2.39.2
> 

> 
> 
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191852): 
https://lists.openembedded.org/g/openembedded-core/message/191852
Mute This Topic: https://lists.openembedded.org/mt/102986376/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] tiff: Backport fixes for CVE-2023-6277

[Khem Raj]

Signed-off-by: Khem Raj 
---
v2: Drop ununsed patch

 ...277-Apply-1-suggestion-s-to-1-file-s.patch |  27 +++
 ...ompare-data-size-of-some-tags-data-2.patch |  36 
 ...-compare-data-size-of-some-tags-data.patch | 162 ++
 meta/recipes-multimedia/libtiff/tiff_4.6.0.bb |   3 +
 4 files changed, 228 insertions(+)
 create mode 100644 
meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-Apply-1-suggestion-s-to-1-file-s.patch
 create mode 100644 
meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data-2.patch
 create mode 100644 
meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data.patch

diff --git 
a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-Apply-1-suggestion-s-to-1-file-s.patch
 
b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-Apply-1-suggestion-s-to-1-file-s.patch
new file mode 100644
index 000..5d15dff1d9b
--- /dev/null
+++ 
b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-Apply-1-suggestion-s-to-1-file-s.patch
@@ -0,0 +1,27 @@
+From e1640519208121f916da1772a5efb6ca28971b86 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Tue, 31 Oct 2023 15:04:37 +
+Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s)
+
+CVE: CVE-2023-6277
+Upstream-Status: Backport 
[https://gitlab.com/libtiff/libtiff/-/merge_requests/545]
+Signed-off-by: Khem Raj 
+---
+ libtiff/tif_dirread.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
+index fe8d6f8..58a4276 100644
+--- a/libtiff/tif_dirread.c
 b/libtiff/tif_dirread.c
+@@ -5306,7 +5306,6 @@ static int EstimateStripByteCounts(TIFF *tif, 
TIFFDirEntry *dir,
+ {
+ uint64_t space;
+ uint16_t n;
+-filesize = TIFFGetFileSize(tif);
+ if (!(tif->tif_flags & TIFF_BIGTIFF))
+ space = sizeof(TIFFHeaderClassic) + 2 + dircount * 12 + 4;
+ else
+-- 
+2.43.0
+
diff --git 
a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data-2.patch
 
b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data-2.patch
new file mode 100644
index 000..9fc8182fef3
--- /dev/null
+++ 
b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data-2.patch
@@ -0,0 +1,36 @@
+From f500facf7723f1cae725dd288b2daad15e45131c Mon Sep 17 00:00:00 2001
+From: Su_Laus 
+Date: Mon, 30 Oct 2023 21:21:57 +0100
+Subject: [PATCH 2/3] At image reading, compare data size of some tags / data
+ structures (StripByteCounts, StripOffsets, StripArray, TIFF directory) with
+ file size to prevent provoked out-of-memory attacks.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See issue #614.
+
+Correct declaration of ‘filesize’ shadows a previous local.
+
+CVE: CVE-2023-6277
+Upstream-Status: Backport 
[https://gitlab.com/libtiff/libtiff/-/merge_requests/545]
+Signed-off-by: Khem Raj 
+---
+ libtiff/tif_dirread.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
+index c52d41f..fe8d6f8 100644
+--- a/libtiff/tif_dirread.c
 b/libtiff/tif_dirread.c
+@@ -5305,7 +5305,6 @@ static int EstimateStripByteCounts(TIFF *tif, 
TIFFDirEntry *dir,
+ if (td->td_compression != COMPRESSION_NONE)
+ {
+ uint64_t space;
+-uint64_t filesize;
+ uint16_t n;
+ filesize = TIFFGetFileSize(tif);
+ if (!(tif->tif_flags & TIFF_BIGTIFF))
+-- 
+2.43.0
+
diff --git 
a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data.patch
 
b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data.patch
new file mode 100644
index 000..d5854a9059b
--- /dev/null
+++ 
b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data.patch
@@ -0,0 +1,162 @@
+From b33baa5d9c6aac8ce49b5180dd48e39697ab7a11 Mon Sep 17 00:00:00 2001
+From: Su_Laus 
+Date: Fri, 27 Oct 2023 22:11:10 +0200
+Subject: [PATCH 1/3] At image reading, compare data size of some tags / data
+ structures (StripByteCounts, StripOffsets, StripArray, TIFF directory) with
+ file size to prevent provoked out-of-memory attacks.
+
+See issue #614.
+
+CVE: CVE-2023-6277
+Upstream-Status: Backport 
[https://gitlab.com/libtiff/libtiff/-/merge_requests/545]
+Signed-off-by: Khem Raj 
+---
+ libtiff/tif_dirread.c | 90 +++
+ 1 file changed, 90 insertions(+)
+
+diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
+index 2c49dc6..c52d41f 100644
+--- a/libtiff/tif_dirread.c
 b/libtiff/tif_dirread.c
+@@ -1308,6 +1308,21 @@ TIFFReadDirEntryArrayWithLimit(TIFF *tif, TIFFDirEntry 
*direntry,
+ datasize = (*count) * typesize;
+ assert((tmsize_t)datasize > 0);
+ 
++/* Before allocating a 

Re: [OE-core] CVE checks for meta warnings

[Ross Burton]

On 5 Dec 2023, at 16:34, Alexandre Belloni via lists.openembedded.org 
 wrote:
> 
> Hello,
> 
> Running cve-check against oe-core now generates a few warnings:
> 
> WARNING: automake-native-1.16.5-r0 do_cve_check: automake: Failed to compare 
> 1.16.5 = branch_1-9 for CVE-2009-4029
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m1 for CVE-2010-4539
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m2 for CVE-2010-4539
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m3 for CVE-2010-4539
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m4\/m5 for CVE-2010-4539
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m1 for CVE-2010-4644
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m2 for CVE-2010-4644
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m3 for CVE-2010-4644
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m4\/m5 for CVE-2010-4644
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m1 for CVE-2011-0715
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m2 for CVE-2011-0715
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m3 for CVE-2011-0715
> WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
> 1.14.2 = m4\/m5 for CVE-2011-0715
> WARNING: automake-1.16.5-r0 do_cve_check: automake: Failed to compare 1.16.5 
> = branch_1-9 for CVE-2009-4029
> WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
> pre0.59s for CVE-2003-0577
> WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
> pre0.59s for CVE-2004-0982
> WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
> pre0.59s for CVE-2004-1284
> WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
> pre0.59s_r11 for CVE-2006-3355
> WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
> pre0.59s for CVE-2007-0578
> WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
> pre0.59s_r11 for CVE-2007-0578
> WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
> pre0.59s for CVE-2009-1301
> WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
> pre0.59s_r11 for CVE-2009-1301
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/138/builds/823/steps/15/logs/warnings

That would be:

cve-check: Modify judgment processing using "=" in version comparison

I vote for reverting it, it’s too verbose and we can’t “fix” the CPE data as 
it’s not broken.

Ross
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191849): 
https://lists.openembedded.org/g/openembedded-core/message/191849
Mute This Topic: https://lists.openembedded.org/mt/102995187/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] Revert "cve-check: Modify judgment processing using "=" in version comparison"

[Ross Burton]

From: Ross Burton 

This change introduced a warning if version comparisons failed, but
this is far too common an issue in data that we don't control, so this
shouldn't cause a warning:

WARNING: automake-native-1.16.5-r0 do_cve_check: automake: Failed to compare 
1.16.5 = branch_1-9 for CVE-2009-4029
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m1 for CVE-2010-4539
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m2 for CVE-2010-4539
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m3 for CVE-2010-4539
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m4\/m5 for CVE-2010-4539
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m1 for CVE-2010-4644
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m2 for CVE-2010-4644
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m3 for CVE-2010-4644
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m4\/m5 for CVE-2010-4644
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m1 for CVE-2011-0715
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m2 for CVE-2011-0715
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m3 for CVE-2011-0715
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m4\/m5 for CVE-2011-0715
WARNING: automake-1.16.5-r0 do_cve_check: automake: Failed to compare 1.16.5 = 
branch_1-9 for CVE-2009-4029
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2003-0577
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2004-0982
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2004-1284
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s_r11 for CVE-2006-3355
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2007-0578
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s_r11 for CVE-2007-0578
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2009-1301
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s_r11 for CVE-2009-1301

This reverts commit a1989e4197178c2431ceca499e0b4876b233b131.

Signed-off-by: Ross Burton 
---
 meta/classes/cve-check.bbclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index 086d87687f4..5191d043030 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -375,7 +375,6 @@ def check_cves(d, patched_cves):
 try:
 vulnerable_start =  (operator_start == '>=' and 
Version(pv,suffix) >= Version(version_start,suffix))
 vulnerable_start |= (operator_start == '>' and 
Version(pv,suffix) > Version(version_start,suffix))
-vulnerable_start |= (operator_start == '=' and 
Version(pv,suffix) == Version(version_start,suffix))
 except:
 bb.warn("%s: Failed to compare %s %s %s for %s" %
 (product, pv, operator_start, 
version_start, cve))
-- 
2.34.1


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

[OE-core] CVE checks for meta warnings

[Alexandre Belloni via lists.openembedded.org]

Hello,

Running cve-check against oe-core now generates a few warnings:

WARNING: automake-native-1.16.5-r0 do_cve_check: automake: Failed to compare 
1.16.5 = branch_1-9 for CVE-2009-4029
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m1 for CVE-2010-4539
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m2 for CVE-2010-4539
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m3 for CVE-2010-4539
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m4\/m5 for CVE-2010-4539
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m1 for CVE-2010-4644
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m2 for CVE-2010-4644
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m3 for CVE-2010-4644
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m4\/m5 for CVE-2010-4644
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m1 for CVE-2011-0715
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m2 for CVE-2011-0715
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m3 for CVE-2011-0715
WARNING: subversion-1.14.2-r0 do_cve_check: subversion: Failed to compare 
1.14.2 = m4\/m5 for CVE-2011-0715
WARNING: automake-1.16.5-r0 do_cve_check: automake: Failed to compare 1.16.5 = 
branch_1-9 for CVE-2009-4029
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2003-0577
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2004-0982
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2004-1284
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s_r11 for CVE-2006-3355
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2007-0578
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s_r11 for CVE-2007-0578
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s for CVE-2009-1301
WARNING: mpg123-1.32.3-r0 do_cve_check: mpg123: Failed to compare 1.32.3 = 
pre0.59s_r11 for CVE-2009-1301

https://autobuilder.yoctoproject.org/typhoon/#/builders/138/builds/823/steps/15/logs/warnings


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191848): 
https://lists.openembedded.org/g/openembedded-core/message/191848
Mute This Topic: https://lists.openembedded.org/mt/102995187/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] [RESEND][PATCH 1/7] bitbake: utils: remove spaces on empty lines

[Julien Stephan]

Le mar. 5 déc. 2023 à 16:45, Alexandre Belloni
 a écrit :
>
> On 05/12/2023 15:57:58+0100, Julien Stephan wrote:
> > Le mar. 5 déc. 2023 à 08:50, Alexandre Belloni
> >  a écrit :
> > >
> > > Please do not send bitbake patches in the same series as oe-core patches
> > > if there is no dependency. Those patches are applied on different
> > > repositories.
> >
> > Hi Alexandre,
> >
> > Noted! Do you want me to resend the series without the bitbake patch?
>
> No but  didn't take the bitbake patch because it doesn't do what the
> commit message says. (i.e. it touches non empty lines)
>

oups, I will update the commit message and send it to the appropriate list.

> >
> > Cheers
> > Julien
> > >
> > > On 04/12/2023 16:59:28+0100, Julien Stephan wrote:
> > > > Signed-off-by: Julien Stephan 
> > > > ---
> > > >  bitbake/lib/bb/utils.py | 16 
> > > >  1 file changed, 8 insertions(+), 8 deletions(-)
> > > >
> > > > diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> > > > index b401fa5ec7a..61ffad92ce3 100644
> > > > --- a/bitbake/lib/bb/utils.py
> > > > +++ b/bitbake/lib/bb/utils.py
> > > > @@ -50,7 +50,7 @@ def clean_context():
> > > >
> > > >  def get_context():
> > > >  return _context
> > > > -
> > > > +
> > > >
> > > >  def set_context(ctx):
> > > >  _context = ctx
> > > > @@ -212,8 +212,8 @@ def explode_dep_versions2(s, *, sort=True):
> > > >  inversion = True
> > > >  # This list is based on behavior and supported comparisons 
> > > > from deb, opkg and rpm.
> > > >  #
> > > > -# Even though =<, <<, ==, !=, =>, and >> may not be 
> > > > supported,
> > > > -# we list each possibly valid item.
> > > > +# Even though =<, <<, ==, !=, =>, and >> may not be 
> > > > supported,
> > > > +# we list each possibly valid item.
> > > >  # The build system is responsible for validation of what 
> > > > it supports.
> > > >  if i.startswith(('<=', '=<', '<<', '==', '!=', '>=', '=>', 
> > > > '>>')):
> > > >  lastcmp = i[0:2]
> > > > @@ -347,7 +347,7 @@ def _print_exception(t, value, tb, realfile, text, 
> > > > context):
> > > >  exception = traceback.format_exception_only(t, value)
> > > >  error.append('Error executing a python function in %s:\n' % 
> > > > realfile)
> > > >
> > > > -# Strip 'us' from the stack (better_exec call) unless that was 
> > > > where the
> > > > +# Strip 'us' from the stack (better_exec call) unless that was 
> > > > where the
> > > >  # error came from
> > > >  if tb.tb_next is not None:
> > > >  tb = tb.tb_next
> > > > @@ -746,9 +746,9 @@ def prunedir(topdir, ionice=False):
> > > >  # but thats possibly insane and suffixes is probably going to be small
> > > >  #
> > > >  def prune_suffix(var, suffixes, d):
> > > > -"""
> > > > +"""
> > > >  See if var ends with any of the suffixes listed and
> > > > -remove it if found
> > > > +remove it if found
> > > >  """
> > > >  for suffix in suffixes:
> > > >  if suffix and var.endswith(suffix):
> > > > @@ -1001,9 +1001,9 @@ def umask(new_mask):
> > > >  os.umask(current_mask)
> > > >
> > > >  def to_boolean(string, default=None):
> > > > -"""
> > > > +"""
> > > >  Check input string and return boolean value True/False/None
> > > > -depending upon the checks
> > > > +depending upon the checks
> > > >  """
> > > >  if not string:
> > > >  return default
> > > > --
> > > > 2.42.0
> > > >
> > >
> > > >
> > > > 
> > > >
> > >
> > >
> > > --
> > > Alexandre Belloni, co-owner and COO, Bootlin
> > > Embedded Linux and Kernel engineering
> > > https://bootlin.com
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191847): 
https://lists.openembedded.org/g/openembedded-core/message/191847
Mute This Topic: https://lists.openembedded.org/mt/102972946/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] nfs-utils: Upgrade 2.6.3 -> 2.6.4

[Alexandre Belloni via lists.openembedded.org]

Hello,

This fail for musl:

https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/8237/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/8267/steps/12/logs/stdio

On 04/12/2023 22:44:10-0800, Robert Yang via lists.openembedded.org wrote:
> From: Robert Yang 
> 
> Remove backported patch 
> 0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch.
> 
> Signed-off-by: Robert Yang 
> ---
>  ...event-and-libsqlite3-checked-when-nf.patch | 80 ---
>  ...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} |  3 +-
>  2 files changed, 1 insertion(+), 82 deletions(-)
>  delete mode 100644 
> meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch
>  rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb => 
> nfs-utils_2.6.4.bb} (97%)
> 
> diff --git 
> a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch
>  
> b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch
> deleted file mode 100644
> index 5afc714f190..000
> --- 
> a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch
> +++ /dev/null
> @@ -1,80 +0,0 @@
> -From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001
> -From: Wiktor Jaskulski 
> -Date: Thu, 11 May 2023 15:28:23 -0400
> -Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is
> - disabled
> -
> -Upstream-Status: Backport
> -(http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca)
> -
> -Signed-off-by: Steve Dickson 
> -Signed-off-by: Trevor Gamblin 
> 
> - configure.ac | 38 +++---
> - 1 file changed, 15 insertions(+), 23 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 4ade528d..519cacbf 100644
>  a/configure.ac
> -+++ b/configure.ac
> -@@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, ,
> - AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try 
> building with --enable-tirpc]))
> - CPPFLAGS="${nfsutils_save_CPPFLAGS}"
> - 
> -+dnl check for libevent libraries and headers
> -+AC_LIBEVENT
> -+
> -+dnl Check for sqlite3
> -+AC_SQLITE3_VERS
> -+
> -+case $libsqlite3_cv_is_recent in
> -+yes) ;;
> -+unknown)
> -+   dnl do not fail when cross-compiling
> -+   AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
> -+*)
> -+   AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;;
> -+esac
> -+
> - if test "$enable_nfsv4" = yes; then
> --  dnl check for libevent libraries and headers
> --  AC_LIBEVENT
> - 
> -   dnl check for the keyutils libraries and headers
> -   AC_KEYUTILS
> - 
> --  dnl Check for sqlite3
> --  AC_SQLITE3_VERS
> --
> -   if test "$enable_nfsdcld" = "yes"; then
> - AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
> - AC_MSG_ERROR([Cannot find header needed for nfsdcld]))
> --
> --case $libsqlite3_cv_is_recent in
> --yes) ;;
> --unknown)
> --  dnl do not fail when cross-compiling
> --  AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
> --*)
> --  AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;;
> --esac
> -   fi
> - 
> -   if test "$enable_nfsdcltrack" = "yes"; then
> - AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
> - AC_MSG_ERROR([Cannot find header needed for nfsdcltrack]))
> --
> --case $libsqlite3_cv_is_recent in
> --yes) ;;
> --unknown)
> --  dnl do not fail when cross-compiling
> --  AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
> --*)
> --  AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;;
> --esac
> -   fi
> - 
> - else
> --- 
> -2.41.0
> -
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb 
> b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
> similarity index 97%
> rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb
> rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
> index 35cf6af6d46..31290f6d44c 100644
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
> @@ -30,11 +30,10 @@ SRC_URI = 
> "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
> file://bugfix-adjust-statd-service-name.patch \
> file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch 
> \
> file://clang-warnings.patch \
> -   
> file://0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch \
>  file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \
>  file://0001-tools-locktest-Use-intmax_t-to-print-off_t.patch \
> "
> -SRC_URI[sha256sum] = 
> "38d89e853a71d3c560ff026af3d969d75e24f782ff68324e76261fe0344459e1"
> +SRC_URI[sha256sum] = 
> "01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d"
>  
>  # 

Re: [OE-core][kirkstone 0/4] linux-yocto: -stable updates

[Steve Sakoman]

On Mon, Dec 4, 2023 at 6:40 PM  wrote:
>
> From: Bruce Ashfield 
>
> Steve,
>
> Much like my last pull request to Richard, this has been
> generated from a newly provisioned machine after my old machine
> of 10 years had a disk failure.
>
> Let me know if you have any issues with this, and I'll debug
> what I missed when configuring the new box.

Hi Bruce,

I'm also seeing an issue with 5.15.141.

Local testing fails with:

WARNING: linux-yocto-5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0
do_fetch: Failed to fetch URL
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=kernel-meta,
attempting MIRRORS if available
ERROR: linux-yocto-5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0
do_fetch: Fetcher failure: Unable to find revision
92bd0a656f0f9db955fb53c52be71cce9296bdb2 in branch yocto-5.15 even
from upstream
ERROR: linux-yocto-5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0
do_fetch: Bitbake Fetcher Error: FetchError('Unable to fetch URL from
any source.', 
'git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=kernel-meta')
ERROR: Logfile of failure stored in:
/home/steve/builds/poky-contrib-kirkstone/build/tmp/work/qemux86_64-poky-linux/linux-yocto/5.15.141+gitAUTOINC+92bd0a656f_54a3472506-r0/temp/log.do_fetch.3515498

Steve

>
> Bruce
>
> Bruce Ashfield (4):
>   linux-yocto/5.10: update to v5.10.198
>   linux-yocto/5.10: update to v5.10.200
>   linux-yocto/5.10: update to v5.10.202
>   linux-yocto/5.15: update to v5.15.141
>
>  .../linux/linux-yocto-rt_5.10.bb  |  6 ++---
>  .../linux/linux-yocto-rt_5.15.bb  |  6 ++---
>  .../linux/linux-yocto-tiny_5.10.bb|  8 +++---
>  .../linux/linux-yocto-tiny_5.15.bb|  6 ++---
>  meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 -
>  meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +--
>  6 files changed, 38 insertions(+), 38 deletions(-)
>
> --
> 2.39.2
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191845): 
https://lists.openembedded.org/g/openembedded-core/message/191845
Mute This Topic: https://lists.openembedded.org/mt/102986489/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 3/3] linux-yocto/5.4: update to v5.4.262

[Steve Sakoman]

Hi Bruce,

I'm getting a failure on the autobuilder for this version bump:

https://errors.yoctoproject.org/Errors/Details/745216/

ERROR: Package Version (5.4.262+gitAUTOINC+9f1a56eeea_102ea8999f) does
not match of kernel being built (5.4.260). Please update the PV
variable to match the kernel source or set
KERNEL_VERSION_SANITY_SKIP="1" in your recipe.

Steve

On Mon, Dec 4, 2023 at 6:43 PM  wrote:
>
> From: Bruce Ashfield 
>
> Updating  to the latest korg -stable release that comprises
> the following commits:
>
> 8e221b47173d Linux 5.4.262
> b053223b7cf4 netfilter: nf_tables: bogus EBUSY when deleting flowtable 
> after flush (for 5.4)
> c35df8b8c572 netfilter: nf_tables: disable toggling dormant table state 
> more than once
> e10f661adc55 netfilter: nf_tables: fix table flag updates
> 46c2947fcd71 netfilter: nftables: update table flags from the commit phase
> b09e6ccf0d12 netfilter: nf_tables: double hook unregistration in netns 
> path
> b05a24cc453e netfilter: nf_tables: unregister flowtable hooks on netns 
> exit
> a995a68e8a3b netfilter: nf_tables: fix memleak when more than 255 
> elements expired
> b95d7af657a8 netfilter: nft_set_hash: try later when GC hits EAGAIN on 
> iteration
> 61a7b3de20e2 netfilter: nft_set_rbtree: use read spinlock to avoid 
> datapath contention
> 03caf75da105 netfilter: nft_set_rbtree: skip sync GC for new elements in 
> this transaction
> 021d734c7eaa netfilter: nf_tables: defer gc run if previous batch is 
> still pending
> 38ed6a5f836f netfilter: nf_tables: use correct lock to protect gc_list
> 4b6346dc1edf netfilter: nf_tables: GC transaction race with abort path
> b76dcf466223 netfilter: nf_tables: GC transaction race with netns 
> dismantle
> 29ff9b8efb84 netfilter: nf_tables: fix GC transaction races with netns 
> and netlink event exit path
> 1398a0eee290 netfilter: nf_tables: remove busy mark and gc batch API
> 85520a1f1d87 netfilter: nft_set_hash: mark set element as dead when 
> deleting from packet path
> c357648929c8 netfilter: nf_tables: adapt set backend to use GC 
> transaction API
> bbdb3b65aa91 netfilter: nf_tables: GC transaction API to avoid race with 
> control plane
> 1da4874d05da netfilter: nf_tables: don't skip expired elements during walk
> acaee227cf79 netfilter: nft_set_rbtree: fix overlap expiration walk
> 899aa5638568 netfilter: nft_set_rbtree: fix null deref on element 
> insertion
> 181859bdfb97 netfilter: nft_set_rbtree: Switch to node list walk for 
> overlap detection
> 3c7ec098e3b5 netfilter: nf_tables: drop map element references from 
> preparation phase
> 6b880f3b2c04 netfilter: nftables: rename set element data 
> activation/deactivation functions
> e1eed9e0b5e8 netfilter: nf_tables: pass context to nft_set_destroy()
> 961c4511c757 tracing: Have trace_event_file have ref counters
> 7676a41d90c5 drm/amdgpu: fix error handling in amdgpu_bo_list_get()
> 36383005f1db ext4: remove gdb backup copy for meta bg in 
> setup_new_flex_group_blocks
> e95f74653dff ext4: correct the start block of counting reserved clusters
> 1fbfdcc3d65e ext4: correct return value of ext4_convert_meta_bg
> dfdfd3f21830 ext4: correct offset of gdb backup in non meta_bg group to 
> update_backups
> 85c12e80c474 ext4: apply umask if ACL support is disabled
> d2aed8814f02 Revert "net: r8169: Disable multicast filter for RTL8168H 
> and RTL8107E"
> b9e5f633b35d nfsd: fix file memleak on client_opens_release
> 339d7d40d3dc media: venus: hfi: add checks to handle capabilities from 
> firmware
> cab97cdd409a media: venus: hfi: fix the check to handle session buffer 
> requirement
> 5d39d0c1f43f media: venus: hfi_parser: Add check to keep the number of 
> codecs within range
> 497b12d47cc6 media: sharp: fix sharp encoding
> 92d8a0478fb3 media: lirc: drop trailing space from scancode transmit
> cac054d10324 i2c: i801: fix potential race in 
> i801_block_transaction_byte_by_byte
> b132e462363f net: dsa: lan9303: consequently nested-lock physical MDIO
> 229738d71702 Revert ncsi: Propagate carrier gain/loss events to the NCSI 
> controller
> 4074957ec6bb Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE
> 356a2ee5fc36 Bluetooth: btusb: Add RTW8852BE device 13d3:3570 to device 
> tables
> afe92b66a5d8 bluetooth: Add device 13d3:3571 to device tables
> dc073a2626d3 bluetooth: Add device 0bda:887b to device tables
> 75d26f7f6118 Bluetooth: btusb: Add Realtek RTL8852BE support ID 
> 0x0cb8:0xc559
> 323710a6b4c6 Bluetooth: btusb: add Realtek 8822CE to usb_device_id table
> 981ee23b8d48 Bluetooth: btusb: Add flag to define wideband speech 
> capability
> 0fe69c99cc13 tty: serial: meson: fix hard LOCKUP on crtscts mode
> 8f40bbf7dc01 serial: meson: Use platform_get_irq() to get the interrupt
> a1113f2c9b2c tty: serial: meson: retrieve port FIFO size from DT
>   

[OE-core] Yocto Project Status 5 December 2023 (WW49)

[Stephen Jolley]

Current Dev Position: YP 5.0 M1

Next Deadline: 4th December 2023 YP 5.0 M1 build

Next Team Meetings:

   -

   Bug Triage meeting Thursday December 7th at 7:30 am PST (
   https://zoom.us/j/454367603?pwd=ZGxoa2ZXL3FkM3Y0bFd5aVpHVVZ6dz09)
   -

   Weekly Project Engineering Sync Tuesday December 5th at 8 am PST (
   https://zoom.us/j/990892712?pwd=cHU1MjhoM2x6ck81bkcrYjRrcmJsUT09)
   
   -

   Twitch -  See https://www.twitch.tv/theyoctojester


Key Status/Updates:

   -

   YP 4.2.4 and YP 4.3.1 have passed QA and are under discussion pending
   release
   -

   The point releases are being held up due to issues with the regression
   reports and the number of intermittent failures seen during the release
   builds with the 4.3 series
   -

   YP 5.0 M1 is due to build this week, we’ll likely do that after trying
   to address some of the current issues and patch queue
   -

   An issue was found in the recent hash equivalence changes in bitbake
   which was causing large delays when there was heavy IO load due to sync()
   calls. There is a fix in bitbake master for this. It tended to affect users
   with slower spinning disks and not SSDs.
   -

   The length of builds (world and oe-selftest) continues to be a concern.
   -

   There is a significant change to runqueue being tested with regard to
   the handling of dependencies between setscene tasks. The patch should allow
   us to fix long standing issues with useradd functionality but it is hard to
   ensure all corner cases work correctly with the patch.
   -

   The intermittent issues on the autobuilder are causing problems for
   master branch development and stable releases and this is slowing down
   patch testing and merging. We simply don't have enough people to fix the
   issues quickly enough and the people we do have are struggling. This is now
   slowly down point release approvals too as a knock on effect.
   -

   Toaster now has UI support for importing existing command line builds,
   the patches are in testing on master-next and we do have some automated
   testing available on the autobuilder.
   -

   The Yocto Project Summit was well attended and successful last week.
   Thanks to everyone who helped make it happen!


Ways to contribute:

   -

   As people are likely aware, the project has a number of components which
   are either unmaintained, or have people with little to no time trying to
   keep them alive. These components include: devtool, toaster, wic, oeqa,
   autobuilder, CROPs containers, pseudo and more. Many have open bugs. Help
   is welcome in trying to better look after these components!
   -

   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 5.0. See:
   
https://wiki.yoctoproject.org/wiki/Bug_Triage#Medium+_5.0_Unassigned_Enhancements/Bugs
   -

   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/maintainers.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.
   -

   Help is very much welcome in trying to resolve our autobuilder
   intermittent issues. 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.
   -

   Help us resolve CVE issues: CVE metrics
   
   -

   We have a growing number of bugs in bugzilla, any help with them is
   appreciated.


YP 5.0 Milestone Dates:

   -

   YP 5.0 M1 build date 2023/12/04
   -

   YP 5.0 M1 Release date 2023/12/15
   -

   YP 5.0 M2 build date  2024/01/15
   -

   YP 5.0 M2 Release date 2024/01/24
   -

   YP 5.0 M3 build date  2024/02/19
   -

   YP 5.0 M3 Release date 2024/03/01
   -

   YP 5.0 M4 build date  2024/04/01
   -

   YP 5.0 M4 Release date 2024/04/30


Upcoming dot releases:

   -

   YP 4.2.4 is out of QA and being reviewed for release.
   -

   YP 4.3.1 is out of QA and being reviewed for release.
   -

   YP 3.1.30 build date 2023/12/11
   -

   YP 3.1.30 Release date 2023/12/22
   -

   YP 4.0.15 build date 2023/12/18
   -

   YP 4.0.15 Release date 2023/12/29
   -

   YP 4.3.2 build date 2024/01/08
   -

   YP 4.3.2 Release date 2024/01/19
   -

   YP 3.1.31 build date 2024/01/22
   -

   YP 3.1.31 Release date 2024/02/02
   -

   YP 4.0.16 build date 2024/01/29
   -

   YP 4.0.16 Release date 2024/02/09
   -

   YP 4.3.3 build date 2024/02/12
   -

   YP 4.3.3 Release date 2024/02/23
   -

   YP 3.1.32 build date 2024/03/04
   -

   YP 3.1.32 Release date 2024/03/15
   -

   YP 4.0.17 build date 2024/03/11
   -

   YP 4.0.17 Release date 2024/03/22
   -

   YP 4.3.4 build date 2024/03/25

Re: [OE-core] [RESEND][PATCH 1/7] bitbake: utils: remove spaces on empty lines

[Alexandre Belloni via lists.openembedded.org]

On 05/12/2023 15:57:58+0100, Julien Stephan wrote:
> Le mar. 5 déc. 2023 à 08:50, Alexandre Belloni
>  a écrit :
> >
> > Please do not send bitbake patches in the same series as oe-core patches
> > if there is no dependency. Those patches are applied on different
> > repositories.
> 
> Hi Alexandre,
> 
> Noted! Do you want me to resend the series without the bitbake patch?

No but  didn't take the bitbake patch because it doesn't do what the
commit message says. (i.e. it touches non empty lines)

> 
> Cheers
> Julien
> >
> > On 04/12/2023 16:59:28+0100, Julien Stephan wrote:
> > > Signed-off-by: Julien Stephan 
> > > ---
> > >  bitbake/lib/bb/utils.py | 16 
> > >  1 file changed, 8 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> > > index b401fa5ec7a..61ffad92ce3 100644
> > > --- a/bitbake/lib/bb/utils.py
> > > +++ b/bitbake/lib/bb/utils.py
> > > @@ -50,7 +50,7 @@ def clean_context():
> > >
> > >  def get_context():
> > >  return _context
> > > -
> > > +
> > >
> > >  def set_context(ctx):
> > >  _context = ctx
> > > @@ -212,8 +212,8 @@ def explode_dep_versions2(s, *, sort=True):
> > >  inversion = True
> > >  # This list is based on behavior and supported comparisons 
> > > from deb, opkg and rpm.
> > >  #
> > > -# Even though =<, <<, ==, !=, =>, and >> may not be 
> > > supported,
> > > -# we list each possibly valid item.
> > > +# Even though =<, <<, ==, !=, =>, and >> may not be 
> > > supported,
> > > +# we list each possibly valid item.
> > >  # The build system is responsible for validation of what it 
> > > supports.
> > >  if i.startswith(('<=', '=<', '<<', '==', '!=', '>=', '=>', 
> > > '>>')):
> > >  lastcmp = i[0:2]
> > > @@ -347,7 +347,7 @@ def _print_exception(t, value, tb, realfile, text, 
> > > context):
> > >  exception = traceback.format_exception_only(t, value)
> > >  error.append('Error executing a python function in %s:\n' % 
> > > realfile)
> > >
> > > -# Strip 'us' from the stack (better_exec call) unless that was 
> > > where the
> > > +# Strip 'us' from the stack (better_exec call) unless that was 
> > > where the
> > >  # error came from
> > >  if tb.tb_next is not None:
> > >  tb = tb.tb_next
> > > @@ -746,9 +746,9 @@ def prunedir(topdir, ionice=False):
> > >  # but thats possibly insane and suffixes is probably going to be small
> > >  #
> > >  def prune_suffix(var, suffixes, d):
> > > -"""
> > > +"""
> > >  See if var ends with any of the suffixes listed and
> > > -remove it if found
> > > +remove it if found
> > >  """
> > >  for suffix in suffixes:
> > >  if suffix and var.endswith(suffix):
> > > @@ -1001,9 +1001,9 @@ def umask(new_mask):
> > >  os.umask(current_mask)
> > >
> > >  def to_boolean(string, default=None):
> > > -"""
> > > +"""
> > >  Check input string and return boolean value True/False/None
> > > -depending upon the checks
> > > +depending upon the checks
> > >  """
> > >  if not string:
> > >  return default
> > > --
> > > 2.42.0
> > >
> >
> > >
> > > 
> > >
> >
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191842): 
https://lists.openembedded.org/g/openembedded-core/message/191842
Mute This Topic: https://lists.openembedded.org/mt/102972946/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] Patchtest results for [PATCH] tiff: Backport fixes for CVE-2023-6277

[Trevor Gamblin]

On 2023-12-04 04:57, Alexander Kanavin wrote:

Is this a different patchtest issue to the one that was fixed?


Looks like there are still excessive line length issues with the 
patchtest report that I need to fix.


This is what it reported:

FAIL: test Signed-off-by presence: A patch file has been added without a 
Signed-off-by tag. Sign off the added patch file 
(meta/recipes-multimedia/libtiff/tiff/545.patch) 
(test_patch.TestPatch.test_signed_off_by_presence)
FAIL: test Upstream-Status presence: Added patch file is missing Upstream-Status: 
 in the commit message 
(test_patch.TestPatch.test_upstream_status_presence_format)
FAIL: test commit message presence: Please include a commit message on your 
patch explaining the change (test_mbox.TestMbox.test_commit_message_presence)



Alex

On Sun, 3 Dec 2023 at 17:33, Patchtest
  wrote:

Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Tests failed for the patch, but the results log could not be processed due to 
excessive result line length.
---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug athttps://bugzilla.yoctoproject.org/  (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see:https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!




-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191841): 
https://lists.openembedded.org/g/openembedded-core/message/191841
Mute This Topic: https://lists.openembedded.org/mt/102954001/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] [RESEND][PATCH 1/7] bitbake: utils: remove spaces on empty lines

[Julien Stephan]

Le mar. 5 déc. 2023 à 08:50, Alexandre Belloni
 a écrit :
>
> Please do not send bitbake patches in the same series as oe-core patches
> if there is no dependency. Those patches are applied on different
> repositories.

Hi Alexandre,

Noted! Do you want me to resend the series without the bitbake patch?

Cheers
Julien
>
> On 04/12/2023 16:59:28+0100, Julien Stephan wrote:
> > Signed-off-by: Julien Stephan 
> > ---
> >  bitbake/lib/bb/utils.py | 16 
> >  1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> > index b401fa5ec7a..61ffad92ce3 100644
> > --- a/bitbake/lib/bb/utils.py
> > +++ b/bitbake/lib/bb/utils.py
> > @@ -50,7 +50,7 @@ def clean_context():
> >
> >  def get_context():
> >  return _context
> > -
> > +
> >
> >  def set_context(ctx):
> >  _context = ctx
> > @@ -212,8 +212,8 @@ def explode_dep_versions2(s, *, sort=True):
> >  inversion = True
> >  # This list is based on behavior and supported comparisons 
> > from deb, opkg and rpm.
> >  #
> > -# Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > -# we list each possibly valid item.
> > +# Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > +# we list each possibly valid item.
> >  # The build system is responsible for validation of what it 
> > supports.
> >  if i.startswith(('<=', '=<', '<<', '==', '!=', '>=', '=>', 
> > '>>')):
> >  lastcmp = i[0:2]
> > @@ -347,7 +347,7 @@ def _print_exception(t, value, tb, realfile, text, 
> > context):
> >  exception = traceback.format_exception_only(t, value)
> >  error.append('Error executing a python function in %s:\n' % 
> > realfile)
> >
> > -# Strip 'us' from the stack (better_exec call) unless that was 
> > where the
> > +# Strip 'us' from the stack (better_exec call) unless that was 
> > where the
> >  # error came from
> >  if tb.tb_next is not None:
> >  tb = tb.tb_next
> > @@ -746,9 +746,9 @@ def prunedir(topdir, ionice=False):
> >  # but thats possibly insane and suffixes is probably going to be small
> >  #
> >  def prune_suffix(var, suffixes, d):
> > -"""
> > +"""
> >  See if var ends with any of the suffixes listed and
> > -remove it if found
> > +remove it if found
> >  """
> >  for suffix in suffixes:
> >  if suffix and var.endswith(suffix):
> > @@ -1001,9 +1001,9 @@ def umask(new_mask):
> >  os.umask(current_mask)
> >
> >  def to_boolean(string, default=None):
> > -"""
> > +"""
> >  Check input string and return boolean value True/False/None
> > -depending upon the checks
> > +depending upon the checks
> >  """
> >  if not string:
> >  return default
> > --
> > 2.42.0
> >
>
> >
> > 
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191840): 
https://lists.openembedded.org/g/openembedded-core/message/191840
Mute This Topic: https://lists.openembedded.org/mt/102972946/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 v3 07/10] recipeutils: bbappend_recipe: allow to patch the recipe itself

[Julien Stephan]

Add a new parameter update_original_recipe to allow to patch a recipe
instead of creating/updating a bbappend

Signed-off-by: Julien Stephan 
---
 meta/lib/oe/recipeutils.py | 35 +--
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index d86873056fe..ae02af0feeb 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -664,7 +664,7 @@ def get_bbappend_path(d, destlayerdir, wildcardver=False):
 return (appendpath, pathok)
 
 
-def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, 
wildcardver=False, machine=None, extralines=None, removevalues=None, 
redirect_output=None, params=None):
+def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, 
wildcardver=False, machine=None, extralines=None, removevalues=None, 
redirect_output=None, params=None, update_original_recipe=False):
 """
 Writes a bbappend file for a recipe
 Parameters:
@@ -701,19 +701,29 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, 
install=None, wildcardver=False,
 params:
 Parameters to use when adding entries to SRC_URI. If specified,
 should be a list of dicts with the same length as srcfiles.
+update_original_recipe:
+Force to update the original recipe instead of creating/updating
+a bbapend. destlayerdir must contain the original recipe
 """
 
 if not removevalues:
 removevalues = {}
 
 recipefile = rd.getVar('FILE')
-# Determine how the bbappend should be named
-appendpath, pathok = get_bbappend_path(rd, destlayerdir, wildcardver)
-if not appendpath:
-bb.error('Unable to determine layer directory containing %s' % 
recipefile)
-return (None, None)
-if not pathok:
-bb.warn('Unable to determine correct subdirectory path for bbappend 
file - check that what %s adds to BBFILES also matches .bbappend files. Using 
%s for now, but until you fix this the bbappend will not be applied.' % 
(os.path.join(destlayerdir, 'conf', 'layer.conf'), os.path.dirname(appendpath)))
+if update_original_recipe:
+if destlayerdir not in recipefile:
+bb.error("destlayerdir %s doesn't contain the original recipe 
(%s), cannot update it" % (destlayerdir, recipefile))
+return (None, None)
+
+appendpath = recipefile
+else:
+# Determine how the bbappend should be named
+appendpath, pathok = get_bbappend_path(rd, destlayerdir, wildcardver)
+if not appendpath:
+bb.error('Unable to determine layer directory containing %s' % 
recipefile)
+return (None, None)
+if not pathok:
+bb.warn('Unable to determine correct subdirectory path for 
bbappend file - check that what %s adds to BBFILES also matches .bbappend 
files. Using %s for now, but until you fix this the bbappend will not be 
applied.' % (os.path.join(destlayerdir, 'conf', 'layer.conf'), 
os.path.dirname(appendpath)))
 
 appenddir = os.path.dirname(appendpath)
 if not redirect_output:
@@ -758,7 +768,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, 
install=None, wildcardver=False,
 bbappendlines.append((varname, op, value))
 
 destsubdir = rd.getVar('PN')
-if srcfiles:
+if not update_original_recipe and srcfiles:
 bbappendlines.append(('FILESEXTRAPATHS:prepend', ':=', 
'${THISDIR}/${PN}:'))
 
 appendoverride = ''
@@ -791,7 +801,10 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, 
install=None, wildcardver=False,
 appendline('SRC_URI:append%s' % appendoverride, '=', ' 
' + srcurientry)
 else:
 if oldentry:
-appendline('SRC_URI:remove', '=', oldentry)
+if update_original_recipe:
+removevalues['SRC_URI'] = oldentry
+else:
+appendline('SRC_URI:remove', '=', oldentry)
 appendline('SRC_URI', '+=', srcurientry)
 param['path'] = srcfile
 else:
@@ -816,6 +829,8 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, 
install=None, wildcardver=False,
 # multiple times per operation when we're handling overrides)
 if os.path.exists(appendpath) and not os.path.exists(outfile):
 shutil.copy2(appendpath, outfile)
+elif update_original_recipe:
+outfile = recipefile
 else:
 bb.note('Writing append file %s' % appendpath)
 outfile = appendpath
-- 
2.42.0


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

[OE-core] [PATCH v3 06/10] recipetool: appendsrcfile(s): use params instead of extraline

[Julien Stephan]

appendsrc function relies on oe.recipeutils.bbappend_recipe to
copy files and add the corresponding entries in SRC_URI.

Currently, appendsrc function build itself the new SRC_URI entry to add the
correct subdir param, and gives it using the extralines parameter.
This has 2 drawbacks:
- oe.recipeutils.bbappend_recipe can already do this if we specify the
  correct params, so we have duplicate code
- the duplicated code is not fully functional: for example, it doesn't
  take into account the -m/--machine parameter

So fix this by not using extralines but give correctly formatted params.

Also remove the check for already existing entries as
oe.recipeutils.bbappend_recipe already implement it

The new bbappend file now have the SRC_URI entry after the
FILESEXTRAPATHS so fix the selftest.

Update test_recipetool_appendsrcfile_existing_in_src_uri_diff_params
test because recipetool appendsrcfiles used to not add new src_uri entry
if the entry already exist even with different parameters while
oe.recipeutils.bbappend_recipe adds it if parameters are different (and
remove the old entry)

Signed-off-by: Julien Stephan 
---
 meta/lib/oeqa/selftest/cases/recipetool.py | 21 ++---
 scripts/lib/recipetool/append.py   | 26 +-
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 55cbba9ca74..21cb350e8a6 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -1054,9 +1054,9 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
 for uri in src_uri:
 p = urllib.parse.urlparse(uri)
 if p.scheme == 'file':
-return p.netloc + p.path
+return p.netloc + p.path, uri
 
-def _test_appendsrcfile(self, testrecipe, filename=None, destdir=None, 
has_src_uri=True, srcdir=None, newfile=None, options=''):
+def _test_appendsrcfile(self, testrecipe, filename=None, destdir=None, 
has_src_uri=True, srcdir=None, newfile=None, remove=None, options=''):
 if newfile is None:
 newfile = self.testfile
 
@@ -1083,12 +1083,18 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
 
 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
  '\n']
+
+if remove:
+for entry in remove:
+expectedlines.extend(['SRC_URI:remove = "%s"\n' % entry,
+   '\n'])
+
 if has_src_uri:
 uri = 'file://%s' % filename
 if expected_subdir:
 uri += ';subdir=%s' % expected_subdir
-expectedlines[0:0] = ['SRC_URI += "%s"\n' % uri,
-  '\n']
+expectedlines.extend(['SRC_URI += "%s"\n' % uri,
+  '\n'])
 
 return self._try_recipetool_appendsrcfile(testrecipe, newfile, 
destpath, options, expectedlines, [filename])
 
@@ -1143,18 +1149,17 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
 
 def test_recipetool_appendsrcfile_existing_in_src_uri(self):
 testrecipe = 'base-files'
-filepath = self._get_first_file_uri(testrecipe)
+filepath,_  = self._get_first_file_uri(testrecipe)
 self.assertTrue(filepath, 'Unable to test, no file:// uri found in 
SRC_URI for %s' % testrecipe)
 self._test_appendsrcfile(testrecipe, filepath, has_src_uri=False)
 
 def test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(self):
 testrecipe = 'base-files'
 subdir = 'tmp'
-filepath = self._get_first_file_uri(testrecipe)
+filepath, srcuri_entry = self._get_first_file_uri(testrecipe)
 self.assertTrue(filepath, 'Unable to test, no file:// uri found in 
SRC_URI for %s' % testrecipe)
 
-output = self._test_appendsrcfile(testrecipe, filepath, subdir, 
has_src_uri=False)
-self.assertTrue(any('with different parameters' in l for l in output))
+self._test_appendsrcfile(testrecipe, filepath, subdir, 
remove=[srcuri_entry])
 
 def test_recipetool_appendsrcfile_replace_file_srcdir(self):
 testrecipe = 'bash'
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 58512e9e4b4..fc3cc4a0b7f 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -300,7 +300,9 @@ def appendfile(args):
 if st.st_mode & stat.S_IXUSR:
 perms = '0755'
 install = {args.newfile: (args.targetpath, perms)}
-oe.recipeutils.bbappend_recipe(rd, args.destlayer, {args.newfile: 
{'path' : sourcepath}}, install, wildcardver=args.wildcard_version, 
machine=args.machine)
+if sourcepath:
+sourcepath = os.path.basename(sourcepath)
+oe.recipeutils.bbappend_recipe(rd, args.destlayer, {args.newfile: 
{'newname' : sourcepath}}, install, 

[OE-core] [PATCH v3 10/10] oeqa/selftest/recipetool: appendsrc: add test for update mode

[Julien Stephan]

add a basic test for testing the update mode of recipetool
appendsrcfile(s)

Signed-off-by: Julien Stephan 
---
 meta/lib/oeqa/selftest/cases/recipetool.py | 28 ++
 1 file changed, 28 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index c55025e7df6..0a82b081a2d 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -1193,6 +1193,34 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
 # A more complex test: existing entry in src_uri with different param
 
self.test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(machine='mymachine')
 
+def test_recipetool_appendsrcfile_update_recipe_basic(self):
+testrecipe = "base-files"
+recipefile = get_bb_var('FILE', testrecipe)
+result = runCmd('bitbake-layers show-layers')
+layerrecipe = None
+for line in result.output.splitlines()[3:]:
+with open("/tmp/juju.txt", "a") as file:
+layer = line.split()[1]
+print(layer, file=file)
+if layer in recipefile:
+layerrecipe = layer
+break
+self.assertTrue(layerrecipe, 'Unable to find the layer containing %s' 
% testrecipe)
+cmd = 'recipetool appendsrcfile -u %s %s %s' % (layerrecipe, 
testrecipe, self.testfile)
+result = runCmd(cmd)
+self.assertNotIn('Traceback', result.output)
+self.add_command_to_tearDown('cd %s; rm -f %s/%s; git checkout .' % 
(os.path.dirname(recipefile), testrecipe, os.path.basename(self.testfile)))
+
+expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)),
+   ('??', '.*/%s/%s/%s$' % (testrecipe, testrecipe, 
os.path.basename(self.testfile)))]
+self._check_repo_status(os.path.dirname(recipefile), expected_status)
+result = runCmd('git diff %s' % os.path.basename(recipefile), 
cwd=os.path.dirname(recipefile))
+removelines = []
+addlines = [
+'file://%s ' % os.path.basename(self.testfile),
+]
+self._check_diff(result.output, addlines, removelines)
+
 def test_recipetool_appendsrcfile_replace_file_srcdir(self):
 testrecipe = 'bash'
 filepath = 'Makefile.in'
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191839): 
https://lists.openembedded.org/g/openembedded-core/message/191839
Mute This Topic: https://lists.openembedded.org/mt/102992854/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 v3 09/10] oeqa/selftest/recipetool: appendsrfile: add test for machine

[Julien Stephan]

Add a new test for machine specific bbappend override

Signed-off-by: Julien Stephan 
---
 meta/lib/oeqa/selftest/cases/recipetool.py | 44 +++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 21cb350e8a6..c55025e7df6 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -1056,7 +1056,7 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
 if p.scheme == 'file':
 return p.netloc + p.path, uri
 
-def _test_appendsrcfile(self, testrecipe, filename=None, destdir=None, 
has_src_uri=True, srcdir=None, newfile=None, remove=None, options=''):
+def _test_appendsrcfile(self, testrecipe, filename=None, destdir=None, 
has_src_uri=True, srcdir=None, newfile=None, remove=None, machine=None , 
options=''):
 if newfile is None:
 newfile = self.testfile
 
@@ -1084,17 +1084,39 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
  '\n']
 
+override = ""
+if machine:
+options += ' -m %s' % machine
+override = ':append:%s' % machine
+expectedlines.extend(['PACKAGE_ARCH = "${MACHINE_ARCH}"\n',
+  '\n'])
+
 if remove:
 for entry in remove:
-expectedlines.extend(['SRC_URI:remove = "%s"\n' % entry,
+if machine:
+entry_remove_line = 'SRC_URI:remove:%s = " %s"\n' % 
(machine, entry)
+else:
+entry_remove_line = 'SRC_URI:remove = "%s"\n' % entry
+
+expectedlines.extend([entry_remove_line,
'\n'])
 
 if has_src_uri:
 uri = 'file://%s' % filename
 if expected_subdir:
 uri += ';subdir=%s' % expected_subdir
-expectedlines.extend(['SRC_URI += "%s"\n' % uri,
-  '\n'])
+if machine:
+src_uri_line = 'SRC_URI%s = " %s"\n' % (override, uri)
+else:
+src_uri_line = 'SRC_URI += "%s"\n' % uri
+
+expectedlines.extend([src_uri_line, '\n'])
+
+with open("/tmp/tmp.txt", "w") as file:
+print(expectedlines, file=file)
+
+if machine:
+filename = '%s/%s' % (machine, filename)
 
 return self._try_recipetool_appendsrcfile(testrecipe, newfile, 
destpath, options, expectedlines, [filename])
 
@@ -1153,13 +1175,23 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
 self.assertTrue(filepath, 'Unable to test, no file:// uri found in 
SRC_URI for %s' % testrecipe)
 self._test_appendsrcfile(testrecipe, filepath, has_src_uri=False)
 
-def test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(self):
+def test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(self, 
machine=None):
 testrecipe = 'base-files'
 subdir = 'tmp'
 filepath, srcuri_entry = self._get_first_file_uri(testrecipe)
 self.assertTrue(filepath, 'Unable to test, no file:// uri found in 
SRC_URI for %s' % testrecipe)
 
-self._test_appendsrcfile(testrecipe, filepath, subdir, 
remove=[srcuri_entry])
+self._test_appendsrcfile(testrecipe, filepath, subdir, 
machine=machine, remove=[srcuri_entry])
+
+def test_recipetool_appendsrcfile_machine(self):
+# A very basic test
+self._test_appendsrcfile('base-files', 'a-file', machine='mymachine')
+
+# Force cleaning the output of previous test
+self.tearDownLocal()
+
+# A more complex test: existing entry in src_uri with different param
+
self.test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(machine='mymachine')
 
 def test_recipetool_appendsrcfile_replace_file_srcdir(self):
 testrecipe = 'bash'
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191838): 
https://lists.openembedded.org/g/openembedded-core/message/191838
Mute This Topic: https://lists.openembedded.org/mt/102992853/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 v3 08/10] recipetool: appendsrcfile(s): add a mode to update the recipe itself

[Julien Stephan]

Add a new option -u/--update-recipe to update the recipe itself instead
of creating/updating a bbappend file

Signed-off-by: Julien Stephan 
---
 scripts/lib/recipetool/append.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index fc3cc4a0b7f..341e8933057 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -357,7 +357,9 @@ def appendsrc(args, files, rd, extralines=None):
 dry_run_outdir = dry_run_output.name
 
 appendfile, _ = oe.recipeutils.bbappend_recipe(rd, args.destlayer, 
copyfiles, None, wildcardver=args.wildcard_version, machine=args.machine, 
extralines=extralines, params=params,
-   
redirect_output=dry_run_outdir)
+   
redirect_output=dry_run_outdir, update_original_recipe=args.update_recipe)
+if not appendfile:
+return
 if args.dry_run:
 output = ''
 appendfilename = os.path.basename(appendfile)
@@ -459,6 +461,7 @@ def register_commands(subparsers):
help='Create/update a bbappend to add or 
replace source files',
description='Creates a bbappend (or updates 
an existing one) to add or replace the specified file in the recipe sources, 
either those in WORKDIR or those in the source tree. This command lets you 
specify multiple files with a destination directory, so cannot specify the 
destination filename. See the `appendsrcfile` command for the other behavior.')
 parser.add_argument('-D', '--destdir', help='Destination directory 
(relative to S or WORKDIR, defaults to ".")', default='', type=destination_path)
+parser.add_argument('-u', '--update-recipe', help='Update recipe instead 
of creating (or updating) a bbapend file. DESTLAYER must contains the recipe to 
update', action='store_true')
 parser.add_argument('-n', '--dry-run', help='Dry run mode', 
action='store_true')
 parser.add_argument('files', nargs='+', metavar='FILE', help='File(s) to 
be added to the recipe sources (WORKDIR or S)', type=existing_path)
 parser.set_defaults(func=lambda a: appendsrcfiles(parser, a), 
parserecipes=True)
@@ -467,6 +470,7 @@ def register_commands(subparsers):
parents=[common_src],
help='Create/update a bbappend to add or 
replace a source file',
description='Creates a bbappend (or updates 
an existing one) to add or replace the specified files in the recipe sources, 
either those in WORKDIR or those in the source tree. This command lets you 
specify the destination filename, not just destination directory, but only 
works for one file. See the `appendsrcfiles` command for the other behavior.')
+parser.add_argument('-u', '--update-recipe', help='Update recipe instead 
of creating (or updating) a bbapend file. DESTLAYER must contains the recipe to 
update', action='store_true')
 parser.add_argument('-n', '--dry-run', help='Dry run mode', 
action='store_true')
 parser.add_argument('file', metavar='FILE', help='File to be added to the 
recipe sources (WORKDIR or S)', type=existing_path)
 parser.add_argument('destfile', metavar='DESTFILE', nargs='?', 
help='Destination path (relative to S or WORKDIR, optional)', 
type=destination_path)
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191837): 
https://lists.openembedded.org/g/openembedded-core/message/191837
Mute This Topic: https://lists.openembedded.org/mt/102992852/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 v3 05/10] recipeutils: bbappend_recipe: remove old srcuri entry if parameters are different

[Julien Stephan]

Currently we do not add a new src_ury entry if the entry already exists
AND the parameters are the same.

I believe that when an entry already exist with different parameters,
we should remove it and add the new entry otherwise we end up with two
entries with different parameters

Signed-off-by: Julien Stephan 
---
 meta/lib/oe/recipeutils.py | 8 
 1 file changed, 8 insertions(+)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 1d793693bfd..d86873056fe 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -776,14 +776,22 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, 
install=None, wildcardver=False,
 else:
 srcfile = os.path.basename(newfile)
 srcurientry = 'file://%s' % srcfile
+oldentry = None
+for uri in rd.getVar('SRC_URI').split():
+if srcurientry in uri:
+oldentry = uri
 if params and params[i]:
 srcurientry = '%s;%s' % (srcurientry, ';'.join('%s=%s' % 
(k,v) for k,v in params[i].items()))
 # Double-check it's not there already
 # FIXME do we care if the entry is added by another bbappend 
that might go away?
 if not srcurientry in rd.getVar('SRC_URI').split():
 if machine:
+if oldentry:
+appendline('SRC_URI:remove%s' % appendoverride, 
'=', ' ' + oldentry)
 appendline('SRC_URI:append%s' % appendoverride, '=', ' 
' + srcurientry)
 else:
+if oldentry:
+appendline('SRC_URI:remove', '=', oldentry)
 appendline('SRC_URI', '+=', srcurientry)
 param['path'] = srcfile
 else:
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191834): 
https://lists.openembedded.org/g/openembedded-core/message/191834
Mute This Topic: https://lists.openembedded.org/mt/102992849/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 v3 03/10] recipeutils: bbappend_recipe: fix docstring

[Julien Stephan]

Add missing patchdir key in docstring description for srcfiles
parameters.

Also fix typo: value --> key in srcfile docstring description

Signed-off-by: Julien Stephan 
---
 meta/lib/oe/recipeutils.py | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 0aa6d0593ed..01c9ad190fe 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -671,10 +671,12 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, 
install=None, wildcardver=False,
 rd: data dictionary for the recipe
 destlayerdir: base directory of the layer to place the bbappend in
 (subdirectory path from there will be determined automatically)
-srcfiles: dict of source files to add to SRC_URI, where the value
+srcfiles: dict of source files to add to SRC_URI, where the key
 is the full path to the file to be added, and the value is a
-dict with 'path' key containing the original filename as it
-would appear in SRC_URI or None if it isn't already present.
+dict with following optional keys:
+path: the original filename as it would appear in SRC_URI
+or None if it isn't already present.
+patchdir: the patchdir parameter
 You may pass None for this parameter if you simply want to specify
 your own content via the extralines parameter.
 install: dict mapping entries in srcfiles to a tuple of two elements:
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191832): 
https://lists.openembedded.org/g/openembedded-core/message/191832
Mute This Topic: https://lists.openembedded.org/mt/102992847/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 v3 04/10] recipeutils: bbappend_recipe: add a way to specify the name of the file to add

[Julien Stephan]

bbappend_recipe can take a dict of source files to add to SRC_URI where
the key is the full path to the file to be added and the value is a dict

Add a new optionnal entry "newname" to specify the name of the newly added file

Signed-off-by: Julien Stephan 
---
 meta/lib/oe/recipeutils.py | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 01c9ad190fe..1d793693bfd 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -677,6 +677,8 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, 
install=None, wildcardver=False,
 path: the original filename as it would appear in SRC_URI
 or None if it isn't already present.
 patchdir: the patchdir parameter
+newname: the name to give to the new added file. None to use
+the default value: basename(path)
 You may pass None for this parameter if you simply want to specify
 your own content via the extralines parameter.
 install: dict mapping entries in srcfiles to a tuple of two elements:
@@ -769,7 +771,10 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, 
install=None, wildcardver=False,
 for i, (newfile, param) in enumerate(srcfiles.items()):
 srcurientry = None
 if not 'path' in param or not param['path']:
-srcfile = os.path.basename(newfile)
+if 'newname' in param and param['newname']:
+srcfile = param['newname']
+else:
+srcfile = os.path.basename(newfile)
 srcurientry = 'file://%s' % srcfile
 if params and params[i]:
 srcurientry = '%s;%s' % (srcurientry, ';'.join('%s=%s' % 
(k,v) for k,v in params[i].items()))
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191833): 
https://lists.openembedded.org/g/openembedded-core/message/191833
Mute This Topic: https://lists.openembedded.org/mt/102992848/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 v3 02/10] recipeutils: bbappend_recipe: fix undefined variable

[Julien Stephan]

In the case get_bbappend_path returns None (could not find the layer
containing the recipe) the error message tries to print the recipefile,
but it is not defined. Fix it.

Signed-off-by: Julien Stephan 
---
 meta/lib/oe/recipeutils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 25b159bc1bc..0aa6d0593ed 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -702,6 +702,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, 
install=None, wildcardver=False,
 if not removevalues:
 removevalues = {}
 
+recipefile = rd.getVar('FILE')
 # Determine how the bbappend should be named
 appendpath, pathok = get_bbappend_path(rd, destlayerdir, wildcardver)
 if not appendpath:
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191830): 
https://lists.openembedded.org/g/openembedded-core/message/191830
Mute This Topic: https://lists.openembedded.org/mt/102992845/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 v3 00/10] Several fixes around recipetool appendsrcfile(s) and oe.recipeutils.bbappend_recipe

[Julien Stephan]

Hi all,

I was trying to use recipetool appendsrcfile to add a file to a recipe and I 
noticed several issues:
* -m is not correctly supported
* recipetool appendsrfile(s) are missing a usefull dry-run mode
* appendsrc function relies on oe.recipeutils.bbappend_recipe but
  duplicates some code: it constructs itself the new src_uri entry
  although oe.recipeutils.bbappend_recipe is already doing it
* we are lacking a mode to patch the recipe itself

So this series tries to fix the issues above, fix the selftest
accordingly and add new test for -m and for "patch mode" (update recipe)
and also add a way to specify the name of the file to add
(in oe.recipeutils.bbappend_recipe)

Improvements from v2:
- rebase on latest master fix conflict and update the way to add newname in 
bbappend_recipe()

Improvements from v1:
- in bbappend_recipe function remove old entry if an entry with different 
parameters already exists 
to avoid duplicate entries with different parameters

Link to v1: https://lists.openembedded.org/g/openembedded-core/message/191544
Link to v2: https://lists.openembedded.org/g/openembedded-core/message/191744

Julien Stephan (10):
  recipetool: appendsrcfile(s): add dry-run mode
  recipeutils: bbappend_recipe: fix undefined variable
  recipeutils: bbappend_recipe: fix docstring
  recipeutils: bbappend_recipe: add a way to specify the name of the
file to add
  recipeutils: bbappend_recipe: remove old srcuri entry if parameters
are different
  recipetool: appendsrcfile(s): use params instead of extraline
  recipeutils: bbappend_recipe: allow to patch the recipe itself
  recipetool: appendsrcfile(s): add a mode to update the recipe itself
  oeqa/selftest/recipetool: appendsrfile: add test for machine
  oeqa/selftest/recipetool: appendsrc: add test for update mode

 meta/lib/oe/recipeutils.py | 57 +++
 meta/lib/oeqa/selftest/cases/recipetool.py | 83 +++---
 scripts/lib/recipetool/append.py   | 63 +++-
 3 files changed, 164 insertions(+), 39 deletions(-)

-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191831): 
https://lists.openembedded.org/g/openembedded-core/message/191831
Mute This Topic: https://lists.openembedded.org/mt/102992846/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 v3 01/10] recipetool: appendsrcfile(s): add dry-run mode

[Julien Stephan]

Add dry-run mode for recipetool appendsrcfile and appendsrcfiles, with
if necessary, a diff of changes

Signed-off-by: Julien Stephan 
---
 scripts/lib/recipetool/append.py | 33 +++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 4b6a7112c2b..58512e9e4b4 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -18,6 +18,7 @@ import shutil
 import scriptutils
 import errno
 from collections import defaultdict
+import difflib
 
 logger = logging.getLogger('recipetool')
 
@@ -355,7 +356,35 @@ def appendsrc(args, files, rd, extralines=None):
 extralines.append('SRC_URI += {0}'.format(source_uri))
 copyfiles[newfile] = {'path' : srcfile}
 
-oe.recipeutils.bbappend_recipe(rd, args.destlayer, copyfiles, None, 
wildcardver=args.wildcard_version, machine=args.machine, extralines=extralines)
+dry_run_output = None
+dry_run_outdir = None
+if args.dry_run:
+import tempfile
+dry_run_output = tempfile.TemporaryDirectory(prefix='devtool')
+dry_run_outdir = dry_run_output.name
+
+appendfile, _ = oe.recipeutils.bbappend_recipe(rd, args.destlayer, 
copyfiles, None, wildcardver=args.wildcard_version, machine=args.machine, 
extralines=extralines, redirect_output=dry_run_outdir)
+if args.dry_run:
+output = ''
+appendfilename = os.path.basename(appendfile)
+newappendfile = appendfile
+if appendfile and os.path.exists(appendfile):
+with open(appendfile, 'r') as f:
+oldlines = f.readlines()
+else:
+appendfile = '/dev/null'
+oldlines = []
+
+with open(os.path.join(dry_run_outdir, appendfilename), 'r') as f:
+newlines = f.readlines()
+diff = difflib.unified_diff(oldlines, newlines, appendfile, 
newappendfile)
+difflines = list(diff)
+if difflines:
+output += ''.join(difflines)
+if output:
+logger.info('Diff of changed files:\n%s' % output)
+else:
+logger.info('No changed files')
 tinfoil.modified_files()
 
 def appendsrcfiles(parser, args):
@@ -436,6 +465,7 @@ def register_commands(subparsers):
help='Create/update a bbappend to add or 
replace source files',
description='Creates a bbappend (or updates 
an existing one) to add or replace the specified file in the recipe sources, 
either those in WORKDIR or those in the source tree. This command lets you 
specify multiple files with a destination directory, so cannot specify the 
destination filename. See the `appendsrcfile` command for the other behavior.')
 parser.add_argument('-D', '--destdir', help='Destination directory 
(relative to S or WORKDIR, defaults to ".")', default='', type=destination_path)
+parser.add_argument('-n', '--dry-run', help='Dry run mode', 
action='store_true')
 parser.add_argument('files', nargs='+', metavar='FILE', help='File(s) to 
be added to the recipe sources (WORKDIR or S)', type=existing_path)
 parser.set_defaults(func=lambda a: appendsrcfiles(parser, a), 
parserecipes=True)
 
@@ -443,6 +473,7 @@ def register_commands(subparsers):
parents=[common_src],
help='Create/update a bbappend to add or 
replace a source file',
description='Creates a bbappend (or updates 
an existing one) to add or replace the specified files in the recipe sources, 
either those in WORKDIR or those in the source tree. This command lets you 
specify the destination filename, not just destination directory, but only 
works for one file. See the `appendsrcfiles` command for the other behavior.')
+parser.add_argument('-n', '--dry-run', help='Dry run mode', 
action='store_true')
 parser.add_argument('file', metavar='FILE', help='File to be added to the 
recipe sources (WORKDIR or S)', type=existing_path)
 parser.add_argument('destfile', metavar='DESTFILE', nargs='?', 
help='Destination path (relative to S or WORKDIR, optional)', 
type=destination_path)
 parser.set_defaults(func=lambda a: appendsrcfile(parser, a), 
parserecipes=True)
-- 
2.42.0


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

[OE-core] Patchtest results for [kirkstone][PATCH v2 3/5] rust-cross/rust-common: Merge arm target handling code to fix cross-canadian

[Patchtest]

Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch 
/home/patchtest/share/mboxes/kirkstone-v2-3-5-rust-cross-rust-common-Merge-arm-target-handling-code-to-fix-cross-canadian.patch

FAIL: test shortlog length: Edit shortlog so that it is 90 characters or less 
(currently 91 characters) (test_mbox.TestMbox.test_shortlog_length)

PASS: test Signed-off-by presence 
(test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence 
(test_mbox.TestMbox.test_commit_message_presence)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)

SKIP: pretest pylint: No python related patches, skipping test 
(test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: No modified recipes, skipping pretest 
(test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE tag format: No new CVE patches introduced 
(test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced 
(test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced 
(test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found 
(test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, 
skipping test 
(test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test 
(test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test 
(test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test 
(test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now 
(test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: No modified recipes, skipping pretest 
(test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test 
(test_metadata.TestMetadata.test_summary_presence)
SKIP: test target mailing list: Series merged, no reason to check other mailing 
lists (test_mbox.TestMbox.test_target_mailing_list)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!

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

[OE-core] [kirkstone][PATCH v2 5/5] native: Clear TUNE_FEATURES/ABIEXTENSION

[Jermain Horsman]

From: Richard Purdie 

Some recipes reference these. Rather than continually trying to chase down the 
references
and taskhash issues, clear the variables for an easier life and simpler code. 
These
wouldn't convey anything useful in a native build.

Signed-off-by: Richard Purdie 
(cherry picked from commit f8edeead263708889d31a7ff578ef8274cb678b4)
Signed-off-by: Jermain Horsman 
---
 meta/classes/native.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 4de96cd59b..56726301bd 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -23,6 +23,8 @@ TARGET_CFLAGS = "${BUILD_CFLAGS}"
 TARGET_CXXFLAGS = "${BUILD_CXXFLAGS}"
 TARGET_LDFLAGS = "${BUILD_LDFLAGS}"
 TARGET_FPU = ""
+TUNE_FEATURES = ""
+ABIEXTENSION = ""
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_OS = "${BUILD_OS}"
-- 
2.42.0.windows.2


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

[OE-core] [kirkstone][PATCH v2 4/5] rust-cross: Simplfy the rust_gen_target calls

[Jermain Horsman]

From: Richard Purdie 

Match the code in rust-cross-canadian so that further simplifications
can be considered in future.

Signed-off-by: Richard Purdie 
(cherry picked from commit 5cb62d0a33777cb9afb1eea5f736a2580ce50dc7)
Signed-off-by: Jermain Horsman 
---
 meta/recipes-devtools/rust/rust-common.inc | 12 ++--
 meta/recipes-devtools/rust/rust-cross.inc  | 16 
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust-common.inc 
b/meta/recipes-devtools/rust/rust-common.inc
index 3252827818..a73367bbd5 100644
--- a/meta/recipes-devtools/rust/rust-common.inc
+++ b/meta/recipes-devtools/rust/rust-common.inc
@@ -119,12 +119,12 @@ def llvm_features(d):
 
 
 ## arm-unknown-linux-gnueabihf
-DATA_LAYOUT[arm] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
-TARGET_ENDIAN[arm] = "little"
-TARGET_POINTER_WIDTH[arm] = "32"
-TARGET_C_INT_WIDTH[arm] = "32"
-MAX_ATOMIC_WIDTH[arm] = "64"
-FEATURES[arm] = "+v6,+vfp2"
+DATA_LAYOUT[arm-eabi] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
+TARGET_ENDIAN[arm-eabi] = "little"
+TARGET_POINTER_WIDTH[arm-eabi] = "32"
+TARGET_C_INT_WIDTH[arm-eabi] = "32"
+MAX_ATOMIC_WIDTH[arm-eabi] = "64"
+FEATURES[arm-eabi] = "+v6,+vfp2"
 
 ## armv7-unknown-linux-gnueabihf
 DATA_LAYOUT[armv7-eabi] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
diff --git a/meta/recipes-devtools/rust/rust-cross.inc 
b/meta/recipes-devtools/rust/rust-cross.inc
index 4c026b1f38..2e47a3aa5f 100644
--- a/meta/recipes-devtools/rust/rust-cross.inc
+++ b/meta/recipes-devtools/rust/rust-cross.inc
@@ -1,17 +1,9 @@
 python do_rust_gen_targets () {
 wd = d.getVar('WORKDIR') + '/targets/'
-# It is important 'TARGET' is last here so that it overrides our less
-# informed choices for BUILD & HOST if TARGET happens to be the same as
-# either of them.
-for thing in ['BUILD', 'HOST', 'TARGET']:
-bb.debug(1, "rust_gen_target for " + thing)
-features = ""
-cpu = "generic"
-arch = d.getVar('{}_ARCH'.format(thing))
-if thing is "TARGET":
-features = d.getVar('TARGET_LLVM_FEATURES') or ""
-cpu = d.getVar('TARGET_LLVM_CPU')
-rust_gen_target(d, thing, wd, features, cpu, arch)
+# Order of BUILD, HOST, TARGET is important in case the files overwrite, 
most specific last
+rust_gen_target(d, 'BUILD', wd, "", "generic", d.getVar('BUILD_ARCH'))
+rust_gen_target(d, 'HOST', wd, "", "generic", d.getVar('HOST_ARCH'))
+rust_gen_target(d, 'TARGET', wd, d.getVar('TARGET_LLVM_FEATURES') or "", 
d.getVar('TARGET_LLVM_CPU'), d.getVar('TARGET_ARCH'))
 }
 
 # Otherwise we'll depend on what we provide
-- 
2.42.0.windows.2


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

[OE-core] [kirkstone][PATCH v2 3/5] rust-cross/rust-common: Merge arm target handling code to fix cross-canadian

[Jermain Horsman]

From: Richard Purdie 

rust-cross had special handling for armv7 targets but we also need this
for cross-canadian. Merge the code into the main function so everything is
consistent.

Also then fix the arm definition to be arm-eabi since ABI is correctly
being looked up.

Signed-off-by: Richard Purdie 
(cherry picked from commit ff3c3dbbd2bf1bb7bb70b55cca203e9eedcf14a8)
Signed-off-by: Jermain Horsman 
---
 meta/recipes-devtools/rust/rust-common.inc | 6 ++
 meta/recipes-devtools/rust/rust-cross.inc  | 7 +--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust-common.inc 
b/meta/recipes-devtools/rust/rust-common.inc
index ac00fd3d43..3252827818 100644
--- a/meta/recipes-devtools/rust/rust-common.inc
+++ b/meta/recipes-devtools/rust/rust-common.inc
@@ -297,6 +297,12 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, 
abi=""):
 sys = sys_for(d, thing)
 prefix = prefix_for(d, thing)
 
+if thing == "TARGET":
+abi = d.getVar('ABIEXTENSION')
+# arm and armv7 have different targets in llvm
+if arch == "arm" and target_is_armv7(d):
+arch = 'armv7'
+
 rust_arch = oe.rust.arch_to_rust_arch(arch)
 
 if abi:
diff --git a/meta/recipes-devtools/rust/rust-cross.inc 
b/meta/recipes-devtools/rust/rust-cross.inc
index f6babfeeda..4c026b1f38 100644
--- a/meta/recipes-devtools/rust/rust-cross.inc
+++ b/meta/recipes-devtools/rust/rust-cross.inc
@@ -8,15 +8,10 @@ python do_rust_gen_targets () {
 features = ""
 cpu = "generic"
 arch = d.getVar('{}_ARCH'.format(thing))
-abi = ""
 if thing is "TARGET":
-abi = d.getVar('ABIEXTENSION')
-# arm and armv7 have different targets in llvm
-if arch == "arm" and target_is_armv7(d):
-arch = 'armv7'
 features = d.getVar('TARGET_LLVM_FEATURES') or ""
 cpu = d.getVar('TARGET_LLVM_CPU')
-rust_gen_target(d, thing, wd, features, cpu, arch, abi)
+rust_gen_target(d, thing, wd, features, cpu, arch)
 }
 
 # Otherwise we'll depend on what we provide
-- 
2.42.0.windows.2


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

[OE-core] [kirkstone][PATCH v2 2/5] rust-cross-canadian: Fix ordering of target json config generation

[Jermain Horsman]

From: Richard Purdie 

Based upon a patch from Otavio Salvador ,
ensure the target json files are written in the correct order with
the most specific last incase it overwrites earlier files if the prefixes
match.

Signed-off-by: Richard Purdie 
(cherry picked from commit 1912c4e9e0ecf9655f3b3a41588b54d7956f5899)
Signed-off-by: Jermain Horsman 
---
 meta/recipes-devtools/rust/rust-cross-canadian-common.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust-cross-canadian-common.inc 
b/meta/recipes-devtools/rust/rust-cross-canadian-common.inc
index 1f21c8af26..df4901f1fa 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian-common.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian-common.inc
@@ -27,9 +27,10 @@ DEBUG_PREFIX_MAP = 
"-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDP
 
 python do_rust_gen_targets () {
 wd = d.getVar('WORKDIR') + '/targets/'
-rust_gen_target(d, 'TARGET', wd, d.getVar('TARGET_LLVM_FEATURES') or "", 
d.getVar('TARGET_LLVM_CPU'), d.getVar('TARGET_ARCH'))
-rust_gen_target(d, 'HOST', wd, "", "generic", d.getVar('HOST_ARCH'))
+# Order of BUILD, HOST, TARGET is important in case the files overwrite, 
most specific last
 rust_gen_target(d, 'BUILD', wd, "", "generic", d.getVar('BUILD_ARCH'))
+rust_gen_target(d, 'HOST', wd, "", "generic", d.getVar('HOST_ARCH'))
+rust_gen_target(d, 'TARGET', wd, d.getVar('TARGET_LLVM_FEATURES') or "", 
d.getVar('TARGET_LLVM_CPU'), d.getVar('TARGET_ARCH'))
 }
 
 INHIBIT_DEFAULT_RUST_DEPS = "1"
-- 
2.42.0.windows.2


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

[OE-core] [kirkstone][PATCH v2 1/5] rust-common: Set llvm-target correctly for cross SDK targets

[Jermain Horsman]

From: Richard Purdie 

When a 'BUILD' target is requested we shouldn't be looking at TARGET_SYS but
at BUILD_SYS. Due to the way rust mangles triplets, we need the HOST_SYS triplet
to work with existing code - fixing that issue is a separate patch.

Also drop the arch_abi argument, it doens't make any sense to a getVar() call
and was a copy and paste error.

Based on a patch from Otavio Salvador  but separated 
out
and tweaked.

Fixes: bd36593ba3 ("rust-common: Drop LLVM_TARGET and simplify")

Signed-off-by: Richard Purdie 
(cherry picked from commit d554161a045d12411f288394e253c54aa4c1257c)
Signed-off-by: Jermain Horsman 
---
 meta/recipes-devtools/rust/rust-common.inc | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/rust/rust-common.inc 
b/meta/recipes-devtools/rust/rust-common.inc
index db0bd8fc1b..ac00fd3d43 100644
--- a/meta/recipes-devtools/rust/rust-common.inc
+++ b/meta/recipes-devtools/rust/rust-common.inc
@@ -307,9 +307,13 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, 
abi=""):
 features = features or d.getVarFlag('FEATURES', arch_abi) or ""
 features = features.strip()
 
+llvm_target = d.getVar('RUST_TARGET_SYS')
+if thing == "BUILD":
+llvm_target = d.getVar('RUST_HOST_SYS')
+
 # build tspec
 tspec = {}
-tspec['llvm-target'] = d.getVar('RUST_TARGET_SYS', arch_abi)
+tspec['llvm-target'] = llvm_target
 tspec['data-layout'] = d.getVarFlag('DATA_LAYOUT', arch_abi)
 tspec['max-atomic-width'] = int(d.getVarFlag('MAX_ATOMIC_WIDTH', arch_abi))
 tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', 
arch_abi)
-- 
2.42.0.windows.2


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

[OE-core] [kirkstone][PATCH v2 0/5] Failure for rust-cross for arm(v5)

[Jermain Horsman]

From: Jermain Horsman 

I ran into the following when trying to compile rust for arm (on kirkstone):

Exception: TypeError: int() argument must be a string, a bytes-like object or a 
number, not 'NoneType'

After some investigation I notices some patches on master which were not
available on kirkstone.
Using the patches included here I am able to compile successfully.

v2:
I've included all patches that were originally send as a series on the
mailing list.
I've also included a single patch that should prevent the issue with the
oe-selftest reported on the first version.



Richard Purdie (5):
  rust-common: Set llvm-target correctly for cross SDK targets
  rust-cross-canadian: Fix ordering of target json config generation
  rust-cross/rust-common: Merge arm target handling code to fix
cross-canadian
  rust-cross: Simplfy the rust_gen_target calls
  native: Clear TUNE_FEATURES/ABIEXTENSION

 meta/classes/native.bbclass   |  2 ++
 meta/recipes-devtools/rust/rust-common.inc| 24 +--
 .../rust/rust-cross-canadian-common.inc   |  5 ++--
 meta/recipes-devtools/rust/rust-cross.inc | 21 
 4 files changed, 26 insertions(+), 26 deletions(-)

-- 
2.42.0.windows.2


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

Re: [OE-core][PATCH v2] gdb/systemd: enable minidebuginfo support conditionally

[Etienne Cordonnier via lists.openembedded.org]

Version 2 of the patch: I implemented the feedback of Richard (convert
PACKAGE_MINIDEBUGINFO to a DISTRO_FEATURES), and added a runtime test.
This was my local.conf used for testing (with "bitbake -v -c testimage
core-image-sato"):

DISTRO_FEATURES:append = " minidebuginfo"
IMAGE_CLASSES += "testimage"
TEST_SUITES += "ping ssh systemd"

DISTRO_FEATURES:append = " systemd usrmerge"
DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"

Etienne

On Tue, Dec 5, 2023 at 2:38 PM  wrote:

> From: Etienne Cordonnier 
>
> Enabling minidebuginfo is not useful if gdb and systemd-coredump
> are unable to parse it.
>
> In order to parse it, gdb needs xz support. Systemd needs coredump
> enabled, as
> well as elfutil enabled as well (systemd-coredump loads libdw which is
> part of elfutils using dlopen).
>
> Signed-off-by: Etienne Cordonnier 
> ---
>  meta/classes-global/package.bbclass   |  2 +-
>  meta/lib/oe/package.py|  2 +-
>  meta/lib/oeqa/runtime/cases/systemd.py| 21 +++
>  meta/lib/oeqa/selftest/cases/minidebuginfo.py |  2 +-
>  meta/recipes-core/systemd/systemd_254.4.bb|  1 +
>  .../elfutils/elfutils_0.189.bb|  4 +++-
>  meta/recipes-devtools/gdb/gdb-common.inc  |  4 +++-
>  7 files changed, 31 insertions(+), 5 deletions(-)
>
> diff --git a/meta/classes-global/package.bbclass
> b/meta/classes-global/package.bbclass
> index 2ad820a81f..f56bca3542 100644
> --- a/meta/classes-global/package.bbclass
> +++ b/meta/classes-global/package.bbclass
> @@ -234,7 +234,7 @@ python () {
>  deps = ""
>  for dep in (d.getVar('PACKAGE_DEPENDS') or "").split():
>  deps += " %s:do_populate_sysroot" % dep
> -if d.getVar('PACKAGE_MINIDEBUGINFO') == '1':
> +if bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', True,
> False, d):
>  deps += ' xz-native:do_populate_sysroot'
>  d.appendVarFlag('do_package', 'depends', deps)
>
> diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
> index f69bf9c353..9a465eaa09 100644
> --- a/meta/lib/oe/package.py
> +++ b/meta/lib/oe/package.py
> @@ -1239,7 +1239,7 @@ def process_split_and_strip_files(d):
>  oe.utils.multiprocess_launch(oe.package.runstrip, sfiles, d)
>
>  # Build "minidebuginfo" and reinject it back into the stripped
> binaries
> -if d.getVar('PACKAGE_MINIDEBUGINFO') == '1':
> +if bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', True, False,
> d):
>  oe.utils.multiprocess_launch(inject_minidebuginfo,
> list(elffiles), d,
>   extraargs=(dvar, dv, d))
>
> diff --git a/meta/lib/oeqa/runtime/cases/systemd.py
> b/meta/lib/oeqa/runtime/cases/systemd.py
> index 37f295492d..4c581ba396 100644
> --- a/meta/lib/oeqa/runtime/cases/systemd.py
> +++ b/meta/lib/oeqa/runtime/cases/systemd.py
> @@ -5,6 +5,7 @@
>  #
>
>  import re
> +import threading
>  import time
>
>  from oeqa.runtime.case import OERuntimeTestCase
> @@ -136,6 +137,26 @@ class SystemdServiceTests(SystemdTest):
>  status = self.target.run('mount -oro,remount /')[0]
>  self.assertTrue(status == 0, msg='Remounting / as r/o failed')
>
> +@skipIfNotFeature('minidebuginfo', 'Test requires minidebuginfo to be
> in DISTRO_FEATURES')
> +@OEHasPackage(['busybox'])
> +def test_systemd_coredump_minidebuginfo(self):
> +"""
> +Verify that call-stacks generated by systemd-coredump contain
> symbolicated call-stacks,
> +extracted from the minidebuginfo metadata (.gnu_debugdata elf
> section).
> +"""
> +t_thread = threading.Thread(target=self.target.run, args=("ulimit
> -c unlimited && sleep 1000",))
> +t_thread.start()
> +time.sleep(1)
> +
> +status, output = self.target.run('pidof sleep')
> +# cause segfault on purpose
> +self.target.run('kill -SEGV %s' % output)
> +self.assertEqual(status, 0, msg = 'Not able to find process that
> runs sleep, output : %s' % output)
> +
> +(status, output) = self.target.run('coredumpctl info')
> +self.assertEqual(status, 0, msg='MiniDebugInfo Test failed: %s' %
> output)
> +self.assertEqual('sleep_for_duration (busybox.nosuid' in output,
> True, msg='Call stack is missing minidebuginfo symbols (functions shown as
> "n/a"): %s' % output)
> +
>  class SystemdJournalTests(SystemdTest):
>
>  @OETestDepends(['systemd.SystemdBasicTests.test_systemd_basic'])
> diff --git a/meta/lib/oeqa/selftest/cases/minidebuginfo.py
> b/meta/lib/oeqa/selftest/cases/minidebuginfo.py
> index aa1f9fa1f7..2919f07939 100644
> --- a/meta/lib/oeqa/selftest/cases/minidebuginfo.py
> +++ b/meta/lib/oeqa/selftest/cases/minidebuginfo.py
> @@ -21,7 +21,7 @@ class Minidebuginfo(OESelftestTestCase):
>  bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME',
> 'READELF'], image)
>

[OE-core][PATCH v2] gdb/systemd: enable minidebuginfo support conditionally

[Etienne Cordonnier via lists.openembedded.org]

From: Etienne Cordonnier 

Enabling minidebuginfo is not useful if gdb and systemd-coredump
are unable to parse it.

In order to parse it, gdb needs xz support. Systemd needs coredump enabled, as
well as elfutil enabled as well (systemd-coredump loads libdw which is part of 
elfutils using dlopen).

Signed-off-by: Etienne Cordonnier 
---
 meta/classes-global/package.bbclass   |  2 +-
 meta/lib/oe/package.py|  2 +-
 meta/lib/oeqa/runtime/cases/systemd.py| 21 +++
 meta/lib/oeqa/selftest/cases/minidebuginfo.py |  2 +-
 meta/recipes-core/systemd/systemd_254.4.bb|  1 +
 .../elfutils/elfutils_0.189.bb|  4 +++-
 meta/recipes-devtools/gdb/gdb-common.inc  |  4 +++-
 7 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/meta/classes-global/package.bbclass 
b/meta/classes-global/package.bbclass
index 2ad820a81f..f56bca3542 100644
--- a/meta/classes-global/package.bbclass
+++ b/meta/classes-global/package.bbclass
@@ -234,7 +234,7 @@ python () {
 deps = ""
 for dep in (d.getVar('PACKAGE_DEPENDS') or "").split():
 deps += " %s:do_populate_sysroot" % dep
-if d.getVar('PACKAGE_MINIDEBUGINFO') == '1':
+if bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', True, False, 
d):
 deps += ' xz-native:do_populate_sysroot'
 d.appendVarFlag('do_package', 'depends', deps)
 
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index f69bf9c353..9a465eaa09 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -1239,7 +1239,7 @@ def process_split_and_strip_files(d):
 oe.utils.multiprocess_launch(oe.package.runstrip, sfiles, d)
 
 # Build "minidebuginfo" and reinject it back into the stripped binaries
-if d.getVar('PACKAGE_MINIDEBUGINFO') == '1':
+if bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', True, False, d):
 oe.utils.multiprocess_launch(inject_minidebuginfo, list(elffiles), d,
  extraargs=(dvar, dv, d))
 
diff --git a/meta/lib/oeqa/runtime/cases/systemd.py 
b/meta/lib/oeqa/runtime/cases/systemd.py
index 37f295492d..4c581ba396 100644
--- a/meta/lib/oeqa/runtime/cases/systemd.py
+++ b/meta/lib/oeqa/runtime/cases/systemd.py
@@ -5,6 +5,7 @@
 #
 
 import re
+import threading
 import time
 
 from oeqa.runtime.case import OERuntimeTestCase
@@ -136,6 +137,26 @@ class SystemdServiceTests(SystemdTest):
 status = self.target.run('mount -oro,remount /')[0]
 self.assertTrue(status == 0, msg='Remounting / as r/o failed')
 
+@skipIfNotFeature('minidebuginfo', 'Test requires minidebuginfo to be in 
DISTRO_FEATURES')
+@OEHasPackage(['busybox'])
+def test_systemd_coredump_minidebuginfo(self):
+"""
+Verify that call-stacks generated by systemd-coredump contain 
symbolicated call-stacks,
+extracted from the minidebuginfo metadata (.gnu_debugdata elf section).
+"""
+t_thread = threading.Thread(target=self.target.run, args=("ulimit -c 
unlimited && sleep 1000",))
+t_thread.start()
+time.sleep(1)
+
+status, output = self.target.run('pidof sleep')
+# cause segfault on purpose
+self.target.run('kill -SEGV %s' % output)
+self.assertEqual(status, 0, msg = 'Not able to find process that runs 
sleep, output : %s' % output)
+
+(status, output) = self.target.run('coredumpctl info')
+self.assertEqual(status, 0, msg='MiniDebugInfo Test failed: %s' % 
output)
+self.assertEqual('sleep_for_duration (busybox.nosuid' in output, True, 
msg='Call stack is missing minidebuginfo symbols (functions shown as "n/a"): 
%s' % output)
+
 class SystemdJournalTests(SystemdTest):
 
 @OETestDepends(['systemd.SystemdBasicTests.test_systemd_basic'])
diff --git a/meta/lib/oeqa/selftest/cases/minidebuginfo.py 
b/meta/lib/oeqa/selftest/cases/minidebuginfo.py
index aa1f9fa1f7..2919f07939 100644
--- a/meta/lib/oeqa/selftest/cases/minidebuginfo.py
+++ b/meta/lib/oeqa/selftest/cases/minidebuginfo.py
@@ -21,7 +21,7 @@ class Minidebuginfo(OESelftestTestCase):
 bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME', 
'READELF'], image)
 
 self.write_config("""
-PACKAGE_MINIDEBUGINFO = "1"
+DISTRO_FEATURES:append = " minidebuginfo"
 IMAGE_FSTYPES = "tar.bz2"
 """)
 bitbake("{} {}:do_addto_recipe_sysroot".format(image, binutils))
diff --git a/meta/recipes-core/systemd/systemd_254.4.bb 
b/meta/recipes-core/systemd/systemd_254.4.bb
index 4d68a3266a..0c12926bef 100644
--- a/meta/recipes-core/systemd/systemd_254.4.bb
+++ b/meta/recipes-core/systemd/systemd_254.4.bb
@@ -67,6 +67,7 @@ PAM_PLUGINS = " \
 
 PACKAGECONFIG ??= " \
 ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam selinux 
smack usrmerge polkit seccomp', d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump 
elfutils', '', d)} \
 

Re: [OE-core] [PATCH] linux-yocto: update CVE exclusions

[Ross Burton]

Note that this depends on Bruce’s latest kernel patches.

Ross

> On 5 Dec 2023, at 13:23, Ross Burton via lists.openembedded.org 
>  wrote:
> 
> From: Ross Burton 
> 
> Signed-off-by: Ross Burton 
> ---
> .../linux/cve-exclusion_6.1.inc   | 26 +++
> .../linux/cve-exclusion_6.5.inc   | 22 +---
> 2 files changed, 40 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc 
> b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc
> index 1216e0c2ddd..1e366481ff6 100644
> --- a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc
> +++ b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc
> @@ -1,9 +1,9 @@
> 
> # Auto-generated CVE metadata, DO NOT EDIT BY HAND.
> -# Generated at 2023-11-09 17:12:27.365962+00:00 for version 6.1.61
> +# Generated at 2023-12-05 13:22:34.961692+00:00 for version 6.1.65
> 
> python check_kernel_cve_status_version() {
> -this_version = "6.1.61"
> +this_version = "6.1.65"
> kernel_version = d.getVar("LINUX_VERSION")
> if kernel_version != this_version:
> bb.warn("Kernel CVE status needs updating: generated for %s but 
> kernel is %s" % (this_version, kernel_version))
> @@ -4524,7 +4524,7 @@ CVE_STATUS[CVE-2022-43945] = "fixed-version: Fixed from 
> version 6.1rc1"
> 
> # CVE-2022-44033 needs backporting (fixed from 6.4rc1)
> 
> -# CVE-2022-44034 has no known resolution
> +# CVE-2022-44034 needs backporting (fixed from 6.4rc1)
> 
> # CVE-2022-4543 has no known resolution
> 
> @@ -5016,6 +5016,10 @@ CVE_STATUS[CVE-2023-39193] = "cpe-stable-backport: 
> Backported in 6.1.53"
> 
> CVE_STATUS[CVE-2023-39194] = "cpe-stable-backport: Backported in 6.1.47"
> 
> +CVE_STATUS[CVE-2023-39197] = "cpe-stable-backport: Backported in 6.1.39"
> +
> +CVE_STATUS[CVE-2023-39198] = "cpe-stable-backport: Backported in 6.1.47"
> +
> CVE_STATUS[CVE-2023-4004] = "cpe-stable-backport: Backported in 6.1.42"
> 
> # CVE-2023-4010 has no known resolution
> @@ -5104,7 +5108,7 @@ CVE_STATUS[CVE-2023-4881] = "cpe-stable-backport: 
> Backported in 6.1.54"
> 
> CVE_STATUS[CVE-2023-4921] = "cpe-stable-backport: Backported in 6.1.54"
> 
> -# CVE-2023-5090 needs backporting (fixed from 6.6rc7)
> +CVE_STATUS[CVE-2023-5090] = "cpe-stable-backport: Backported in 6.1.62"
> 
> CVE_STATUS[CVE-2023-5158] = "cpe-stable-backport: Backported in 6.1.57"
> 
> @@ -5114,7 +5118,19 @@ CVE_STATUS[CVE-2023-5197] = "cpe-stable-backport: 
> Backported in 6.1.56"
> 
> CVE_STATUS[CVE-2023-5345] = "cpe-stable-backport: Backported in 6.1.56"
> 
> -# CVE-2023-5633 needs backporting (fixed from 6.6rc6)
> +CVE_STATUS[CVE-2023-5633] = "fixed-version: only affects 6.2 onwards"
> 
> CVE_STATUS[CVE-2023-5717] = "cpe-stable-backport: Backported in 6.1.60"
> 
> +# CVE-2023-5972 needs backporting (fixed from 6.6rc7)
> +
> +# CVE-2023-6039 needs backporting (fixed from 6.5rc5)
> +
> +CVE_STATUS[CVE-2023-6111] = "fixed-version: only affects 6.6rc3 onwards"
> +
> +# CVE-2023-6121 needs backporting (fixed from 6.7rc3)
> +
> +CVE_STATUS[CVE-2023-6176] = "cpe-stable-backport: Backported in 6.1.54"
> +
> +# CVE-2023-6238 has no known resolution
> +
> diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.5.inc 
> b/meta/recipes-kernel/linux/cve-exclusion_6.5.inc
> index b4086d436c4..6304d80844c 100644
> --- a/meta/recipes-kernel/linux/cve-exclusion_6.5.inc
> +++ b/meta/recipes-kernel/linux/cve-exclusion_6.5.inc
> @@ -1,9 +1,9 @@
> 
> # Auto-generated CVE metadata, DO NOT EDIT BY HAND.
> -# Generated at 2023-11-09 17:13:01.267965+00:00 for version 6.5.10
> +# Generated at 2023-12-05 13:22:43.339114+00:00 for version 6.5.13
> 
> python check_kernel_cve_status_version() {
> -this_version = "6.5.10"
> +this_version = "6.5.13"
> kernel_version = d.getVar("LINUX_VERSION")
> if kernel_version != this_version:
> bb.warn("Kernel CVE status needs updating: generated for %s but 
> kernel is %s" % (this_version, kernel_version))
> @@ -4524,7 +4524,7 @@ CVE_STATUS[CVE-2022-44032] = "fixed-version: Fixed from 
> version 6.4rc1"
> 
> CVE_STATUS[CVE-2022-44033] = "fixed-version: Fixed from version 6.4rc1"
> 
> -# CVE-2022-44034 has no known resolution
> +CVE_STATUS[CVE-2022-44034] = "fixed-version: Fixed from version 6.4rc1"
> 
> # CVE-2022-4543 has no known resolution
> 
> @@ -5016,6 +5016,10 @@ CVE_STATUS[CVE-2023-39193] = "cpe-stable-backport: 
> Backported in 6.5.3"
> 
> CVE_STATUS[CVE-2023-39194] = "fixed-version: Fixed from version 6.5rc7"
> 
> +CVE_STATUS[CVE-2023-39197] = "fixed-version: Fixed from version 6.5rc1"
> +
> +CVE_STATUS[CVE-2023-39198] = "fixed-version: Fixed from version 6.5rc7"
> +
> CVE_STATUS[CVE-2023-4004] = "fixed-version: Fixed from version 6.5rc3"
> 
> # CVE-2023-4010 has no known resolution
> @@ -5118,3 +5122,15 @@ CVE_STATUS[CVE-2023-5633] = "cpe-stable-backport: 
> Backported in 6.5.8"
> 
> CVE_STATUS[CVE-2023-5717] = "cpe-stable-backport: Backported in 6.5.9"
> 
> +CVE_STATUS[CVE-2023-5972] = "cpe-stable-backport: 

[OE-core] [PATCH] linux-yocto: update CVE exclusions

[Ross Burton]

From: Ross Burton 

Signed-off-by: Ross Burton 
---
 .../linux/cve-exclusion_6.1.inc   | 26 +++
 .../linux/cve-exclusion_6.5.inc   | 22 +---
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc 
b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc
index 1216e0c2ddd..1e366481ff6 100644
--- a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc
+++ b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc
@@ -1,9 +1,9 @@
 
 # Auto-generated CVE metadata, DO NOT EDIT BY HAND.
-# Generated at 2023-11-09 17:12:27.365962+00:00 for version 6.1.61
+# Generated at 2023-12-05 13:22:34.961692+00:00 for version 6.1.65
 
 python check_kernel_cve_status_version() {
-this_version = "6.1.61"
+this_version = "6.1.65"
 kernel_version = d.getVar("LINUX_VERSION")
 if kernel_version != this_version:
 bb.warn("Kernel CVE status needs updating: generated for %s but kernel 
is %s" % (this_version, kernel_version))
@@ -4524,7 +4524,7 @@ CVE_STATUS[CVE-2022-43945] = "fixed-version: Fixed from 
version 6.1rc1"
 
 # CVE-2022-44033 needs backporting (fixed from 6.4rc1)
 
-# CVE-2022-44034 has no known resolution
+# CVE-2022-44034 needs backporting (fixed from 6.4rc1)
 
 # CVE-2022-4543 has no known resolution
 
@@ -5016,6 +5016,10 @@ CVE_STATUS[CVE-2023-39193] = "cpe-stable-backport: 
Backported in 6.1.53"
 
 CVE_STATUS[CVE-2023-39194] = "cpe-stable-backport: Backported in 6.1.47"
 
+CVE_STATUS[CVE-2023-39197] = "cpe-stable-backport: Backported in 6.1.39"
+
+CVE_STATUS[CVE-2023-39198] = "cpe-stable-backport: Backported in 6.1.47"
+
 CVE_STATUS[CVE-2023-4004] = "cpe-stable-backport: Backported in 6.1.42"
 
 # CVE-2023-4010 has no known resolution
@@ -5104,7 +5108,7 @@ CVE_STATUS[CVE-2023-4881] = "cpe-stable-backport: 
Backported in 6.1.54"
 
 CVE_STATUS[CVE-2023-4921] = "cpe-stable-backport: Backported in 6.1.54"
 
-# CVE-2023-5090 needs backporting (fixed from 6.6rc7)
+CVE_STATUS[CVE-2023-5090] = "cpe-stable-backport: Backported in 6.1.62"
 
 CVE_STATUS[CVE-2023-5158] = "cpe-stable-backport: Backported in 6.1.57"
 
@@ -5114,7 +5118,19 @@ CVE_STATUS[CVE-2023-5197] = "cpe-stable-backport: 
Backported in 6.1.56"
 
 CVE_STATUS[CVE-2023-5345] = "cpe-stable-backport: Backported in 6.1.56"
 
-# CVE-2023-5633 needs backporting (fixed from 6.6rc6)
+CVE_STATUS[CVE-2023-5633] = "fixed-version: only affects 6.2 onwards"
 
 CVE_STATUS[CVE-2023-5717] = "cpe-stable-backport: Backported in 6.1.60"
 
+# CVE-2023-5972 needs backporting (fixed from 6.6rc7)
+
+# CVE-2023-6039 needs backporting (fixed from 6.5rc5)
+
+CVE_STATUS[CVE-2023-6111] = "fixed-version: only affects 6.6rc3 onwards"
+
+# CVE-2023-6121 needs backporting (fixed from 6.7rc3)
+
+CVE_STATUS[CVE-2023-6176] = "cpe-stable-backport: Backported in 6.1.54"
+
+# CVE-2023-6238 has no known resolution
+
diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.5.inc 
b/meta/recipes-kernel/linux/cve-exclusion_6.5.inc
index b4086d436c4..6304d80844c 100644
--- a/meta/recipes-kernel/linux/cve-exclusion_6.5.inc
+++ b/meta/recipes-kernel/linux/cve-exclusion_6.5.inc
@@ -1,9 +1,9 @@
 
 # Auto-generated CVE metadata, DO NOT EDIT BY HAND.
-# Generated at 2023-11-09 17:13:01.267965+00:00 for version 6.5.10
+# Generated at 2023-12-05 13:22:43.339114+00:00 for version 6.5.13
 
 python check_kernel_cve_status_version() {
-this_version = "6.5.10"
+this_version = "6.5.13"
 kernel_version = d.getVar("LINUX_VERSION")
 if kernel_version != this_version:
 bb.warn("Kernel CVE status needs updating: generated for %s but kernel 
is %s" % (this_version, kernel_version))
@@ -4524,7 +4524,7 @@ CVE_STATUS[CVE-2022-44032] = "fixed-version: Fixed from 
version 6.4rc1"
 
 CVE_STATUS[CVE-2022-44033] = "fixed-version: Fixed from version 6.4rc1"
 
-# CVE-2022-44034 has no known resolution
+CVE_STATUS[CVE-2022-44034] = "fixed-version: Fixed from version 6.4rc1"
 
 # CVE-2022-4543 has no known resolution
 
@@ -5016,6 +5016,10 @@ CVE_STATUS[CVE-2023-39193] = "cpe-stable-backport: 
Backported in 6.5.3"
 
 CVE_STATUS[CVE-2023-39194] = "fixed-version: Fixed from version 6.5rc7"
 
+CVE_STATUS[CVE-2023-39197] = "fixed-version: Fixed from version 6.5rc1"
+
+CVE_STATUS[CVE-2023-39198] = "fixed-version: Fixed from version 6.5rc7"
+
 CVE_STATUS[CVE-2023-4004] = "fixed-version: Fixed from version 6.5rc3"
 
 # CVE-2023-4010 has no known resolution
@@ -5118,3 +5122,15 @@ CVE_STATUS[CVE-2023-5633] = "cpe-stable-backport: 
Backported in 6.5.8"
 
 CVE_STATUS[CVE-2023-5717] = "cpe-stable-backport: Backported in 6.5.9"
 
+CVE_STATUS[CVE-2023-5972] = "cpe-stable-backport: Backported in 6.5.9"
+
+CVE_STATUS[CVE-2023-6039] = "fixed-version: Fixed from version 6.5rc5"
+
+CVE_STATUS[CVE-2023-6111] = "fixed-version: only affects 6.6rc3 onwards"
+
+# CVE-2023-6121 needs backporting (fixed from 6.7rc3)
+
+CVE_STATUS[CVE-2023-6176] = "cpe-stable-backport: Backported in 6.5.4"
+
+# CVE-2023-6238 has no known resolution

Re: [OE-core] [PATCH] tiff: Backport fixes for CVE-2023-6277

[Ross Burton]

> On 3 Dec 2023, at 16:20, Khem Raj via lists.openembedded.org 
>  wrote:
> 
> create mode 100644 meta/recipes-multimedia/libtiff/tiff/545.patch

This file is created but not used.

Ross
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191817): 
https://lists.openembedded.org/g/openembedded-core/message/191817
Mute This Topic: https://lists.openembedded.org/mt/102953727/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] libxcrypt.inc: use alternatives to resolve crypt.3 conflict

[Ross Burton]

On 5 Dec 2023, at 01:41, Changqing Li via lists.openembedded.org 
 wrote:
> 
> From: Changqing Li 
> 
> To fix:
> 
> Error: Transaction test error:
>  file /usr/share/man/man3/crypt.3 from install of
>  libcrypt-doc-4.4.33-r0.x86_64 conflicts with file from package
>  man-pages-6.04-r0.x86_64

This feels like the wrong solution.  It feels like one of these packages has 
the “better” documentation and that should be the one that ships the 
documentation.

Ross
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191816): 
https://lists.openembedded.org/g/openembedded-core/message/191816
Mute This Topic: https://lists.openembedded.org/mt/102984309/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] libxcrypt.inc: use alternatives to resolve crypt.3 conflict

[Alexandre Belloni via lists.openembedded.org]

This causes:

stdio: WARNING: libxcrypt-4.4.36-r0 do_package: libxcrypt: alternative target 
(/usr/bin/crypt_r.3 or /usr/bin/crypt_r.3.libxcrypt) does not exist, skipping...
stdio: WARNING: libxcrypt-4.4.36-r0 do_package: libxcrypt: NOT adding 
alternative provide /usr/bin/crypt_r.3: /usr/bin/crypt_r.3.libxcrypt does not 
exist
stdio: WARNING: libxcrypt-4.4.36-r0 do_package: libxcrypt: alt_link == 
alt_target: /usr/bin/crypt_r.3 == /usr/bin/crypt_r.3

On 05/12/2023 09:41:55+0800, Changqing Li wrote:
> From: Changqing Li 
> 
> To fix:
> 
> Error: Transaction test error:
>   file /usr/share/man/man3/crypt.3 from install of
>   libcrypt-doc-4.4.33-r0.x86_64 conflicts with file from package
>   man-pages-6.04-r0.x86_64
> 
> Signed-off-by: Changqing Li 
> ---
>  meta/recipes-core/libxcrypt/libxcrypt.inc | 7 ++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc 
> b/meta/recipes-core/libxcrypt/libxcrypt.inc
> index ba93d91aef..fe90ef4762 100644
> --- a/meta/recipes-core/libxcrypt/libxcrypt.inc
> +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = 
> "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
>  file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
>  "
>  
> -inherit autotools pkgconfig
> +inherit autotools pkgconfig update-alternatives
>  
>  SRC_URI = 
> "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
>  SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf"
> @@ -26,4 +26,9 @@ CPPFLAGS:append:class-nativesdk = " -Wno-error"
>  API = "--disable-obsolete-api"
>  EXTRA_OECONF += "${API}"
>  
> +ALTERNATIVE_PRIORITY = "90"
> +ALTERNATIVE:${PN}-doc = "crypt.3 crypt_r.3"
> +ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
> +ALTERNATIVE_LINK_NAME[crypt_r.2] = "${mandir}/man3/crypt_r.3"
> +
>  BBCLASSEXTEND = "native nativesdk"
> -- 
> 2.25.1
> 

> 
> 
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191815): 
https://lists.openembedded.org/g/openembedded-core/message/191815
Mute This Topic: https://lists.openembedded.org/mt/102984309/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] ldconfig-native: Add usrmerge support

[Alexander Kanavin]

On Tue, 5 Dec 2023 at 10:44, Johannes Pointner  wrote:
> Thanks, I understand that, but ldconfig-native seemed very special to me, so
> I tried to take an example from the existing patches.
>
> So the next step would be a v2 with a better explanation and obviously a
> fixed sendemail.from?
> Or are there any other things I should change?

That should be ok. Note that any changes that fix issues which should
be exposed by the autobuilder testing, but aren't are seen with extra
suspicion: you need to explain why existing tests aren't exposing the
issue, and whether we need additional tests. All of it in the commit:
mailing list discussion would be lost in history.

Alex

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

Re: [mickledore][oe-core][PATCH 1/1] gnutls: update to version 3.8.2

[Alexander Kanavin]

mickledore is already end of life I think?

Alex

On Mon, 4 Dec 2023 at 20:36, Joe Slater via lists.openembedded.org
 wrote:
>
> From: Joe Slater 
>
> De-fuzz existing patches.
> Do not update PACKAGECONFIG to match master.
>
> Signed-off-by: Joe Slater 
> ---
>  ...ile-should-be-excuted-in-target-envi.patch |  2 --
>  .../gnutls/gnutls/Add-ptest-support.patch | 10 ++-
>  .../gnutls/gnutls/arm_eabi.patch  |  6 ++--
>  .../{gnutls_3.8.0.bb => gnutls_3.8.2.bb}  | 30 +++
>  4 files changed, 22 insertions(+), 26 deletions(-)
>  rename meta/recipes-support/gnutls/{gnutls_3.8.0.bb => gnutls_3.8.2.bb} (79%)
>
> diff --git 
> a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
>  
> b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
> index 4bdc40d932..da89d7faa1 100644
> --- 
> a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
> +++ 
> b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
> @@ -11,8 +11,6 @@ Signed-off-by: Lei Maohui 
>   lib/Makefile.am | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> -diff --git a/lib/Makefile.am b/lib/Makefile.am
> -index 6d4e8d2..24ef108 100644
>  --- a/lib/Makefile.am
>  +++ b/lib/Makefile.am
>  @@ -206,8 +206,7 @@ hmac_file = .libs/.$(gnutls_so).hmac
> diff --git a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch 
> b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
> index f87cf536fa..b9b75888ff 100644
> --- a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
> +++ b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
> @@ -12,8 +12,6 @@ Signed-off-by: Ravineet Singh 
>   tests/Makefile.am | 6 ++
>   3 files changed, 11 insertions(+)
>
> -diff --git a/Makefile.am b/Makefile.am
> -index 843193f..816b09f 100644
>  --- a/Makefile.am
>  +++ b/Makefile.am
>  @@ -191,6 +191,9 @@ dist-hook:
> @@ -26,11 +24,9 @@ index 843193f..816b09f 100644
>   .PHONY: abi-check abi-dump-versioned abi-dump-latest pic-check symbol-check 
> local-code-coverage-output files-update AUTHORS
>
>   include $(top_srcdir)/cligen/cligen.mk
> -diff --git a/configure.ac b/configure.ac
> -index b25ba14..860ddef 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -1150,6 +1150,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
> +@@ -1194,6 +1194,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
>
>   AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes")
>
> @@ -39,11 +35,9 @@ index b25ba14..860ddef 100644
>   AC_DEFINE([GNUTLS_INTERNAL_BUILD], 1, [We allow temporarily usage of 
> deprecated functions - until they are removed.])
>
>   hw_features=
> -diff --git a/tests/Makefile.am b/tests/Makefile.am
> -index d530ad0..71c592f 100644
>  --- a/tests/Makefile.am
>  +++ b/tests/Makefile.am
> -@@ -648,6 +648,12 @@ SH_LOG_COMPILER = $(SHELL)
> +@@ -657,6 +657,12 @@ SH_LOG_COMPILER = $(SHELL)
>   AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind
>   LOG_COMPILER = $(LOG_VALGRIND)
>
> diff --git a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch 
> b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
> index 2b61a703cb..2de9258a8a 100644
> --- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
> +++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
> @@ -14,11 +14,9 @@ Signed-off-by: Joe Slater 
>   tests/seccomp.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> -diff --git a/tests/seccomp.c b/tests/seccomp.c
> -index a3148fe..443bc5f 100644
>  --- a/tests/seccomp.c
>  +++ b/tests/seccomp.c
> -@@ -52,7 +52,9 @@ int disable_system_calls(void)
> +@@ -55,7 +55,9 @@ int disable_system_calls(void)
>
> ADD_SYSCALL(nanosleep, 0);
> ADD_SYSCALL(clock_nanosleep, 0);
> @@ -27,4 +25,4 @@ index a3148fe..443bc5f 100644
>  +#endif
> ADD_SYSCALL(getpid, 0);
> ADD_SYSCALL(gettimeofday, 0);
> - # if defined(HAVE_CLOCK_GETTIME)
> + #if defined(HAVE_CLOCK_GETTIME)
> diff --git a/meta/recipes-support/gnutls/gnutls_3.8.0.bb 
> b/meta/recipes-support/gnutls/gnutls_3.8.2.bb
> similarity index 79%
> rename from meta/recipes-support/gnutls/gnutls_3.8.0.bb
> rename to meta/recipes-support/gnutls/gnutls_3.8.2.bb
> index 7ddd2420bd..dc975317c8 100644
> --- a/meta/recipes-support/gnutls/gnutls_3.8.0.bb
> +++ b/meta/recipes-support/gnutls/gnutls_3.8.2.bb
> @@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = 
> "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \
>  
> file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
>
>  DEPENDS = "nettle gmp virtual/libiconv libunistring"
> -DEPENDS:append:libc-musl = " argp-standalone"
>
>  SHRT_VER = 
> "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
>
> @@ -26,24 +25,31 @@ SRC_URI = 
> "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
> file://Add-ptest-support.patch \
> "
>
> -SRC_URI[sha256sum] = 
> 

Re: [OE-core] [master][PATCH 2/2] rootfs-postcommands.bbclass: add post func remove_unused_dnf_log_lock

[Alexander Kanavin]

On Tue, 5 Dec 2023 at 06:46, Changqing Li
 wrote:

> So  I add this patch
> https://git.openembedded.org/openembedded-core/commit/?id=406a72a9a47c2735b7e18cefc682b1df00d5a9aa
> to remove the lock file in rootfs.
>
> Since for dnf-native,  it will not have reboot process,  so it is better
> to remove it at post process of rootfs, to  make an clean rootfs.

The review comments that led to the revert are still valid, and this
message does not address them. The concern was that the removal via
rootfs postprocess is too late. If dnf leaves lock files around, they
should be removed just after the dnf execution.

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191812): 
https://lists.openembedded.org/g/openembedded-core/message/191812
Mute This Topic: https://lists.openembedded.org/mt/99869451/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] ldconfig-native: Add usrmerge support

[Johannes Pointner]

On Mon, Dec 4, 2023 at 11:00 AM Alexander Kanavin
 wrote:
>
> Generally if you mark something as inappropriate, it's best to write
> an extended description of why in the patch. The barrier to adding
> patches that we can never upstream is high.
>
Thanks, I understand that, but ldconfig-native seemed very special to me, so
I tried to take an example from the existing patches.

So the next step would be a v2 with a better explanation and obviously a
fixed sendemail.from?
Or are there any other things I should change?

Hannes
> Alex
>
> On Mon, 4 Dec 2023 at 07:53, Johannes Pointner  wrote:
> >
> > Hello,
> >
> > On Sat, Dec 2, 2023 at 4:13 PM Alexandre Belloni via
> > lists.openembedded.org
> >  wrote:
> > >
> > > On 01/12/2023 11:53:59+0100, Johannes Pointner via lists.openembedded.org 
> > > wrote:
> > > > If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to 
> > > > LIBDIR,
> > > > therefore don't add SLIBDIR for parsing in this case.
> > > >
> > > > Signed-off-by: Johannes Pointner 
> > > > ---
> > > >  .../ldconfig-add-usrmerge-support.patch   | 37 +++
> > > >  .../glibc/ldconfig-native_2.12.1.bb   |  1 +
> > > >  2 files changed, 38 insertions(+)
> > > >  create mode 100644 
> > > > meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > > >
> > > > diff --git 
> > > > a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > > >  
> > > > b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > > > new file mode 100644
> > > > index 00..3041d433fd
> > > > --- /dev/null
> > > > +++ 
> > > > b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > > > @@ -0,0 +1,37 @@
> > > > +From 6e543f39f6bec6eb2e02eea02029c7f4ec533b66 Mon Sep 17 00:00:00 2001
> > > > +From: Johannes Pointner 
> > > > +Date: Fri, 1 Dec 2023 11:02:39 +0100
> > > > +Subject: [PATCH] ldconfig: add usrmerge support
> > > > +
> > > > +Check whether SLIBDIR is a symlink, which is the case if usrmerge
> > > > +is enabled, and if so, ignore it.
> > > > +
> > > > +Upstream-Status: Inappropriate [embedded specific]
> > >
> > > I'm not sure how this is embedded specific, why doesn't it affect desktop
> > > distribution that have usrmerge (e.g. Fedora) ?
> > Because this is just a workaround for the standalone ldconfig-native.
> > https://lists.openembedded.org/g/openembedded-core/message/191566
> > I also looked at the reason for the patches that are already used by
> > ldconfig-native.
> > But I am open to suggestions, what would you prefer?
> > >
> > > > +
> > > > +Signed-off-by: Johannes Pointner 
> > > > +---
> > > > + ldconfig.c | 8 +++-
> > > > + 1 file changed, 7 insertions(+), 1 deletion(-)
> > > > +
> > > > +diff --git a/ldconfig.c b/ldconfig.c
> > > > +index e826410..72ac67b 100644
> > > > +--- a/ldconfig.c
> > > >  b/ldconfig.c
> > > > +@@ -1371,10 +1371,16 @@ main (int argc, char **argv)
> > > > +
> > > > +   if (!opt_only_cline)
> > > > + {
> > > > ++  struct stat buf;
> > > > ++  int ret;
> > > > +   parse_conf (config_file, true);
> > > > +
> > > > +   /* Always add the standard search paths.  */
> > > > +-  add_system_dir (SLIBDIR);
> > > > ++  /* Check whether SLIBDIR is a symlink, which is the case if 
> > > > usrmerge
> > > > ++   is enabled, and if so, ignore it. */
> > > > ++  ret = lstat(SLIBDIR ,);
> > > > ++  if(ret == -1 || !S_ISLNK(buf.st_mode))
> > > > ++add_system_dir (SLIBDIR);
> > > > +   if (strcmp (SLIBDIR, LIBDIR))
> > > > + add_system_dir (LIBDIR);
> > > > +   add_system_dir (SLIBDIR32);
> > > > diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb 
> > > > b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> > > > index 4db67c3ad4..85fc87257d 100644
> > > > --- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> > > > +++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> > > > @@ -16,6 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
> > > > file://add-64-bit-flag-for-ELF64-entries.patch \
> > > > file://no-aux-cache.patch \
> > > > file://add-riscv-support.patch \
> > > > +   file://ldconfig-add-usrmerge-support.patch \
> > > >  "
> > > >
> > > >
> > > > --
> > > > 2.43.0
> > > >
> > > >
> > >
> > > >
> > > >
> > > >
> > >
> > >
> > > --
> > > Alexandre Belloni, co-owner and COO, Bootlin
> > > Embedded Linux and Kernel engineering
> > > https://bootlin.com
> > >
> > >
> > >
> >
> > 
> >

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191811): 
https://lists.openembedded.org/g/openembedded-core/message/191811
Mute This Topic: https://lists.openembedded.org/mt/102912756/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 v3] image-live: Add support for building EFI-bootable ISO images for non-x86-based archs

[Alexander Kanavin]

Then it's probably best to write a recipe, so that the code can be
hosted externally and maintained independently of oe-core?

Alex

On Mon, 4 Dec 2023 at 15:46, Andrey Popov  wrote:
>
> Hello, Alex!
>
> I have doubts that the entire isoparser class set could be inlined, that 
> would occupy around 1200 lines in total.
> https://github.com/barneygale/isoparser/tree/master/isoparser
> Three functions that are used to find the file using this class set are 32 
> lines long in total.
>
> Best regards, Andrey.
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191810): 
https://lists.openembedded.org/g/openembedded-core/message/191810
Mute This Topic: https://lists.openembedded.org/mt/102896781/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] image-uefi.conf: Add EFI_UKI_PATH variable

[Viswanath Kraleti]

UEFI bootloader specification says the primary place for UKI images
is the /EFI/Linux/ directory under $boot. Defining a varaible for
the same to reuse in all UEFI-related packages.

Signed-off-by: Viswanath Kraleti 
---
 meta/conf/image-uefi.conf | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/conf/image-uefi.conf b/meta/conf/image-uefi.conf
index 18351e7e3c..aec91bcfe2 100644
--- a/meta/conf/image-uefi.conf
+++ b/meta/conf/image-uefi.conf
@@ -1,12 +1,16 @@
 # Location of EFI files inside EFI System Partition
 EFIDIR ?= "/EFI/BOOT"
 
+# Location of UKI inside EFI System Partition
+EFI_UKI_DIR ?= "/EFI/Linux"
+
 # Prefix where ESP is mounted inside rootfs. Set to empty if package is going
 # to be installed to ESP directly
 EFI_PREFIX ?= "/boot"
 
 # Location inside rootfs.
 EFI_FILES_PATH = "${EFI_PREFIX}${EFIDIR}"
+EFI_UKI_PATH = "${EFI_PREFIX}${EFI_UKI_DIR}"
 
 # The EFI name for the architecture
 EFI_ARCH ?= "INVALID"
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191809): 
https://lists.openembedded.org/g/openembedded-core/message/191809
Mute This Topic: https://lists.openembedded.org/mt/102988899/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] lib/oe/patch: handle creating patches for CRLF sources

[Yoann Congal]

Using devtool to patch CRLF based sources creates patch files which have
mixed end of lines : LF for headers and CRLF for source context and
modified lines.

Python open(..., newline=None) (default for newline arg)does detect
end-of-line in this mixed file but only outputs LF EOL data. This
result in patch files that does not apply on the original sources.

Switching to open(..., newline='') allows to detect end-of-line but keep
the original end-of-line intact. This generate correct patches for CRLF
based sources.

Fixes [YOCTO #15285]

Signed-off-by: Yoann Congal 
---
v1->v2: Rebased to solve conflicts with 900129cbdf
---
 meta/lib/oe/patch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index e4bb5a7839..d5ad4f3dc1 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -478,7 +478,7 @@ class GitApplyTree(PatchTree):
 patchlines = []
 outfile = None
 try:
-with open(srcfile, 'r', encoding=encoding) as 
f:
+with open(srcfile, 'r', encoding=encoding, 
newline='') as f:
 for line in f:
 if 
line.startswith(GitApplyTree.patch_line_prefix):
 outfile = line.split()[-1].strip()
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191808): 
https://lists.openembedded.org/g/openembedded-core/message/191808
Mute This Topic: https://lists.openembedded.org/mt/102988541/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] lib/oe/patch: handle creating patches for CRLF sources

[Yoann Congal]

Le mar. 5 déc. 2023 à 08:48, Alexandre Belloni <
alexandre.bell...@bootlin.com> a écrit :

> Hello,
>
> This doesn't apply on master, can you rebase?
>

Yes! I will send a v2 today

On 27/11/2023 14:49:03+0100, Yoann Congal wrote:
> > Using devtool to patch CRLF based sources creates patch files which have
> > mixed end of lines : LF for headers and CRLF for source context and
> > modified lines.
> >
> > Python open(..., newline=None) (default for newline arg)does detect
> > end-of-line in this mixed file but only outputs LF EOL data. This
> > result in patch files that does not apply on the original sources.
> >
> > Switching to open(..., newline='') allows to detect end-of-line but keep
> > the original end-of-line intact. This generate correct patches for CRLF
> > based sources.
> >
> > Fixes [YOCTO #15285]
> >
> > Signed-off-by: Yoann Congal 
> > ---
> >  meta/lib/oe/patch.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
> > index ff9afc9df9..7bf660978e 100644
> > --- a/meta/lib/oe/patch.py
> > +++ b/meta/lib/oe/patch.py
> > @@ -477,7 +477,7 @@ class GitApplyTree(PatchTree):
> >  patchlines = []
> >  outfile = None
> >  try:
> > -with open(srcfile, 'r', encoding=encoding)
> as f:
> > +with open(srcfile, 'r', encoding=encoding,
> newline='') as f:
> >  for line in f:
> >  if
> line.startswith(GitApplyTree.patch_line_prefix):
> >  outfile =
> line.split()[-1].strip()
> > --
> > 2.30.2
> >
>
> >
> > 
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>


-- 
Yoann Congal
Smile ECS - Tech expert

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