Re: [OE-core] [dunfell][PATCH 2/2] systemd: support to list only initialized/uninitialized devices

2023-11-22 Thread Pawan Badganchi
Hi,

Could you please take this patch

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191136): 
https://lists.openembedded.org/g/openembedded-core/message/191136
Mute This Topic: https://lists.openembedded.org/mt/99403409/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][PATCH 1/2] systemd: implement --initialized-match/nomatch arguments

2023-11-22 Thread Pawan Badganchi
Hi,

Could you please take this patch

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191135): 
https://lists.openembedded.org/g/openembedded-core/message/191135
Mute This Topic: https://lists.openembedded.org/mt/99403398/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] busybox: Enable utmp support on musl systems

2023-11-22 Thread Khem Raj
runlevel misc applet is enabled when using init feature from busybox
however this applet does not build right now because it depends on utmp
feature and its disabled for musl systems. runlevel is used by
update-rd.d tool during system maintenance e.g. opkg upgrade etc.

Signed-off-by: Khem Raj 
---
 meta/recipes-core/busybox/busybox/musl.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-core/busybox/busybox/musl.cfg 
b/meta/recipes-core/busybox/busybox/musl.cfg
index 6fffc91098b..ba63def1ba8 100644
--- a/meta/recipes-core/busybox/busybox/musl.cfg
+++ b/meta/recipes-core/busybox/busybox/musl.cfg
@@ -7,5 +7,4 @@
 # CONFIG_FEATURE_INETD_RPC is not set
 # CONFIG_SELINUXENABLED is not set
 # CONFIG_FEATURE_MOUNT_NFS is not set
-# CONFIG_FEATURE_UTMP is not set
 
-- 
2.43.0


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



[OE-core][dunfell][PATCH] shadow: backport patch to fix CVE-2023-29383

2023-11-22 Thread Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri 

The fix of CVE-2023-29383.patch contains a bug that it rejects all
characters that are not control ones, so backup another patch named
"0001-Overhaul-valid_field.patch" from upstream to fix it.

(From OE-Core rev: ab48ab23de6f6bb1f05689c97724140d4bef8faa)

Upstream-Status: Backport
[https://github.com/shadow-maint/shadow/commit/e5905c4b84d4fb90aefcd96ee618411ebfac663d
&
https://github.com/shadow-maint/shadow/commit/2eaea70111f65b16d55998386e4ceb4273c19eb4]

Signed-off-by: Vijay Anusuri 
---
 .../files/0001-Overhaul-valid_field.patch | 66 +++
 .../shadow/files/CVE-2023-29383.patch | 54 +++
 meta/recipes-extended/shadow/shadow.inc   |  2 +
 3 files changed, 122 insertions(+)
 create mode 100644 
meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch
 create mode 100644 meta/recipes-extended/shadow/files/CVE-2023-29383.patch

diff --git a/meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch 
b/meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch
new file mode 100644
index 00..aea07ff361
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/0001-Overhaul-valid_field.patch
@@ -0,0 +1,66 @@
+From 2eaea70111f65b16d55998386e4ceb4273c19eb4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= 
+Date: Fri, 31 Mar 2023 14:46:50 +0200
+Subject: [PATCH] Overhaul valid_field()
+
+e5905c4b ("Added control character check") introduced checking for
+control characters but had the logic inverted, so it rejects all
+characters that are not control ones.
+
+Cast the character to `unsigned char` before passing to the character
+checking functions to avoid UB.
+
+Use strpbrk(3) for the illegal character test and return early.
+
+Upstream-Status: Backport 
[https://github.com/shadow-maint/shadow/commit/2eaea70111f65b16d55998386e4ceb4273c19eb4]
+
+Signed-off-by: Xiangyu Chen 
+Signed-off-by: Vijay Anusuri 
+---
+ lib/fields.c | 24 ++--
+ 1 file changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/lib/fields.c b/lib/fields.c
+index fb51b582..53929248 100644
+--- a/lib/fields.c
 b/lib/fields.c
+@@ -37,26 +37,22 @@ int valid_field (const char *field, const char *illegal)
+ 
+   /* For each character of field, search if it appears in the list
+* of illegal characters. */
++  if (illegal && NULL != strpbrk (field, illegal)) {
++  return -1;
++  }
++
++  /* Search if there are non-printable or control characters */
+   for (cp = field; '\0' != *cp; cp++) {
+-  if (strchr (illegal, *cp) != NULL) {
++  unsigned char c = *cp;
++  if (!isprint (c)) {
++  err = 1;
++  }
++  if (iscntrl (c)) {
+   err = -1;
+   break;
+   }
+   }
+ 
+-  if (0 == err) {
+-  /* Search if there are non-printable or control characters */
+-  for (cp = field; '\0' != *cp; cp++) {
+-  if (!isprint (*cp)) {
+-  err = 1;
+-  }
+-  if (!iscntrl (*cp)) {
+-  err = -1;
+-  break;
+-  }
+-  }
+-  }
+-
+   return err;
+ }
+ 
+-- 
+2.34.1
+
diff --git a/meta/recipes-extended/shadow/files/CVE-2023-29383.patch 
b/meta/recipes-extended/shadow/files/CVE-2023-29383.patch
new file mode 100644
index 00..dbf4a508e9
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/CVE-2023-29383.patch
@@ -0,0 +1,54 @@
+From e5905c4b84d4fb90aefcd96ee618411ebfac663d Mon Sep 17 00:00:00 2001
+From: tomspiderlabs <128755403+tomspiderl...@users.noreply.github.com>
+Date: Thu, 23 Mar 2023 23:39:38 +
+Subject: [PATCH] Added control character check
+
+Added control character check, returning -1 (to "err") if control characters 
are present.
+
+CVE: CVE-2023-29383
+Upstream-Status: Backport
+
+Reference to upstream:
+https://github.com/shadow-maint/shadow/commit/e5905c4b84d4fb90aefcd96ee618411ebfac663d
+
+Signed-off-by: Xiangyu Chen 
+Signed-off-by: Vijay Anusuri 
+---
+ lib/fields.c | 11 +++
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/lib/fields.c b/lib/fields.c
+index 640be931..fb51b582 100644
+--- a/lib/fields.c
 b/lib/fields.c
+@@ -21,9 +21,9 @@
+  *
+  * The supplied field is scanned for non-printable and other illegal
+  * characters.
+- *  + -1 is returned if an illegal character is present.
+- *  +  1 is returned if no illegal characters are present, but the field
+- *   contains a non-printable character.
++ *  + -1 is returned if an illegal or control character is present.
++ *  +  1 is returned if no illegal or control characters are present,
++ *   but the field contains a non-printable character.
+  *  +  0 is returned otherwise.
+  */
+ int valid_field (const char *field, const char *illegal)
+@

[OE-core] Patchtest results for [PATCH 2/2] libsoup-2.4: Fix build with clang-17 and libxml2-2.12

2023-11-22 Thread 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/2-2-libsoup-2.4-Fix-build-with-clang-17-and-libxml2-2.12.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 (#191132): 
https://lists.openembedded.org/g/openembedded-core/message/191132
Mute This Topic: https://lists.openembedded.org/mt/102761674/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/2] libsoup-2.4: Fix build with clang-17 and libxml2-2.12

2023-11-22 Thread Khem Raj
Signed-off-by: Khem Raj 
---
 ...ild-with-libxml2-2.12.0-and-clang-17.patch | 44 +++
 .../libsoup/libsoup-2.4_2.74.3.bb |  3 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 
meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch

diff --git 
a/meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
 
b/meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
new file mode 100644
index 000..d867e5bc176
--- /dev/null
+++ 
b/meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
@@ -0,0 +1,44 @@
+From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Wed, 22 Nov 2023 18:49:10 -0800
+Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
+
+Fixes build errors about missing function prototypes with clang-17
+
+Fixes
+| ../libsoup-2.74.3/libsoup/soup-xmlrpc-old.c:512:8: error: call to undeclared 
function 'xmlParseMemory'; ISO C99 and later do not support implicit function 
declarations
+
+Upstream-Status: Submitted 
[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/385]
+Signed-off-by: Khem Raj 
+---
+ libsoup/soup-xmlrpc-old.c | 1 +
+ libsoup/soup-xmlrpc.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c
+index c57086b6..527e3b23 100644
+--- a/libsoup/soup-xmlrpc-old.c
 b/libsoup/soup-xmlrpc-old.c
+@@ -11,6 +11,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ 
+ #include "soup-xmlrpc-old.h"
+diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c
+index 42dcda9c..e991cbf0 100644
+--- a/libsoup/soup-xmlrpc.c
 b/libsoup/soup-xmlrpc.c
+@@ -17,6 +17,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include "soup-xmlrpc.h"
+ #include "soup.h"
+-- 
+2.43.0
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb 
b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
index a605857c609..ee20530b644 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
@@ -11,7 +11,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl"
 
 SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
-SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
+SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
+   file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch"
 SRC_URI[sha256sum] = 
"e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
 
 CVE_PRODUCT = "libsoup"
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191131): 
https://lists.openembedded.org/g/openembedded-core/message/191131
Mute This Topic: https://lists.openembedded.org/mt/102761536/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/2] shared-mime-info: Fix build with clang-17+

2023-11-22 Thread Khem Raj
This is needed with libxml2-2.12 and newer

Signed-off-by: Khem Raj 
---
 ...ild-with-libxml2-2.12.0-and-clang-17.patch | 26 +++
 .../shared-mime-info/shared-mime-info_2.4.bb  |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 
meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch

diff --git 
a/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
 
b/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
new file mode 100644
index 000..936f72ccf87
--- /dev/null
+++ 
b/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
@@ -0,0 +1,26 @@
+From 665383306c725f299a1b373f947cda01949d49e4 Mon Sep 17 00:00:00 2001
+From: David Faure 
+Date: Sun, 19 Nov 2023 11:18:11 +0100
+Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
+
+Fixes #219
+
+Upstream-Status: Backport 
[https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573]
+Signed-off-by: Khem Raj 
+---
+ src/test-subclassing.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/test-subclassing.c b/src/test-subclassing.c
+index dd099e4..0758164 100644
+--- a/src/test-subclassing.c
 b/src/test-subclassing.c
+@@ -1,4 +1,5 @@
+ #include 
++#include 
+ #include 
+ #include 
+ 
+-- 
+2.43.0
+
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb 
b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
index 5ba40236096..c7da0ca2d2d 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native 
xmlto-native"
 
-SRC_URI = 
"git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master"
+SRC_URI = 
"git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master
 \
+   file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch"
 SRCREV = "9a6d6b8e963935f145f3a1ef446552de6996dada"
 
 S = "${WORKDIR}/git"
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191130): 
https://lists.openembedded.org/g/openembedded-core/message/191130
Mute This Topic: https://lists.openembedded.org/mt/102761535/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: fixed some build error for nativesdk with mingw

2023-11-22 Thread wenlin.k...@windriver.com via lists.openembedded.org


On 11/22/2023 06:44, 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, Nov 21, 2023 at 2:42 PM Richard Purdie
 wrote:

On Tue, 2023-11-21 at 01:41 -0800, wenlin.k...@windriver.com via
lists.openembedded.org wrote:

From: Wenlin Kang 

Steps to reproduce
   1) add layer meta-mingw
   2) add line in local.conf
  SDKMACHINE = "x86_64-mingw32"
   3) bitbake nativesdk-libxcrypt

Fixed:
1. pedantic error
   | ../git/lib/crypt.c:316:24: error: ISO C does not allow extra ';' outside 
of a function [-Werror=pedantic]
   |   316 | SYMVER_crypt_gensalt_rn;
   |   |

2. conversion error
   | ../git/lib/util-get-random-bytes.c: In function '_crypt_get_random_bytes':
   | ../git/lib/util-get-random-bytes.c:140:42: error: conversion from 'size_t' 
{aka 'long long unsigned int'} to 'unsigned int' may change value 
[-Werror=conversion]
   |   140 |   ssize_t nread = read (fd, buf, buflen);

Signed-off-by: Wenlin Kang 
---
  ...dom-bytes.c-fixed-conversion-error-w.patch | 47 +++
  meta/recipes-core/libxcrypt/libxcrypt.inc |  6 ++-
  2 files changed, 52 insertions(+), 1 deletion(-)
  create mode 100644 
meta/recipes-core/libxcrypt/files/0001-lib-util-get-random-bytes.c-fixed-conversion-error-w.patch

diff --git 
a/meta/recipes-core/libxcrypt/files/0001-lib-util-get-random-bytes.c-fixed-conversion-error-w.patch
 
b/meta/recipes-core/libxcrypt/files/0001-lib-util-get-random-bytes.c-fixed-conversion-error-w.patch
new file mode 100644
index 00..3846f76674
--- /dev/null
+++ 
b/meta/recipes-core/libxcrypt/files/0001-lib-util-get-random-bytes.c-fixed-conversion-error-w.patch
@@ -0,0 +1,47 @@
+From ff99091eb8a6b9e6edc567f6d2552183fbaacec3 Mon Sep 17 00:00:00 2001
+From: Wenlin Kang 
+Date: Mon, 6 Nov 2023 14:43:28 +0800
+Subject: [PATCH] lib/util-get-random-bytes.c: fixed conversion error with
+ mingw
+
+With x86_64-w64-mingw32-gcc. get below error:
+| ../git/lib/util-get-random-bytes.c: In function '_crypt_get_random_bytes':
+| ../git/lib/util-get-random-bytes.c:140:42: error: conversion from 'size_t' 
{aka 'long long unsigned int'} to 'unsigned int' may change value 
[-Werror=conversion]
+|   140 |   ssize_t nread = read (fd, buf, buflen);
+|   |  ^~
+
+In util-get-random-bytes.c, has get_random_bytes(void *buf, size_t buflen),
+but in mingw-w64-mingw-w64/mingw-w64-headers/crt/io.h, read() has "unsigned 
int"
+read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount), and has:
+ #ifdef _WIN64
+   __MINGW_EXTENSION typedef unsigned __int64 size_t;
+ #else
+   typedef unsigned int size_t;
+ #endif /* _WIN64 */
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenlin Kang 
+---
+ lib/util-get-random-bytes.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/util-get-random-bytes.c b/lib/util-get-random-bytes.c
+index 79816db..68cd378 100644
+--- a/lib/util-get-random-bytes.c
 b/lib/util-get-random-bytes.c
+@@ -137,7 +137,11 @@ get_random_bytes(void *buf, size_t buflen)
+ dev_urandom_doesnt_work = true;
+   else
+ {
++#ifdef _WIN64
++  ssize_t nread = read (fd, buf, (unsigned int)buflen);
++#else
+   ssize_t nread = read (fd, buf, buflen);
++#endif
+   if (nread < 0 || (size_t)nread < buflen)
+ dev_urandom_doesnt_work = true;
+
+--
+2.25.1
+
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc 
b/meta/recipes-core/libxcrypt/libxcrypt.inc
index ba93d91aef..b93d56b4dc 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -13,7 +13,9 @@ SRC_URI = 
"git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=
  SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf"
  SRCBRANCH ?= "master"

-SRC_URI += "file://fix_cflags_handling.patch"
+SRC_URI += "file://fix_cflags_handling.patch \
+
file://0001-lib-util-get-random-bytes.c-fixed-conversion-error-w.patch \
+ "

  PROVIDES = "virtual/crypt"

@@ -26,4 +28,6 @@ CPPFLAGS:append:class-nativesdk = " -Wno-error"
  API = "--disable-obsolete-api"
  EXTRA_OECONF += "${API}"

+CFLAGS:append:class-nativesdk = " -Wno-pedantic"
+
  BBCLASSEXTEND = "native nativesdk"

Should this go to meta-mingw instead of OE-Core? Shouldn't something be
submitted upstream? This certainly isn't the kind of patch we want to
carry.


yeah I tend to agree, even though they are backports but the nature of
fixes is very
windows specific



Okay, thanks for your comments,  I will send it to upstream and meta-mingw.





Cheers,

Richard




--
--
Thanks
Wenlin Kang


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

[OE-core] [PATCH] Revert "lzop: remove recipe from oe-core"

2023-11-22 Thread Marek Vasut
This reverts commit dea5e8863792dc7bb3324b543e04da4c94a060aa.

The original commit claims that lzop is unused in OE-core.
That is not correct, the following places still use it and
became unbuildable now:
"
meta/classes-recipe/image_types.bbclass:CONVERSION_CMD:lzo = "lzop -9 
${IMAGE_NAME}.${type}"
meta/classes-recipe/image_types.bbclass:CONVERSION_DEPENDS_lzo = "lzop-native"
meta/classes-recipe/kernel-uboot.bbclass:   lzop -9 
linux.bin
meta/classes-recipe/kernel.bbclass:DEPENDS += 
"${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lzo", "lzop-native", "", d)}"
meta/classes-recipe/kernel.bbclass: lzop -df 
${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
"

Furthermore, LZO is the best compromise between kernel decompression
time and size on low end ARM systems, that is why it is often used
with e.g.:
FIT_KERNEL_COMP_ALG = "lzo"
FIT_KERNEL_COMP_ALG_EXTENSION = ".lzo"

Reinstate the package to avoid breaking this use case.

Signed-off-by: Marek Vasut 
---
Cc: Ross Burton 
Cc: Richard Purdie 
---
 meta/conf/distro/include/maintainers.inc|   1 +
 meta/recipes-support/lzop/lzop/acinclude.m4 | 390 
 meta/recipes-support/lzop/lzop_1.04.bb  |  27 ++
 3 files changed, 418 insertions(+)
 create mode 100644 meta/recipes-support/lzop/lzop/acinclude.m4
 create mode 100644 meta/recipes-support/lzop/lzop_1.04.bb

diff --git a/meta/conf/distro/include/maintainers.inc 
b/meta/conf/distro/include/maintainers.inc
index 35f8a72fa4..e95ab59d0d 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -484,6 +484,7 @@ RECIPE_MAINTAINER:pn-lua = "Alexander Kanavin 
"
 RECIPE_MAINTAINER:pn-lz4 = "Denys Dmytriyenko "
 RECIPE_MAINTAINER:pn-lzo = "Denys Dmytriyenko "
 RECIPE_MAINTAINER:pn-lzip = "Denys Dmytriyenko "
+RECIPE_MAINTAINER:pn-lzop = "Denys Dmytriyenko "
 RECIPE_MAINTAINER:pn-m4 = "Robert Yang "
 RECIPE_MAINTAINER:pn-m4-native = "Robert Yang "
 RECIPE_MAINTAINER:pn-make = "Robert Yang "
diff --git a/meta/recipes-support/lzop/lzop/acinclude.m4 
b/meta/recipes-support/lzop/lzop/acinclude.m4
new file mode 100644
index 00..0029c19c7d
--- /dev/null
+++ b/meta/recipes-support/lzop/lzop/acinclude.m4
@@ -0,0 +1,390 @@
+
+AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [
+AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is 
big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine 
is little endian.])])
+])#
+
+AC_DEFUN([mfx_ACC_CHECK_HEADERS], [
+AC_HEADER_TIME
+AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h 
malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h 
string.h strings.h time.h unistd.h utime.h sys/stat.h sys/time.h sys/types.h 
sys/wait.h])
+])#
+
+AC_DEFUN([mfx_ACC_CHECK_FUNCS], [
+AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown ctime difftime fstat 
gettimeofday gmtime localtime longjmp lstat memcmp memcpy memmove memset mktime 
qsort raise setjmp signal snprintf strcasecmp strchr strdup strerror strftime 
stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf)
+])#
+
+
+AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(__int16)
+AC_CHECK_SIZEOF(__int32)
+AC_CHECK_SIZEOF(__int64)
+
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(size_t)
+AC_CHECK_SIZEOF(ptrdiff_t)
+])#
+
+
+# /***
+# // Check for ACC_conformance
+# /
+
+AC_DEFUN([mfx_ACC_ACCCHK], [
+mfx_tmp=$1
+mfx_save_CPPFLAGS=$CPPFLAGS
+dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this 
here
+test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
+
+AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
+
+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
+[[#define ACC_CONFIG_NO_HEADER 1
+#include "acc/acc.h"
+#include "acc/acc_incd.h"
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr)
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+static void test_acc_compile_time_assert(void) {
+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr)
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+}
+#undef NDEBUG
+#include 
+static int test_acc_run_time_assert(int r) {
+#define ACCCHK_ASSERT(expr) assert(expr);
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+return r;
+}
+]], [[
+test_acc_compile_time_assert();
+if (test_acc_run_time_assert(1) != 1) return 1;
+]]
+)])
+
+mfx_tmp=FAILED
+_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
+rm -f conftest.$ac_ext conftest.$ac_objext
+
+CPPFLAGS=$mfx_save_CPPFLAGS
+
+AC_MSG_RESULT([$mfx_tmp])
+case x$mfx_tmp in
+  xpassed | xyes) ;;
+  *)
+AC_MSG_NOTICE([])
+AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details 
see ])
+AC_MSG_NOTICE([`config.log'. Please check 

Re: [OE-core] [PATCH] init-manager-mdev-busybox: Keep sysvinit distro feature on

2023-11-22 Thread Khem Raj
On Wed, Nov 22, 2023 at 2:59 PM Marko, Peter  wrote:
>
> From: openembedded-core@lists.openembedded.org 
>  On Behalf Of Khem Raj via 
> lists.openembedded.org
>
> > The rcS script that busybox-init provides is able to run scripts that
> > are available as part of sysvinit, therefore its fine to keep sysvinit
> > distro feature enabled so that we can build complex systems with
> > busybox as init system.
> >
> > Signed-off-by: Khem Raj 
> > ---
> >  meta/conf/distro/include/init-manager-mdev-busybox.inc | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/conf/distro/include/init-manager-mdev-busybox.inc 
> > b/meta/conf/distro/include/init-manager-mdev-busybox.inc
> > index 12091cba68c..a5a61bbe4d2 100644
> > --- a/meta/conf/distro/include/init-manager-mdev-busybox.inc
> > +++ b/meta/conf/distro/include/init-manager-mdev-busybox.inc
> > @@ -1,5 +1,6 @@
> >  # enable mdev/busybox for init
> > -DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd sysvinit"
> > +DISTRO_FEATURES:append = " sysvinit"
>
> I don't think that this append is a good idea.
> I want a small, lean, controllable init system, not a complex one.
> This probably belongs to distro or to a new INIT_MANAGER type.

That's fair. Although one can easily build a full system just with
busybox-init like this perhaps it should be a separate INIT_MANAGER
perhaps eudev-busybox or some such.

>
> > +DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd"
> >  VIRTUAL-RUNTIME_dev_manager ??= "busybox-mdev"
> >  VIRTUAL-RUNTIME_init_manager ??= "busybox"
> >  VIRTUAL-RUNTIME_initscripts ??= "initscripts"
> > --
> > 2.43.0
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191127): 
https://lists.openembedded.org/g/openembedded-core/message/191127
Mute This Topic: https://lists.openembedded.org/mt/102757523/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] init-manager-mdev-busybox: Keep sysvinit distro feature on

2023-11-22 Thread Peter Marko via lists.openembedded.org
From: openembedded-core@lists.openembedded.org 
 On Behalf Of Khem Raj via 
lists.openembedded.org

> The rcS script that busybox-init provides is able to run scripts that
> are available as part of sysvinit, therefore its fine to keep sysvinit
> distro feature enabled so that we can build complex systems with
> busybox as init system.
>
> Signed-off-by: Khem Raj 
> ---
>  meta/conf/distro/include/init-manager-mdev-busybox.inc | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/conf/distro/include/init-manager-mdev-busybox.inc 
> b/meta/conf/distro/include/init-manager-mdev-busybox.inc
> index 12091cba68c..a5a61bbe4d2 100644
> --- a/meta/conf/distro/include/init-manager-mdev-busybox.inc
> +++ b/meta/conf/distro/include/init-manager-mdev-busybox.inc
> @@ -1,5 +1,6 @@
>  # enable mdev/busybox for init
> -DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd sysvinit"
> +DISTRO_FEATURES:append = " sysvinit"

I don't think that this append is a good idea.
I want a small, lean, controllable init system, not a complex one.
This probably belongs to distro or to a new INIT_MANAGER type.

> +DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd"
>  VIRTUAL-RUNTIME_dev_manager ??= "busybox-mdev"
>  VIRTUAL-RUNTIME_init_manager ??= "busybox"
>  VIRTUAL-RUNTIME_initscripts ??= "initscripts"
> -- 
> 2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191126): 
https://lists.openembedded.org/g/openembedded-core/message/191126
Mute This Topic: https://lists.openembedded.org/mt/102757523/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 20/21] populate_sdk_ext.bbclass: add *:do_shared_workdir to BB_SETSCENE_ENFORCE_IGNORE_TASKS

2023-11-22 Thread Richard Purdie
On Wed, 2023-11-22 at 13:44 +0100, Martin Jansa wrote:
>  meta/classes-recipe/populate_sdk_ext.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass 
> b/meta/classes-recipe/populate_sdk_ext.bbclass
> index f209becae1..5705140359 100644
> --- a/meta/classes-recipe/populate_sdk_ext.bbclass
> +++ b/meta/classes-recipe/populate_sdk_ext.bbclass
> @@ -366,7 +366,7 @@ def write_local_conf(d, baseoutpath, derivative, 
> core_meta_subdir, uninative_che
>  f.write('BB_HASHCONFIG_IGNORE_VARS:append = " 
> SIGGEN_UNLOCKED_RECIPES"\n\n')
>  
>  # Set up which tasks are ignored for run on install
> -f.write('BB_SETSCENE_ENFORCE_IGNORE_TASKS = "%:* 
> *:do_shared_workdir *:do_rm_work wic-tools:* *:do_addto_recipe_sysroot"\n\n')
> +f.write('BB_SETSCENE_ENFORCE_IGNORE_TASKS = "%:* 
> *:do_shared_workdir *:do_rm_work *:do_deploy_links wic-tools:* 
> *:do_addto_recipe_sysroot"\n\n')
>  
>  # Hide the config information from bitbake output (since it's 
> fixed within the SDK)
>  f.write('BUILDCFG_HEADER = ""\n\n')

The subject says "add do_shared_workdir" but the code change is
actually "add do_deploy_links".

This caught my eye in my inbox as the shared_workdir task can be
painful!

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191125): 
https://lists.openembedded.org/g/openembedded-core/message/191125
Mute This Topic: https://lists.openembedded.org/mt/102747738/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] init-manager-mdev-busybox: Keep sysvinit distro feature on

2023-11-22 Thread Khem Raj
The rcS script that busybox-init provides is able to run scripts that
are available as part of sysvinit, therefore its fine to keep sysvinit
distro feature enabled so that we can build complex systems with
busybox as init system.

Signed-off-by: Khem Raj 
---
 meta/conf/distro/include/init-manager-mdev-busybox.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/init-manager-mdev-busybox.inc 
b/meta/conf/distro/include/init-manager-mdev-busybox.inc
index 12091cba68c..a5a61bbe4d2 100644
--- a/meta/conf/distro/include/init-manager-mdev-busybox.inc
+++ b/meta/conf/distro/include/init-manager-mdev-busybox.inc
@@ -1,5 +1,6 @@
 # enable mdev/busybox for init
-DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd sysvinit"
+DISTRO_FEATURES:append = " sysvinit"
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd"
 VIRTUAL-RUNTIME_dev_manager ??= "busybox-mdev"
 VIRTUAL-RUNTIME_init_manager ??= "busybox"
 VIRTUAL-RUNTIME_initscripts ??= "initscripts"
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191124): 
https://lists.openembedded.org/g/openembedded-core/message/191124
Mute This Topic: https://lists.openembedded.org/mt/102757523/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 02/21] create-spdx-2.2.bbclass: use hardlink as well

2023-11-22 Thread Peter Kjellerstedt
> -Original Message-
> From: openembedded-core@lists.openembedded.org  c...@lists.openembedded.org> On Behalf Of Martin Jansa
> Sent: den 22 november 2023 13:45
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 02/21] create-spdx-2.2.bbclass: use hardlink as well

This commit message does not make much sense, unless you also read the 
one for the preceding commit, which you won't do if you run something 
like `git log meta/classes/create-spdx-2.2.bbclass`.

//Peter

> 
> [YOCTO #12937]
> 
> Signed-off-by: Martin Jansa 
> ---
>  meta/classes/create-spdx-2.2.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-
> spdx-2.2.bbclass
> index b0aef80db1..8c77f6b886 100644
> --- a/meta/classes/create-spdx-2.2.bbclass
> +++ b/meta/classes/create-spdx-2.2.bbclass
> @@ -967,7 +967,7 @@ python image_combine_spdx() {
>  if image_link_name:
>  link = imgdeploydir / (image_link_name + suffix)
>  if link != target_path:
> -link.symlink_to(os.path.relpath(target_path,
> link.parent))
> +os.link(target_path, link)
> 
>  spdx_tar_path = imgdeploydir / (image_name + ".spdx.tar.zst")
>  make_image_link(spdx_tar_path, ".spdx.tar.zst")
> --
> 2.43.0


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



[OE-core] [PATCH 4/5] python3-sphinxcontrib-qthelp: 1.0.3 -> 1.0.6

2023-11-22 Thread Tim Orling
* Upstream download filename changed from sphinxcontrib-qthelp*
  to sphinxcontrib_qthelp*
* build-backend changed to flit (inherit python_flit_core)

Release 1.0.6 (2023-08-14)
==

* Use ``os.PathLike`` over ``pathlib.Path``

Release 1.0.5 (2023-08-09)
==

* Fix tests for Sphinx 7.1 and below

Release 1.0.4 (2023-08-07)
==

* Drop support for Python 3.5, 3.6, 3.7, and 3.8
* Raise minimum required Sphinx version to 5.0

https://github.com/sphinx-doc/sphinxcontrib-qthelp/compare/1.0.3...1.0.6

Signed-off-by: Tim Orling 
---
 ...help_1.0.3.bb => python3-sphinxcontrib-qthelp_1.0.6.bb} | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-qthelp_1.0.3.bb => 
python3-sphinxcontrib-qthelp_1.0.6.bb} (54%)

diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.3.bb 
b/meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.6.bb
similarity index 54%
rename from meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.3.bb
rename to meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.6.bb
index 41d2b6187b7..3538b063d6c 100644
--- a/meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.3.bb
+++ b/meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.6.bb
@@ -3,10 +3,13 @@ HOMEPAGE = "http://babel.edgewall.org/";
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f7a83b72ea86d04827575ec0b63430eb"
 
-SRC_URI[sha256sum] = 
"4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"
+SRC_URI[sha256sum] = 
"62b9d1a186ab7f5ee3356d906f648cacb7a6bdb94d201ee7adf26db55092982d"
 
 PYPI_PACKAGE = "sphinxcontrib-qthelp"
 
-inherit pypi setuptools3
+inherit pypi python_flit_core
+
+PYPI_ARCHIVE_NAME = "sphinxcontrib_qthelp-${PV}.${PYPI_PACKAGE_EXT}"
+S = "${WORKDIR}/sphinxcontrib_qthelp-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.34.1


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



[OE-core] [PATCH 5/5] python3-sphinxcontrib-serializinghtml: 1.1.5 -> 1.1.9

2023-11-22 Thread Tim Orling
* Upstream download filename changed from sphinxcontrib-serializinghtml*
  to sphinxcontrib_serializinghtml*
* build-backend is now flit (inherit python_flit_core)

Release 1.1.9 (2023-08-20)
==

* Serialise context["script_files"] and context["css_files"] as their filenames
  on Sphinx 7.2.0.

  Release 1.1.8 (2023-08-14)
  ==

  * Use ``os.PathLike`` over ``pathlib.Path``

  Release 1.1.7 (2023-08-09)
  ==

  * Fix tests for Sphinx 7.1 and below

  Release 1.1.6 (2023-08-07)
  ==

  * Drop support for Python 3.5, 3.6, 3.7, and 3.8
  * Raise minimum required Sphinx version to 5.0

https://github.com/sphinx-doc/sphinxcontrib-serializinghtml/compare/1.1.5...1.1.9

Signed-off-by: Tim Orling 
---
 ...5.bb => python3-sphinxcontrib-serializinghtml_1.1.9.bb} | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename 
meta/recipes-devtools/python/{python3-sphinxcontrib-serializinghtml_1.1.5.bb => 
python3-sphinxcontrib-serializinghtml_1.1.9.bb} (57%)

diff --git 
a/meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.5.bb 
b/meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.9.bb
similarity index 57%
rename from 
meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.5.bb
rename to 
meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.9.bb
index 7fa6d8aeb7a..fbf0c3c9b28 100644
--- 
a/meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.5.bb
+++ 
b/meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.9.bb
@@ -3,10 +3,13 @@ HOMEPAGE = "https://www.sphinx-doc.org";
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=32a84ac5cd3bbd10c4d479233ad588b6"
 
-SRC_URI[sha256sum] = 
"aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"
+SRC_URI[sha256sum] = 
"0c64ff898339e1fac29abd2bf5f11078f3ec413cfe9c046d3120d7ca65530b54"
 
 PYPI_PACKAGE = "sphinxcontrib-serializinghtml"
 
-inherit pypi setuptools3
+inherit pypi python_flit_core
+
+PYPI_ARCHIVE_NAME = "sphinxcontrib_serializinghtml-${PV}.${PYPI_PACKAGE_EXT}"
+S = "${WORKDIR}/sphinxcontrib_serializinghtml-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.34.1


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



[OE-core] [PATCH 3/5] python3-sphinxcontrib-htmlhelp: 2.0.1 -> 2.0.4

2023-11-22 Thread Tim Orling
* Upstream download filename changed from sphinxcontrib-htmlhelp*
  to sphinxcontrib_htmlhelp*
* build-backend is now flit (inherit python_flit_core)

Release 2.0.4 (2023-08-14)
==

* Use ``os.PathLike`` over ``pathlib.Path``

Release 2.0.3 (2023-08-09)
==

* Fix tests for Sphinx 7.1 and below

Release 2.0.2 (2023-08-07)
==

* Drop support for Python 3.8
* Raise minimum required Sphinx version to 5.0

https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/compare/2.0.1...2.0.4

Signed-off-by: Tim Orling 
---
 ...lp_2.0.1.bb => python3-sphinxcontrib-htmlhelp_2.0.4.bb} | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-htmlhelp_2.0.1.bb 
=> python3-sphinxcontrib-htmlhelp_2.0.4.bb} (56%)

diff --git 
a/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb 
b/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.4.bb
similarity index 56%
rename from meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb
rename to meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.4.bb
index bf034fb6849..a0a4b4496f2 100644
--- a/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb
+++ b/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.4.bb
@@ -3,10 +3,13 @@ HOMEPAGE = "https://www.sphinx-doc.org";
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=24dce5ef6a13563241c24bc366f48886"
 
-SRC_URI[sha256sum] = 
"0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff"
+SRC_URI[sha256sum] = 
"6c26a118a05b76000738429b724a0568dbde5b72391a688577da08f11891092a"
 
 PYPI_PACKAGE = "sphinxcontrib-htmlhelp"
 
-inherit pypi python_setuptools_build_meta
+inherit pypi python_flit_core
+
+PYPI_ARCHIVE_NAME = "sphinxcontrib_htmlhelp-${PV}.${PYPI_PACKAGE_EXT}"
+S = "${WORKDIR}/sphinxcontrib_htmlhelp-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.34.1


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



[OE-core] [PATCH 2/5] python3-sphinxcontrib-devhelp: 1.0.2 -> 1.0.5

2023-11-22 Thread Tim Orling
* Upstream download filename changed from sphinxcontrib-devhelp*
  to sphinxcontrib_devhelp*
* build-backend is now flit (inherit python_flit_core)

Release 1.0.5 (2023-08-14)
==

* Use ``os.PathLike`` over ``pathlib.Path``

Release 1.0.4 (2023-08-09)
==

* Fix tests for Sphinx 7.1 and below

Release 1.0.3 (2023-08-07)
=

* Drop support for Python 3.5, 3.6, 3.7, and 3.8
* Raise minimum required Sphinx version to 5.0

https://github.com/sphinx-doc/sphinxcontrib-devhelp/compare/1.0.2...1.0.5

Signed-off-by: Tim Orling 
---
 ...elp_1.0.2.bb => python3-sphinxcontrib-devhelp_1.0.5.bb} | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-devhelp_1.0.2.bb => 
python3-sphinxcontrib-devhelp_1.0.5.bb} (56%)

diff --git 
a/meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.2.bb 
b/meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.5.bb
similarity index 56%
rename from meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.2.bb
rename to meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.5.bb
index 0d034366e7a..47934bd6f53 100644
--- a/meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.2.bb
+++ b/meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.5.bb
@@ -3,10 +3,13 @@ HOMEPAGE = "https://www.sphinx-doc.org";
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fd30d9972a142c857a80c9f312e92b93"
 
-SRC_URI[sha256sum] = 
"ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"
+SRC_URI[sha256sum] = 
"63b41e0d38207ca40ebbeabcf4d8e51f76c03e78cd61abe118cf4435c73d4212"
 
 PYPI_PACKAGE = "sphinxcontrib-devhelp"
 
-inherit pypi setuptools3
+inherit pypi python_flit_core
+
+PYPI_ARCHIVE_NAME = "sphinxcontrib_devhelp-${PV}.${PYPI_PACKAGE_EXT}"
+S = "${WORKDIR}/sphinxcontrib_devhelp-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.34.1


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



[OE-core] [PATCH 1/5] python3-sphinxcontrib-applehelp: 1.0.4 -> 1.0.7

2023-11-22 Thread Tim Orling
* Upstream changed download file name from sphinxcontrib-applelhelp* to
  sphinxcontrib_applehelp*
* build-backend is now flit (inherit python_flit_core)

Release 1.0.7 (2023-08-14)
==

* Use ``os.PathLike`` over ``pathlib.Path``

Release 1.0.6 (2023-08-09)
==

* Fix tests for Sphinx 7.1 and below

Release 1.0.5 (2023-08-07)
==

* Drop support for Python 3.8
* Raise minimum required Sphinx version to 5.0

https://github.com/sphinx-doc/sphinxcontrib-applehelp/compare/1.0.4...1.0.7

Signed-off-by: Tim Orling 
---
 ...p_1.0.4.bb => python3-sphinxcontrib-applehelp_1.0.7.bb} | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-applehelp_1.0.4.bb 
=> python3-sphinxcontrib-applehelp_1.0.7.bb} (52%)

diff --git 
a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb 
b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.7.bb
similarity index 52%
rename from 
meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb
rename to meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.7.bb
index e352601466d..ec3670641db 100644
--- a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb
+++ b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.7.bb
@@ -3,8 +3,11 @@ HOMEPAGE = "https://www.sphinx-doc.org";
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c7715857042d4c8c0105999ca0c072c5"
 
-SRC_URI[sha256sum] = 
"828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e"
+SRC_URI[sha256sum] = 
"39fdc8d762d33b01a7d8f026a3b7d71563ea3b72787d5f00ad8465bd9d6dfbfa"
 
-inherit pypi python_setuptools_build_meta
+inherit pypi python_flit_core
+
+PYPI_ARCHIVE_NAME = "sphinxcontrib_applehelp-${PV}.${PYPI_PACKAGE_EXT}"
+S = "${WORKDIR}/sphinxcontrib_applehelp-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.34.1


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



[OE-core] [PATCH 0/5] python3-sphinxcontrib-*

2023-11-22 Thread Tim Orling
Most of our python3-sphinxcontrib-* recipes have been upgraded (excluding
python3-sphinxcontrib-jsmath which remains at 1.0.1 as the latest release).

In this series:
* Python 3.9 is now the minimum supported version in pyproject.toml
* the download filenames have all changed from sphinxcontrib-*
  to sphinxcontrib_*.
* the build-backend has changed to flit (inherit python_flit_core)

Tested by building target, native and nativesdk versions for qemux86-64

The following changes since commit 4bc0346d8c4211bf03a283ed1cde5b779dbfd3b4:

  python3-poetry-core: upgrade 1.7.0 -> 1.8.1 (2023-11-22 14:08:48 +)

are available in the Git repository at:

  https://git.yoctoproject.org/poky-contrib timo/sphinxcontrib-help
  https://git.yoctoproject.org/poky-contrib/log/?h=timo/sphinxcontrib-help

Tim Orling (5):
  python3-sphinxcontrib-applehelp: 1.0.4 -> 1.0.7
  python3-sphinxcontrib-devhelp: 1.0.2 -> 1.0.5
  python3-sphinxcontrib-htmlhelp: 2.0.1 -> 2.0.4
  python3-sphinxcontrib-qthelp: 1.0.3 -> 1.0.6
  python3-sphinxcontrib-serializinghtml: 1.1.5 -> 1.1.9

 ...p_1.0.4.bb => python3-sphinxcontrib-applehelp_1.0.7.bb} | 7 +--
 ...elp_1.0.2.bb => python3-sphinxcontrib-devhelp_1.0.5.bb} | 7 +--
 ...lp_2.0.1.bb => python3-sphinxcontrib-htmlhelp_2.0.4.bb} | 7 +--
 ...help_1.0.3.bb => python3-sphinxcontrib-qthelp_1.0.6.bb} | 7 +--
 ...5.bb => python3-sphinxcontrib-serializinghtml_1.1.9.bb} | 7 +--
 5 files changed, 25 insertions(+), 10 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-applehelp_1.0.4.bb 
=> python3-sphinxcontrib-applehelp_1.0.7.bb} (52%)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-devhelp_1.0.2.bb => 
python3-sphinxcontrib-devhelp_1.0.5.bb} (56%)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-htmlhelp_2.0.1.bb 
=> python3-sphinxcontrib-htmlhelp_2.0.4.bb} (56%)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-qthelp_1.0.3.bb => 
python3-sphinxcontrib-qthelp_1.0.6.bb} (54%)
 rename 
meta/recipes-devtools/python/{python3-sphinxcontrib-serializinghtml_1.1.5.bb => 
python3-sphinxcontrib-serializinghtml_1.1.9.bb} (57%)

-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191117): 
https://lists.openembedded.org/g/openembedded-core/message/191117
Mute This Topic: https://lists.openembedded.org/mt/102751774/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] joe editor broken with current ncurses

2023-11-22 Thread Alexander Kanavin
I suppose you can check, on master:

- whether dropping the CVE fix addresses the problem
- whether updating to recent patchlevel addresses the problem
- bisect changes in the patchlevel down to what is needed to fix the
CVE and not regress

Given that you have a basic build, tweaking ncurses and rebuilding
isn't too time consuming.

Alex

On Wed, 22 Nov 2023 at 16:46, Tobias Jakobi
 wrote:
>
> Yeah, the "causing other problems" bit is also what worries me at the moment. 
> In particular because a lot of other packages depend on ncurses. Usually not 
> on libncurses itself, but on libtinfo. Let me know if I can do further tests. 
> I can't guarantee though how much more time I can spend on this. Our product 
> owner is already asking me why stuff is taking so long :D
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191116): 
https://lists.openembedded.org/g/openembedded-core/message/191116
Mute This Topic: https://lists.openembedded.org/mt/102726054/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] joe editor broken with current ncurses

2023-11-22 Thread Richard Purdie
On Wed, 2023-11-22 at 07:46 -0800, Tobias Jakobi wrote:
> Yeah, the "causing other problems" bit is also what worries me at the
> moment. In particular because a lot of other packages depend on
> ncurses. Usually not on libncurses itself, but on libtinfo. Let me
> know if I can do further tests. I can't guarantee though how much
> more time I can spend on this. Our product owner is already asking me
> why stuff is taking so long :D

Someone looking into it and helping fix things properly does take time
but without it, the project doesn't work. You may be able to point out
all the fixes you haven't had to work on that come from the project and
that this is small by comparison! :)

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191115): 
https://lists.openembedded.org/g/openembedded-core/message/191115
Mute This Topic: https://lists.openembedded.org/mt/102726054/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] joe editor broken with current ncurses

2023-11-22 Thread Tobias Jakobi
Yeah, the "causing other problems" bit is also what worries me at the moment. 
In particular because a lot of other packages depend on ncurses. Usually not on 
libncurses itself, but on libtinfo. Let me know if I can do further tests. I 
can't guarantee though how much more time I can spend on this. Our product 
owner is already asking me why stuff is taking so long :D

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191114): 
https://lists.openembedded.org/g/openembedded-core/message/191114
Mute This Topic: https://lists.openembedded.org/mt/102726054/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] joe editor broken with current ncurses

2023-11-22 Thread Richard Purdie
On Wed, 2023-11-22 at 07:20 -0800, Tobias Jakobi wrote:
> OK, that was easier than expected. So I followed the guide, but I
> just build core-image-full-cmdline. I added the meta-oe layer (git
> master) to it and added joe to CORE_IMAGE_EXTRA_INSTALL. Same issue
> with this setup.

Thanks for working through the testing.

It sounds like we as a project need to fix master. Once that happens,
there could be a case for backporting a different version if it fixes
both regressions and security issues.

It does depend on the new version not causing other problems though,
and us being able to be confident of that.

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191113): 
https://lists.openembedded.org/g/openembedded-core/message/191113
Mute This Topic: https://lists.openembedded.org/mt/102726054/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] joe editor broken with current ncurses

2023-11-22 Thread Tobias Jakobi
OK, that was easier than expected. So I followed the guide, but I just build 
core-image-full-cmdline. I added the meta-oe layer (git master) to it and added 
joe to CORE_IMAGE_EXTRA_INSTALL. Same issue with this setup.

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



[OE-core] [PATCH] bitbake: fetch2: git: add missing destsuffix and subpath parameters in docstrings

2023-11-22 Thread Julien Stephan
Docstring for git fetcher is missing destsuffix and subpath parameters,
so add them

Signed-off-by: Julien Stephan 
---
 bitbake/lib/bb/fetch2/git.py | 8 
 1 file changed, 8 insertions(+)

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 27a0d05144c..8a76cecdfdc 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -48,6 +48,14 @@ Supported SRC_URI options are:
instead of branch.
The default is "0", set nobranch=1 if needed.
 
+- subpath
+   Limit the checkout to a specific subpath of the tree.
+   By default, checkout the whole tree, set subpath= if needed
+
+- destsuffix
+   The name of the path in which to place the checkout.
+   By default, the path is git/, set destsuffix= if needed
+
 - usehead
For local git:// urls to use the current branch HEAD as the revision for 
use with
AUTOREV. Implies nobranch.
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#19): 
https://lists.openembedded.org/g/openembedded-core/message/19
Mute This Topic: https://lists.openembedded.org/mt/102750032/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/2] package_ipk: Fix Source: field variable dependency

2023-11-22 Thread Richard Purdie
The Source: variable is generated from FILE but this is excluded from checksums
normally which results in a reproduciubility issue when the filename changes.

Add in a dependency by reworking the code a little to avoid this.

Signed-off-by: Richard Purdie 
---
 meta/classes-global/package_ipk.bbclass | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes-global/package_ipk.bbclass 
b/meta/classes-global/package_ipk.bbclass
index 1ca1308967c..71ffdd522ac 100644
--- a/meta/classes-global/package_ipk.bbclass
+++ b/meta/classes-global/package_ipk.bbclass
@@ -47,6 +47,10 @@ python do_package_ipk () {
 do_package_ipk[vardeps] += "ipk_write_pkg"
 do_package_ipk[vardepsexclude] = "BB_NUMBER_THREADS"
 
+# FILE isn't included by default but we want the recipe to change if 
basename() changes
+IPK_RECIPE_FILE = "${@os.path.basename(d.getVar('FILE'))}"
+IPK_RECIPE_FILE[vardepvalue] = "${IPK_RECIPE_FILE}"
+
 def ipk_write_pkg(pkg, d):
 import re, copy
 import subprocess
@@ -62,7 +66,7 @@ def ipk_write_pkg(pkg, d):
 
 outdir = d.getVar('PKGWRITEDIRIPK')
 pkgdest = d.getVar('PKGDEST')
-recipesource = os.path.basename(d.getVar('FILE'))
+recipesource = d.getVar('IPK_RECIPE_FILE')
 
 localdata = bb.data.createCopy(d)
 root = "%s/%s" % (pkgdest, pkg)
-- 
2.39.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191109): 
https://lists.openembedded.org/g/openembedded-core/message/191109
Mute This Topic: https://lists.openembedded.org/mt/102748903/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/2] shared-mime-info: embed PV in the filename

2023-11-22 Thread Richard Purdie
From: Ross Burton 

As this recipe tracks the release tags we can embed the PV in the
filename.

Signed-off-by: Ross Burton 
Signed-off-by: Richard Purdie 
---
 .../{shared-mime-info_git.bb => shared-mime-info_2.4.bb}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/shared-mime-info/{shared-mime-info_git.bb => 
shared-mime-info_2.4.bb} (98%)

diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb 
b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
similarity index 98%
rename from meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
rename to meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
index 937428221ef..5ba40236096 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
@@ -10,7 +10,7 @@ DEPENDS = "libxml2 itstool-native glib-2.0 
shared-mime-info-native xmlto-native"
 
 SRC_URI = 
"git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master"
 SRCREV = "9a6d6b8e963935f145f3a1ef446552de6996dada"
-PV = "2.4"
+
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gettext python3native mime
-- 
2.39.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191108): 
https://lists.openembedded.org/g/openembedded-core/message/191108
Mute This Topic: https://lists.openembedded.org/mt/102748901/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 1/2] patch: extract patches without diffstats

2023-11-22 Thread Lukas Funke
From: Stefan Herbrechtsmeier 

Extract patches without diffstats to reduce changes during patch
refresh.

Signed-off-by: Stefan Herbrechtsmeier 
Signed-off-by: Lukas Funke 
---
 meta/lib/oe/patch.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index ff9afc9df9..495a302121 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -466,7 +466,8 @@ class GitApplyTree(PatchTree):
 import shutil
 tempdir = tempfile.mkdtemp(prefix='oepatch')
 try:
-shellcmd = ["git", "format-patch", "--no-signature", 
"--no-numbered", startcommit, "-o", tempdir]
+shellcmd = ["git", "format-patch", "--no-signature", 
"--no-numbered",
+"--no-stat", startcommit, "-o", tempdir]
 if paths:
 shellcmd.append('--')
 shellcmd.extend(paths)
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191106): 
https://lists.openembedded.org/g/openembedded-core/message/191106
Mute This Topic: https://lists.openembedded.org/mt/102748810/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 2/2] patch: extract patches with all-zero hash

2023-11-22 Thread Lukas Funke
From: Stefan Herbrechtsmeier 

Extract patches with all-zero hash in each patch header instead of the
hash of the commit to reduce changes during patch refresh.

Signed-off-by: Stefan Herbrechtsmeier 
Signed-off-by: Lukas Funke 
---
 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 495a302121..6d81bd4f67 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -467,7 +467,7 @@ class GitApplyTree(PatchTree):
 tempdir = tempfile.mkdtemp(prefix='oepatch')
 try:
 shellcmd = ["git", "format-patch", "--no-signature", 
"--no-numbered",
-"--no-stat", startcommit, "-o", tempdir]
+"--no-stat", "--zero-commit", startcommit, "-o", 
tempdir]
 if paths:
 shellcmd.append('--')
 shellcmd.extend(paths)
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191107): 
https://lists.openembedded.org/g/openembedded-core/message/191107
Mute This Topic: https://lists.openembedded.org/mt/102748811/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 0/2] patch: reduce changes during patch refresh

2023-11-22 Thread Lukas Funke
From: Lukas Funke 

The patch series aims to reduce the noise in patches created by devtools. Some
diffs are just introduced due to an update in the hash or in the diffstats.
These changes are not important to a reviewer.

Stefan Herbrechtsmeier (2):
  patch: extract patches without diffstats
  patch: extract patches with all-zero hash

 meta/lib/oe/patch.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191105): 
https://lists.openembedded.org/g/openembedded-core/message/191105
Mute This Topic: https://lists.openembedded.org/mt/102748808/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] poky: kirkstone: eSDK: fix build-in eSDK environment file generation

2023-11-22 Thread Alberto Merciai
On Wed, Nov 22, 2023 at 01:45:28PM +0100, Alexander Kanavin wrote:
> I've now sent a patch for it to docs@ - needed only for kirkstone.
> 
> Alex

Ok, regardig test you were asking for, I'm not able to do that right
now.
Is something that I will do in next weeks, in case I will share.

Regards,
Alberto

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191104): 
https://lists.openembedded.org/g/openembedded-core/message/191104
Mute This Topic: https://lists.openembedded.org/mt/102745821/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] poky: kirkstone: eSDK: fix build-in eSDK environment file generation

2023-11-22 Thread Alberto Merciai
On Wed, Nov 22, 2023 at 01:12:00PM +0100, Alexander Kanavin wrote:
> That's right. If you have to stay on kirkstone, then you have to
> maintain a private backport.

Understood thanks,


Alberto

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191103): 
https://lists.openembedded.org/g/openembedded-core/message/191103
Mute This Topic: https://lists.openembedded.org/mt/102745821/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 00/21] Consistent naming scheme for deployed artifacts

2023-11-22 Thread Martin Jansa
On Wed, Nov 22, 2023 at 2:19 PM Richard Purdie <
richard.pur...@linuxfoundation.org> wrote:

> On Wed, 2023-11-22 at 13:44 +0100, Martin Jansa wrote:
> > This is the final part of changes for [YOCTO #12937].
> >
> > I've run complete selftest with this and didn't see any failures.
> >
> > Only these 4 fail once, but pass when re-executed (and the same is
> > reproducible here with master):
> > pkgdata.OePkgdataUtilTests.test_lookup_recipe
> > spdx.SPDXCheck.test_spdx_base_files
> > esdk.oeSDKExtSelfTest.test_image_generation_binary_feeds
> > esdk.oeSDKExtSelfTest.test_install_libraries_headers
> >
> > runtime_test.TestImage.test_testimage_virgl_gtk_sdl and this one
> > needs extra "xhost +local" otherwise fails with:
> >   runqemu - ERROR - Failed to run qemu: Invalid MIT-MAGIC-COOKIE-1 key
> >   qemu-system-x86_64: OpenGL is not supported by the display
> >
> > The short description of these changes is that instead of symlinks
> > it creates hardlinks in deploy dir and the kernel do_deploy creates
> > the artifacts without version suffix and the do_deploy_links task
> > adds those versioned hardlinks (this way do_deploy can be reused from
> > sstate and only quick do_deploy_links is re-executed when the
> > IMAGE_VERSION_SUFFIX changes - before that if you cannot re-use do_deploy
> > from sstate due to different artifact filenames you had to re-run e.g.
> > do_compile as well if you haven't built the same in the same TMPDIR
> > before).
>
> I am a bit worried about this change since there were uses for having
> the symlinks present and this unconditionally moves everything over to
> hardlinks.
>
> With the symlink, you can see the pointer quite clearly, with
> hardlinks, it is unclear which files are duplicates of each other
> withouth diving into comparing inodes.
>

Yes, it's definitely disadvantage of hardlinks (especially if someone
forgets to preserve hardlinks when cp or rsync the deploy directory). But
having the version in symlink would be even worse (as it could point to
different artifact already).

And having the version in the artifact itself requires do_deploy to re-run
and without prior build it would re-run do_compile for kernel, bootloader
and other artifacts as well.

This is also why I've made sure you can set IMAGE_VERSION_SUFFIX to empty
to prevent all of these hardlinks to be created, if all you care is just
whatever is latest to be in the deploy directory.

It might be interesting to have the versioned and version-less artifacts in
different directories, so that you always cp/rsync only one set of them,
but I fear that it would require even more oeqa changes and this area is
already a bit too complicated I think.

FWIW: we're using this for webOS builds since 2015 with webos_deploy task
mentioned in the first patch, but to do this from "outside" is a bit
difficult to maintain as webos_deploy needs to know about all possible
artifacts other layers might create and also to inject dependency on
webos_deploy task from all the right places.

Thanks for review Richard, lets hope that someone else will also share an
opinion about this.

Cheers,

Part of the reasoning was due to the way OE used to work where it would
> stack images, each build would add a new one and it would update the
> end symlink to point at the latest. Once sstate started removing old
> entries, that became less needed but the pointers still help runqemu
> and other tooling find the latest.
>
> This change is trying make the code do something different and it to
> change versioning and do that in a way which allows maximal reuse from
> sstate.
>
> Both are valid usages so we gain some things with the change but lose
> others. I'm not sure how users in general are going to find things
> overall :/.
>
> Cheers,
>
> Richard
>
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191102): 
https://lists.openembedded.org/g/openembedded-core/message/191102
Mute This Topic: https://lists.openembedded.org/mt/102747718/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 00/21] Consistent naming scheme for deployed artifacts

2023-11-22 Thread Richard Purdie
On Wed, 2023-11-22 at 13:44 +0100, Martin Jansa wrote:
> This is the final part of changes for [YOCTO #12937].
> 
> I've run complete selftest with this and didn't see any failures.
> 
> Only these 4 fail once, but pass when re-executed (and the same is
> reproducible here with master):
> pkgdata.OePkgdataUtilTests.test_lookup_recipe
> spdx.SPDXCheck.test_spdx_base_files
> esdk.oeSDKExtSelfTest.test_image_generation_binary_feeds
> esdk.oeSDKExtSelfTest.test_install_libraries_headers
> 
> runtime_test.TestImage.test_testimage_virgl_gtk_sdl and this one
> needs extra "xhost +local" otherwise fails with:
>   runqemu - ERROR - Failed to run qemu: Invalid MIT-MAGIC-COOKIE-1 key
>   qemu-system-x86_64: OpenGL is not supported by the display
> 
> The short description of these changes is that instead of symlinks
> it creates hardlinks in deploy dir and the kernel do_deploy creates
> the artifacts without version suffix and the do_deploy_links task
> adds those versioned hardlinks (this way do_deploy can be reused from
> sstate and only quick do_deploy_links is re-executed when the
> IMAGE_VERSION_SUFFIX changes - before that if you cannot re-use do_deploy
> from sstate due to different artifact filenames you had to re-run e.g.
> do_compile as well if you haven't built the same in the same TMPDIR
> before).

I am a bit worried about this change since there were uses for having
the symlinks present and this unconditionally moves everything over to
hardlinks. 

With the symlink, you can see the pointer quite clearly, with
hardlinks, it is unclear which files are duplicates of each other
withouth diving into comparing inodes.

Part of the reasoning was due to the way OE used to work where it would
stack images, each build would add a new one and it would update the
end symlink to point at the latest. Once sstate started removing old
entries, that became less needed but the pointers still help runqemu
and other tooling find the latest.

This change is trying make the code do something different and it to
change versioning and do that in a way which allows maximal reuse from
sstate.

Both are valid usages so we gain some things with the change but lose
others. I'm not sure how users in general are going to find things
overall :/.

Cheers,

Richard



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191101): 
https://lists.openembedded.org/g/openembedded-core/message/191101
Mute This Topic: https://lists.openembedded.org/mt/102747718/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] [meta-oe][PATCH v2 0/1] wic: extend empty plugin with options to write zeros to partiton

2023-11-22 Thread Lukas Funke

Hi,

On 22.11.2023 11:47, Lukas Funke via lists.openembedded.org wrote:

From: Lukas Funke 

Adds features to explicitly write zeros to the start of the
partition. This is useful to overwrite old content like
filesystem signatures which may be re-recognized otherwise.

The new features can be enabled with
'--soucreparams="[fill|size=[S|s|K|k|M|G]][,][bs=[S|s|K|k|M|G]]"'
Conflicting or missing options throw errors.

The features are:
- fill
   Fill the entire partition with zeros. Requires '--fixed-size' option
   to be set.
- size=[S|s|K|k|M|G]
   Set the first N bytes of the partition to zero. Default unit is 'K'.
- bs=[S|s|K|k|M|G]
   Write at most N bytes at a time during source file creation.
   Defaults to '1M'. Default unit is 'K'.

Changed in v2:
  - Added SoB
---

Malte Schmidt (1):
   wic: extend empty plugin with options to write zeros to partiton

  scripts/lib/wic/plugins/source/empty.py | 57 -
  1 file changed, 56 insertions(+), 1 deletion(-)



I've seen that there is a misstake and the patch was sended with the 
'meta-oe' prefix in the subject. This was not intendet and it belongs to 
the core layer only. I hope that you don't mind, otherwise I'll send a 
v3 version.










-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191100): 
https://lists.openembedded.org/g/openembedded-core/message/191100
Mute This Topic: https://lists.openembedded.org/mt/102746528/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] poky: kirkstone: eSDK: fix build-in eSDK environment file generation

2023-11-22 Thread Alexander Kanavin
On Wed, 22 Nov 2023 at 10:30, Alexander Kanavin  wrote:

> Thanks, now I understand what happened. This feature was actually
> never backported to kirkstone (and won't be because of LTS policy - no
> new features), but documentation was (mistakenly) updated to state
> that it was:
> https://git.yoctoproject.org/yocto-docs/commit/?h=kirkstone&id=5e2ec35e3d63f9c73726122fe2b3dd6d6f85a77e
>
> Michael, the bits about meta-ide-suppport/build-sysroots need to be
> reverted, before more people get misled.

I've now sent a patch for it to docs@ - needed only for kirkstone.

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191099): 
https://lists.openembedded.org/g/openembedded-core/message/191099
Mute This Topic: https://lists.openembedded.org/mt/102745821/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 21/21] u-boot.inc: don't replace the binary with symlink

2023-11-22 Thread Martin Jansa
* when UBOOT_ARTIFACT_NAME and UBOOT_ARTIFACT_LINK_NAME are empty
  the UBOOT_BINARYNAME and UBOOT_IMAGE might be indentical and the
  binary gets overwritten by the symlink to itself (similarly for SPL_*)

$ ls -lah 
/OE/build/poky/build/tmp/work/qemuarm-poky-linux-gnueabi/u-boot/2023.10/package/boot
total 8.0K
drwxr-xr-x 2 martin martin 4.0K Nov 21 21:23 .
drwxr-xr-x 4 martin martin 4.0K Nov 21 21:23 ..
lrwxrwxrwx 1 martin martin3 Nov 21 21:23 MLO -> MLO
lrwxrwxrwx 1 martin martin   10 Nov 21 21:23 u-boot.bin -> u-boot.bin

* which causes:
ERROR: u-boot-1_2023.10-r0 do_package: Error executing a python function in 
exec_func_python() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_func_python() autogenerated', lineno: 2, function: 
 0001:
 *** 0002:do_package(d)
 0003:
File: '/OE/build/poky/meta/classes-global/package.bbclass', lineno: 536, 
function: do_package
 0532:bb.build.exec_func("package_prepare_pkgdata", d)
 0533:bb.build.exec_func("perform_packagecopy", d)
 0534:for f in (d.getVar('PACKAGE_PREPROCESS_FUNCS') or '').split():
 0535:bb.build.exec_func(f, d)
 *** 0536:oe.package.process_split_and_strip_files(d)
 0537:oe.package.fixup_perms(d)
 0538:
 0539:
###
 0540:# Split up PKGD into PKGDEST
File: '/OE/build/poky/meta/lib/oe/package.py', lineno: 1073, function: 
process_split_and_strip_files
 1069:staticlibs.append(file)
 1070:continue
 1071:
 1072:try:
 *** 1073:ltarget = cpath.realpath(file, dvar, False)
 1074:s = cpath.lstat(ltarget)
 1075:except OSError as e:
 1076:(err, strerror) = e.args
 1077:if err != errno.ENOENT:
File: '/OE/build/poky/meta/lib/oe/cachedpath.py', lineno: 231, function: 
realpath
 0227:if e.errno == errno.ELOOP:
 0228:# make ELOOP more readable; without catching it, 
there will
 0229:# be printed a backtrace with 100s of OSError 
exceptions
 0230:# else
 *** 0231:raise OSError(errno.ELOOP,
 0232:  "too much recursions while resolving 
'%s'; loop in '%s'" %
 0233:  (file, e.strerror))
 0234:
 0235:raise
Exception: OSError: [Errno 40] too much recursions while resolving 
'/OE/build/poky/build/tmp/work/qemuarm-poky-linux-gnueabi/u-boot/2023.10/package/boot/MLO';
 loop in 
'/OE/build/poky/build/tmp/work/qemuarm-poky-linux-gnueabi/u-boot/2023.10/package/boot/MLO'

ERROR: Logfile of failure stored in: 
/OE/build/poky/build/tmp/work/qemuarm-poky-linux-gnueabi/u-boot/2023.10/temp/log.do_package.3990391

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-recipe/uboot-sign.bbclass | 24 ++---
 meta/recipes-bsp/u-boot/u-boot.inc | 29 +++---
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/meta/classes-recipe/uboot-sign.bbclass 
b/meta/classes-recipe/uboot-sign.bbclass
index e89c8214d3..d7de2c3bde 100644
--- a/meta/classes-recipe/uboot-sign.bbclass
+++ b/meta/classes-recipe/uboot-sign.bbclass
@@ -420,24 +420,24 @@ do_deploy:prepend() {
fi
 
if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then
-   ln -vf ${DEPLOYDIR}/${UBOOT_DTB_IMAGE} 
${DEPLOYDIR}/${UBOOT_DTB_BINARY}
-   ln -vf ${DEPLOYDIR}/${UBOOT_DTB_IMAGE} 
${DEPLOYDIR}/${UBOOT_DTB_LINK}
-   ln -vf ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE} 
${DEPLOYDIR}/${UBOOT_NODTB_LINK}
-   ln -vf ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE} 
${DEPLOYDIR}/${UBOOT_NODTB_BINARY}
+   [ "${UBOOT_DTB_IMAGE}" != "${UBOOT_DTB_BINARY}" ] && ln -vf 
${DEPLOYDIR}/${UBOOT_DTB_IMAGE} ${DEPLOYDIR}/${UBOOT_DTB_BINARY}
+   [ "${UBOOT_DTB_IMAGE}" != "${UBOOT_DTB_LINK}" ]   && ln -vf 
${DEPLOYDIR}/${UBOOT_DTB_IMAGE} ${DEPLOYDIR}/${UBOOT_DTB_LINK}
+   [ "${UBOOT_NODTB_IMAGE}" != "${UBOOT_NODTB_LINK}" ]   && ln -vf 
${DEPLOYDIR}/${UBOOT_NODTB_IMAGE} ${DEPLOYDIR}/${UBOOT_NODTB_LINK}
+   [ "${UBOOT_NODTB_IMAGE}" != "${UBOOT_NODTB_BINARY}" ] && ln -vf 
${DEPLOYDIR}/${UBOOT_NODTB_IMAGE} ${DEPLOYDIR}/${UBOOT_NODTB_BINARY}
fi
 
if [ "${UBOOT_FITIMAGE_ENABLE}" = "1" ] ; then
-   ln -vf ${DEPLOYDIR}/${UBOOT_ITS_IMAGE} ${DEPLOYDIR}/${UBOOT_ITS}
-   ln -vf ${DEPLOYDIR}/${UBOOT_ITS_IMAGE} 
${DEPLOYDIR}/${UBOOT_ITS_LINK}
-   ln -vf ${DEPLOYDIR}/${UBOOT_FITIMAGE_IMAGE} 
${DEPLOYDIR}/${UBOOT_FITIMAGE_BINARY}
-   ln -vf ${DEPLOYDIR}/${UBOOT_FITIMAGE_IMAGE} 
${DEPLOYDIR}/${UBOOT_FITIMAGE_LINK}
+   [ "${UBOOT_ITS_IMAGE}" != "${UBOOT_ITS}" ]  && 

[OE-core] [PATCH 20/21] populate_sdk_ext.bbclass: add *:do_shared_workdir to BB_SETSCENE_ENFORCE_IGNORE_TASKS

2023-11-22 Thread Martin Jansa
* otherwise populate_sdk_ext task will fail as shown e.g. with:
  bitbake core-image-minimal -c populate_sdk_ext
  esdk.oeSDKExtSelfTest.test_image_generation_binary_feeds
  esdk.oeSDKExtSelfTest.test_install_libraries_headers:

ERROR: Task linux-yocto.do_deploy_links attempted to execute unexpectedly
Task 
tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/sdk-ext/image/tmp-renamed-sdk/layers/poky/meta/recipes-core/images/core-image-minimal.bb:do_image_qa,
 unihash 9d177d4c6ca34e68e19b1bc23deec58c3eabe5f9d5808f90402161163a73f22f, 
taskhash 9d177d4c6ca34e68e19b1bc23deec58c3eabe5f9d5808f90402161163a73f22f
Task 
tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/sdk-ext/image/tmp-renamed-sdk/layers/poky/meta/recipes-core/images/core-image-minimal.bb:do_image_complete,
 unihash 0aff4dcbdb3c5ca68e0ebb39457fbe86beb3482986ddfe0b0b6fc0386807edbf, 
taskhash 0aff4dcbdb3c5ca68e0ebb39457fbe86beb3482986ddfe0b0b6fc0386807edbf
This is usually due to missing setscene tasks. Those missing in this build 
were: 
{'tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/sdk-ext/image/tmp-renamed-sdk/layers/poky/meta/recipes-core/images/core-image-minimal.bb:do_image_complete',
 
'tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/sdk-ext/image/tmp-renamed-sdk/layers/poky/meta/recipes-core/images/core-image-minimal.bb:do_image_qa'}
ERROR: Task 
(tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/sdk-ext/image/tmp-renamed-sdk/layers/poky/meta/recipes-kernel/linux/linux-yocto_6.5.bb:do_deploy_links)
 failed with exit code 'setscene ignore_tasks'
NOTE: Tasks Summary: Attempted 4975 tasks of which 4971 didn't need to be rerun 
and 1 failed.

Summary: 1 task failed:
  
tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/sdk-ext/image/tmp-renamed-sdk/layers/poky/meta/recipes-kernel/linux/linux-yocto_6.5.bb:do_deploy_links
Summary: There was 1 WARNING message.
Summary: There was 1 ERROR message, returning a non-zero exit code.
ERROR: Logfile of failure stored in: 
tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/temp/log.do_populate_sdk_ext.2280835
NOTE: recipe core-image-minimal-1.0-r0: task do_populate_sdk_ext: Failed
ERROR: Task 
(/OE/build/poky/meta/recipes-core/images/core-image-minimal.bb:do_populate_sdk_ext)
 failed with exit code '1'
NOTE: Tasks Summary: Attempted 6211 tasks of which 6147 didn't need to be rerun 
and 1 failed.

Summary: 1 task failed:
  
/OE/build/poky/meta/recipes-core/images/core-image-minimal.bb:do_populate_sdk_ext
Summary: There was 1 ERROR message, returning a non-zero exit code.

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-recipe/populate_sdk_ext.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass 
b/meta/classes-recipe/populate_sdk_ext.bbclass
index f209becae1..5705140359 100644
--- a/meta/classes-recipe/populate_sdk_ext.bbclass
+++ b/meta/classes-recipe/populate_sdk_ext.bbclass
@@ -366,7 +366,7 @@ def write_local_conf(d, baseoutpath, derivative, 
core_meta_subdir, uninative_che
 f.write('BB_HASHCONFIG_IGNORE_VARS:append = " 
SIGGEN_UNLOCKED_RECIPES"\n\n')
 
 # Set up which tasks are ignored for run on install
-f.write('BB_SETSCENE_ENFORCE_IGNORE_TASKS = "%:* 
*:do_shared_workdir *:do_rm_work wic-tools:* *:do_addto_recipe_sysroot"\n\n')
+f.write('BB_SETSCENE_ENFORCE_IGNORE_TASKS = "%:* 
*:do_shared_workdir *:do_rm_work *:do_deploy_links wic-tools:* 
*:do_addto_recipe_sysroot"\n\n')
 
 # Hide the config information from bitbake output (since it's 
fixed within the SDK)
 f.write('BUILDCFG_HEADER = ""\n\n')
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191097): 
https://lists.openembedded.org/g/openembedded-core/message/191097
Mute This Topic: https://lists.openembedded.org/mt/102747738/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 18/21] selftest: multiconfig-image-packager: use IMAGE_NAME instead of IMAGE_LINK_NAME

2023-11-22 Thread Martin Jansa
* the IMAGE_LINK_NAME now contains PKGV, PKGR in the filename, but the
  multiconfig-image-packager and MC_DEPLOY_IMAGE_BASENAME
  (e.g. core-image-minimal) has different PKGV value causing:

  | DEBUG: Executing shell function do_install
  | install: cannot stat 
'tmp-mc-musl/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs--0.1-r0-2011040523.ext4':
 No such file or directory
  ...
  | install: cannot stat 
'tmp-mc-tiny/deploy/images/qemux86/core-image-minimal-qemux86.rootfs--0.1-r0-2011040523.cpio.gz':
 No such file or directory

  because the actual filenames are:
  
tmp-mc-musl/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs--1.0-r0-2011040523.ext4
  
tmp-mc-tiny/deploy/images/qemux86/core-image-minimal-qemux86.rootfs--1.0-r0-2011040523.ext4

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 .../multiconfig/multiconfig-image-packager_0.1.bb| 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb 
b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
index d7785cee2e..b53b6a4b26 100644
--- a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
+++ b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb
@@ -13,11 +13,11 @@ do_install[mcdepends] += 
"mc::${MCNAME}:core-image-minimal:do_image_complete mc:
 
 do_install () {
 install -d ${D}/var/lib/machines/${MCNAME}
-install 
${MC_DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME_CORE_IMAGE_MINIMAL}.${MCIMGTYPE} 
${D}/var/lib/machines/${MCNAME}/${MC_DEPLOY_IMAGE_BASENAME}.${MCIMGTYPE}
+install 
${MC_DEPLOY_DIR_IMAGE}/${IMAGE_NAME_CORE_IMAGE_MINIMAL}.${MCIMGTYPE} 
${D}/var/lib/machines/${MCNAME}/${MC_DEPLOY_IMAGE_BASENAME}.${MCIMGTYPE}
 install ${MC_DEPLOY_DIR_IMAGE}/bzImage ${D}/var/lib/machines/${MCNAME}
 }
 
-# for IMAGE_LINK_NAME, IMAGE_BASENAME
+# for IMAGE_NAME, IMAGE_BASENAME
 inherit image-artifact-names
 
 python () {
@@ -31,14 +31,14 @@ python () {
 # these will most likely start with my BPN multiconfig-image-packager, but 
I want them from core-image-minimal
 # as there is no good way to query core-image-minimal's context lets 
assume that there are no overrides
 # and that we can just replace IMAGE_BASENAME
-image_link_name = d.getVar('IMAGE_LINK_NAME')
+image_name = d.getVar('IMAGE_NAME')
 image_basename = d.getVar('IMAGE_BASENAME')
 machine = d.getVar('MACHINE')
 mcmachine = d.getVar('MCMACHINE')
 image_to_deploy = d.getVar('MC_DEPLOY_IMAGE_BASENAME')
-image_link_name_to_deploy = image_link_name.replace(image_basename, 
image_to_deploy).replace(machine, mcmachine)
-bb.warn('%s: assuming that "%s" built for "%s" has IMAGE_LINK_NAME "%s"' % 
(d.getVar('PN'), mcmachine, image_to_deploy, image_link_name_to_deploy))
-d.setVar('IMAGE_LINK_NAME_CORE_IMAGE_MINIMAL', image_link_name_to_deploy)
+image_name_to_deploy = image_name.replace(image_basename, 
image_to_deploy).replace(machine, mcmachine)
+bb.warn('%s: assuming that "%s" built for "%s" has IMAGE_NAME "%s"' % 
(d.getVar('PN'), mcmachine, image_to_deploy, image_name_to_deploy))
+d.setVar('IMAGE_NAME_CORE_IMAGE_MINIMAL', image_name_to_deploy)
 }
 
 BBCLASSEXTEND = "mcextend:tiny mcextend:musl"
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191095): 
https://lists.openembedded.org/g/openembedded-core/message/191095
Mute This Topic: https://lists.openembedded.org/mt/102747736/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 19/21] image.bbclass: remove hardlinks as well

2023-11-22 Thread Martin Jansa
* it was removing only destination symlinks, but sometimes hardlink might be 
regenerated
  as well, e.g. in oeqa test wic.Wic.test_permissions which was failing with:

NOTE: recipe core-image-minimal-1.0-r0: task do_image_wic: Started
ERROR: core-image-minimal-1.0-r0 do_image_wic: Error executing a python 
function in exec_func_python() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_func_python() autogenerated', lineno: 2, function: 
 0001:
 *** 0002:create_hardlinks(d)
 0003:
File: '/OE/build/poky/meta/classes-recipe/image.bbclass', lineno: 606, 
function: create_hardlinks
 0602:if os.path.exists(src):
 0603:bb.note("Creating hardlink: %s -> %s" % (dst, src))
 0604:if os.path.islink(dst):
 0605:os.remove(dst)
 *** 0606:os.link(src, dst)
 0607:else:
 0608:bb.note("Skipping hardlink, source does not exist: %s -> 
%s" % (dst, src))
 0609:}
 0610:
Exception: FileExistsError: [Errno 17] File exists: 
'tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/deploy-core-image-minimal-image-complete/core-image-minimal-qemux86-64.rootfs.wic'
 -> 
'tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/deploy-core-image-minimal-image-complete/core-image-minimal-qemux86-64.rootfs--1.0-r0-2011040523.wic'

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-recipe/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes-recipe/image.bbclass 
b/meta/classes-recipe/image.bbclass
index e68b8034ea..081f1927fb 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -601,7 +601,7 @@ python create_hardlinks() {
 src = os.path.join(deploy_dir, img_name + "." + type)
 if os.path.exists(src):
 bb.note("Creating hardlink: %s -> %s" % (dst, src))
-if os.path.islink(dst):
+if os.path.isfile(dst):
 os.remove(dst)
 os.link(src, dst)
 else:
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191096): 
https://lists.openembedded.org/g/openembedded-core/message/191096
Mute This Topic: https://lists.openembedded.org/mt/102747737/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 17/21] oeqa: fitimage: respect KERNEL_FIT_NAME

2023-11-22 Thread Martin Jansa
* avoid couple of get_bb_var calls and use get_bb_vars instead

* use KERNEL_FIT_LINK_NAME instead of assuming it's MACHINE as e.g.:
  machine = get_bb_var('MACHINE')
  fitimage_its_path = os.path.join(deploy_dir_image,
 "fitImage-its-%s-%s-%s" % (image_type, machine, machine))

* be aware that KERNEL_FIT_LINK_NAME can still be set to empty
  and then this oeqa check would fail again, because this hardlink:

  ln -vf $deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}.its 
"$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_LINK_NAME}"

  wouldn't be created and also with KERNEL_FIT_LINK_NAME the
  PKGV in kernel recipe looks differently in the final kernel
  artifact and KERNEL_FIT_LINK_NAME e.g.:

  AssertionError: False is not true:
  
tmp/deploy/images/beaglebone-yocto/fitImage-its-core-image-minimal-initramfs-beaglebone-yocto-beaglebone-yocto--6.1.20+git-r0-20230318024804
 image tree source doesn't exist

  because it's actually named with SRCPV expanded:
  
tmp/deploy/images/beaglebone-yocto/fitImage-its-core-image-minimal-initramfs-beaglebone-yocto-beaglebone-yocto--6.1.20+git0+29ec3dc6f4_423e199669-r0-20230318024804

  Use KERNEL_FIT_NAME instead of KERNEL_FIT_LINK_NAME but then we would
  need to add .its extension to expected filenames as well, but in previous
  commit I've added KERNEL_FIT_ITS_EXT variable and used it for links as well.
  But this doesn't apply for u-boot-its* files which don't use any extension.

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/lib/oeqa/selftest/cases/fitimage.py | 98 
 1 file changed, 48 insertions(+), 50 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/fitimage.py 
b/meta/lib/oeqa/selftest/cases/fitimage.py
index 9383d0c4db..170df1bea2 100644
--- a/meta/lib/oeqa/selftest/cases/fitimage.py
+++ b/meta/lib/oeqa/selftest/cases/fitimage.py
@@ -5,7 +5,7 @@
 #
 
 from oeqa.selftest.case import OESelftestTestCase
-from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
+from oeqa.utils.commands import runCmd, bitbake, get_bb_vars
 import os
 import re
 
@@ -46,12 +46,12 @@ FIT_DESC = "A model description"
 # fitImage is created as part of linux recipe
 image = "virtual/kernel"
 bitbake(image)
-bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'INITRAMFS_IMAGE_NAME', 
'KERNEL_FIT_LINK_NAME'], image)
+bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'INITRAMFS_IMAGE_NAME', 
'KERNEL_FIT_NAME', 'KERNEL_FIT_ITS_EXT', 'KERNEL_FIT_BIN_EXT'], image)
 
 fitimage_its_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'],
-"fitImage-its-%s-%s" % (bb_vars['INITRAMFS_IMAGE_NAME'], 
bb_vars['KERNEL_FIT_LINK_NAME']))
+"fitImage-its-%s%s%s" % (bb_vars['INITRAMFS_IMAGE_NAME'], 
bb_vars['KERNEL_FIT_NAME'], bb_vars['KERNEL_FIT_ITS_EXT']))
 fitimage_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'],
-"fitImage-%s-%s" % (bb_vars['INITRAMFS_IMAGE_NAME'], 
bb_vars['KERNEL_FIT_LINK_NAME']))
+"fitImage-%s%s%s" % (bb_vars['INITRAMFS_IMAGE_NAME'], 
bb_vars['KERNEL_FIT_NAME'], bb_vars['KERNEL_FIT_BIN_EXT']))
 
 self.assertTrue(os.path.exists(fitimage_its_path),
 "%s image tree source doesn't exist" % (fitimage_its_path))
@@ -126,12 +126,12 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'"
 # fitImage is created as part of linux recipe
 image = "virtual/kernel"
 bitbake(image)
-bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'KERNEL_FIT_LINK_NAME'], 
image)
+bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'KERNEL_FIT_NAME', 
'KERNEL_FIT_ITS_EXT', 'KERNEL_FIT_BIN_EXT'], image)
 
 fitimage_its_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'],
-"fitImage-its-%s" % (bb_vars['KERNEL_FIT_LINK_NAME']))
+"fitImage-its%s%s" % (bb_vars['KERNEL_FIT_NAME'], 
bb_vars['KERNEL_FIT_ITS_EXT']))
 fitimage_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'],
-"fitImage-%s.bin" % (bb_vars['KERNEL_FIT_LINK_NAME']))
+"fitImage%s%s" % (bb_vars['KERNEL_FIT_NAME'], 
bb_vars['KERNEL_FIT_BIN_EXT']))
 
 self.assertTrue(os.path.exists(fitimage_its_path),
 "%s image tree source doesn't exist" % (fitimage_its_path))
@@ -278,14 +278,14 @@ FIT_SIGN_INDIVIDUAL = "1"
 self.write_config(config)
 
 # The U-Boot fitImage is created as part of the U-Boot recipe
-bitbake("virtual/bootloader")
+image = "virtual/bootloader"
+bitbake(image)
+bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'KERNEL_FIT_NAME'], image)
 
-deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE')
-machine = get_bb_var('MACHINE')
-fitimage_its_path = os.path.join(deploy_dir_image,
-"u-boot-its-%s" % (machine,))
-fitimage_path = os.path.join(deploy_dir_image,
-"u-boot-fitImage-%s" % (machine,))
+fitimage_its_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'],
+"u-bo

[OE-core] [PATCH 15/21] oeqa: imagefeatures: append -dbg suffix at the end of IMAGE_NAME not IMAGE_LINK_NAME

2023-11-22 Thread Martin Jansa
* the filename is constructed as:
  meta/classes-recipe/image.bbclass:d.appendVar('IMAGE_NAME','-dbg')
  and IMAGE_LINK_NAME adds ${IMAGE_VERSION_SUFFIX} _after_ this

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/lib/oeqa/selftest/cases/imagefeatures.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py 
b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index dc88c222bd..da510f0e8e 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -288,9 +288,9 @@ SKIP_RECIPE[busybox] = "Don't build this"
 self.write_config(features)
 
 bitbake(image)
-bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image)
+bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_NAME'], image)
 
-dbg_tar_file = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], "%s-dbg.%s" % 
(bb_vars['IMAGE_LINK_NAME'], image_fstypes_debugfs))
+dbg_tar_file = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], "%s-dbg.%s" % 
(bb_vars['IMAGE_NAME'], image_fstypes_debugfs))
 self.assertTrue(os.path.exists(dbg_tar_file), 'debug filesystem not 
generated at %s' % dbg_tar_file)
 result = runCmd('cd %s; tar xvf %s' % (bb_vars['DEPLOY_DIR_IMAGE'], 
dbg_tar_file))
 self.assertEqual(result.status, 0, msg='Failed to extract %s: %s' % 
(dbg_tar_file, result.output))
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191092): 
https://lists.openembedded.org/g/openembedded-core/message/191092
Mute This Topic: https://lists.openembedded.org/mt/102747733/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 16/21] oeqa: gdbserver: append -dbg suffix at the end of IMAGE_NAME not IMAGE_LINK_NAME

2023-11-22 Thread Martin Jansa
* the filename is constructed as:
  meta/classes-recipe/image.bbclass:d.appendVar('IMAGE_NAME','-dbg')
  and IMAGE_LINK_NAME adds ${IMAGE_VERSION_SUFFIX} _after_ this

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/lib/oeqa/selftest/cases/gdbserver.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/gdbserver.py 
b/meta/lib/oeqa/selftest/cases/gdbserver.py
index 9da97ae780..f441468861 100644
--- a/meta/lib/oeqa/selftest/cases/gdbserver.py
+++ b/meta/lib/oeqa/selftest/cases/gdbserver.py
@@ -34,12 +34,12 @@ CORE_IMAGE_EXTRA_INSTALL = "gdbserver"
 self.assertEqual(r.status, 0)
 self.assertIn("GNU gdb", r.output)
 image = 'core-image-minimal'
-bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image)
+bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_NAME'], image)
 
 with tempfile.TemporaryDirectory(prefix="debugfs-") as debugfs:
-filename = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], 
"%s-dbg.tar.bz2" % bb_vars['IMAGE_LINK_NAME'])
+filename = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], 
"%s-dbg.tar.bz2" % bb_vars['IMAGE_NAME'])
 shutil.unpack_archive(filename, debugfs)
-filename = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], "%s.tar.bz2" 
% bb_vars['IMAGE_LINK_NAME'])
+filename = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], "%s.tar.bz2" 
% bb_vars['IMAGE_NAME'])
 shutil.unpack_archive(filename, debugfs)
 
 with runqemu("core-image-minimal", runqemuparams="nographic") as 
qemu:
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191093): 
https://lists.openembedded.org/g/openembedded-core/message/191093
Mute This Topic: https://lists.openembedded.org/mt/102747734/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 14/21] image.bbclass: don't append -dbg suffix twice

2023-11-22 Thread Martin Jansa
* now with IMAGE_LINK_NAME defined based on IMAGE_NAME we don't want to
  append -dbg to IMAGE_NAME and then again to IMAGE_LINK_NAME

* this resulted in filename like:
  core-image-minimal-qemux86-64.rootfs-dbg--1.0-r0-2011040523-dbg.tar.bz2

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-recipe/image.bbclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/classes-recipe/image.bbclass 
b/meta/classes-recipe/image.bbclass
index aa24a92245..e68b8034ea 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -338,8 +338,6 @@ addtask do_image_qa_setscene
 
 def setup_debugfs_variables(d):
 d.appendVar('IMAGE_ROOTFS', '-dbg')
-if d.getVar('IMAGE_LINK_NAME'):
-d.appendVar('IMAGE_LINK_NAME', '-dbg')
 d.appendVar('IMAGE_NAME','-dbg')
 d.setVar('IMAGE_BUILDING_DEBUGFS', 'true')
 debugfs_image_fstypes = d.getVar('IMAGE_FSTYPES_DEBUGFS')
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191091): 
https://lists.openembedded.org/g/openembedded-core/message/191091
Mute This Topic: https://lists.openembedded.org/mt/102747732/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 13/21] kernel.bbclass: inherit KERNEL_CLASSES at the end

2023-11-22 Thread Martin Jansa
* after defining deploy-links task, so that e.g. kernel-fitimage can append to 
it
  like kernel-devicetree.bbclass

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-recipe/kernel.bbclass | 34 +++---
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/meta/classes-recipe/kernel.bbclass 
b/meta/classes-recipe/kernel.bbclass
index e38784a320..c5ff7453ff 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -156,23 +156,6 @@ set -e
 d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}')
 }
 
-# Here we pull in all various kernel image types which we support.
-#
-# In case you're wondering why kernel.bbclass inherits the other image
-# types instead of the other way around, the reason for that is to
-# maintain compatibility with various currently existing meta-layers.
-# By pulling in the various kernel image types here, we retain the
-# original behavior of kernel.bbclass, so no meta-layers should get
-# broken.
-#
-# KERNEL_CLASSES by default pulls in kernel-uimage.bbclass, since this
-# used to be the default behavior when only uImage was supported. This
-# variable can be appended by users who implement support for new kernel
-# image types.
-
-KERNEL_CLASSES ?= " kernel-uimage "
-inherit ${KERNEL_CLASSES}
-
 # Old style kernels may set ${S} = ${WORKDIR}/git for example
 # We need to move these over to STAGING_KERNEL_DIR. We can't just
 # create the symlink in advance as the git fetcher can't cope with
@@ -892,3 +875,20 @@ EXPORT_FUNCTIONS do_deploy do_deploy_links
 
 # Add using Device Tree support
 inherit kernel-devicetree
+
+# Here we pull in all various kernel image types which we support.
+#
+# In case you're wondering why kernel.bbclass inherits the other image
+# types instead of the other way around, the reason for that is to
+# maintain compatibility with various currently existing meta-layers.
+# By pulling in the various kernel image types here, we retain the
+# original behavior of kernel.bbclass, so no meta-layers should get
+# broken.
+#
+# KERNEL_CLASSES by default pulls in kernel-uimage.bbclass, since this
+# used to be the default behavior when only uImage was supported. This
+# variable can be appended by users who implement support for new kernel
+# image types.
+
+KERNEL_CLASSES ?= " kernel-uimage "
+inherit ${KERNEL_CLASSES}
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191090): 
https://lists.openembedded.org/g/openembedded-core/message/191090
Mute This Topic: https://lists.openembedded.org/mt/102747731/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 12/21] linux-dummy: add do_deploy_links task

2023-11-22 Thread Martin Jansa
* fixes containerimage.ContainerImageTests.test_expected_files oeqa test 
failing with:

  Initialising tasks...ERROR: Task do_build in
  
/OE/build/poky/build-st/meta-selftest/recipes-test/container-image/container-test-image.bb
  depends upon non-existent task do_deploy_links in
  /OE/build/poky/meta/recipes-kernel/linux/linux-dummy.bb

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/recipes-kernel/linux/linux-dummy.bb | 5 +
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-kernel/linux/linux-dummy.bb 
b/meta/recipes-kernel/linux/linux-dummy.bb
index 2396f46202..47a0d5e9da 100644
--- a/meta/recipes-kernel/linux/linux-dummy.bb
+++ b/meta/recipes-kernel/linux/linux-dummy.bb
@@ -60,7 +60,12 @@ do_deploy() {
:
 }
 
+do_deploy_links() {
+   :
+}
+
 addtask bundle_initramfs after do_install before do_deploy
 addtask deploy after do_install
+addtask deploy_links after do_deploy
 addtask shared_workdir after do_compile before do_install
 addtask compile_kernelmodules
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191089): 
https://lists.openembedded.org/g/openembedded-core/message/191089
Mute This Topic: https://lists.openembedded.org/mt/102747730/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 10/21] oeqa: bbtests.BitbakeTests.test_image_manifest: use just isfile() instead of islink()

2023-11-22 Thread Martin Jansa
* with [YOCTO #12937] changes the manifest is hardlink not symlink

* fixes:
  2023-11-16 00:16:33,967 - oe-selftest - INFO - test_image_manifest 
(bbtests.BitbakeTests.test_image_manifest)
  2023-11-16 00:19:05,060 - oe-selftest - INFO -  ... FAIL
  2023-11-16 00:19:05,060 - oe-selftest - INFO - Traceback (most recent call 
last):
File "/OE/build/poky/meta/lib/oeqa/selftest/cases/bbtests.py", line 139, in 
test_image_manifest
  self.assertTrue(os.path.islink(manifest), msg="No manifest file created 
for image. It should have been created in %s" % manifest)
  AssertionError: False is not true : No manifest file created for image. It 
should have been created in 
/OE/build/poky/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs--1.0-r0-2011040523.manifest

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/lib/oeqa/selftest/cases/bbtests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py 
b/meta/lib/oeqa/selftest/cases/bbtests.py
index d242352ea2..4276a9ba91 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -136,7 +136,7 @@ class BitbakeTests(OESelftestTestCase):
 deploydir = bb_vars["DEPLOY_DIR_IMAGE"]
 imagename = bb_vars["IMAGE_LINK_NAME"]
 manifest = os.path.join(deploydir, imagename + ".manifest")
-self.assertTrue(os.path.islink(manifest), msg="No manifest file 
created for image. It should have been created in %s" % manifest)
+self.assertTrue(os.path.isfile(manifest), msg="No manifest file 
created for image. It should have been created in %s" % manifest)
 
 def test_invalid_recipe_src_uri(self):
 data = 'SRC_URI = "file://invalid"'
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191087): 
https://lists.openembedded.org/g/openembedded-core/message/191087
Mute This Topic: https://lists.openembedded.org/mt/102747728/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 11/21] oeqa: wic: use just isfile() instead of islink()

2023-11-22 Thread Martin Jansa
* with [YOCTO #12937] changes the manifest is hardlink not symlink

* fixes:
2023-11-18 23:48:55,695 - oe-selftest - INFO -  ... FAIL
2023-11-18 23:48:55,696 - oe-selftest - INFO - Traceback (most recent call 
last):
  File "/OE/build/poky/meta/lib/oeqa/core/decorator/__init__.py", line 35, in 
wrapped_f
return func(*args, **kwargs)
   ^
  File "/OE/build/poky/meta/lib/oeqa/selftest/cases/wic.py", line 836, in 
test_wic_image_type
self.assertTrue(os.path.islink(path), msg="Link %s wasn't generated as 
expected" % path)
AssertionError: False is not true : Link 
tmp/deploy/images/qemux86-64/wic-image-minimal-qemux86-64.rootfs--1.0-r0-2011040523.wic
 wasn't generated as expected
---
 meta/lib/oeqa/selftest/cases/wic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/wic.py 
b/meta/lib/oeqa/selftest/cases/wic.py
index b4866bcb32..fdff3e846e 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -833,7 +833,7 @@ class Wic2(WicTestCase):
 # pointing to existing files
 for suffix in ('wic', 'manifest'):
 path = prefix + suffix
-self.assertTrue(os.path.islink(path), msg="Link %s wasn't 
generated as expected" % path)
+self.assertTrue(os.path.isfile(path), msg="Link %s wasn't 
generated as expected" % path)
 self.assertTrue(os.path.isfile(os.path.realpath(path)), msg="File 
linked to by %s wasn't generated as expected" % path)
 
 # TODO this should work on aarch64
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191088): 
https://lists.openembedded.org/g/openembedded-core/message/191088
Mute This Topic: https://lists.openembedded.org/mt/102747729/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 09/21] image-artifact-names.bbclass: add IMAGE_VERSION_SUFFIX_DATETIME which uses SOURCE_DATE_EPOCH

2023-11-22 Thread Martin Jansa
* since 
https://git.openembedded.org/openembedded-core/diff/meta/classes/image-artifact-names.bbclass?id=abb0671d2cebfd7e8df94796404bbe9c7f961058
  which removed the
  bb.data.inherits_class('reproducible_build', d)
  condition this was already applied in all the builds which used DATETIME, so 
we
  can move it to the default value directly and DISTRO configs than can choose
  to use IMAGE_VERSION_SUFFIX_DATETIME as they want

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-global/base.bbclass |  3 +++
 meta/classes-recipe/image-artifact-names.bbclass | 12 +++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass
index ac84312a87..755d10106a 100644
--- a/meta/classes-global/base.bbclass
+++ b/meta/classes-global/base.bbclass
@@ -207,6 +207,9 @@ do_unpack[postfuncs] += "create_source_date_epoch_stamp"
 
 def get_source_date_epoch_value(d):
 return oe.reproducible.epochfile_read(d.getVar('SDE_FILE'), d)
+def get_source_date_epoch_value_datetime(d):
+import datetime
+return 
datetime.datetime.fromtimestamp(int(get_source_date_epoch_value(d)), 
datetime.timezone.utc).strftime('%Y%m%d%H%M%S')
 
 def get_layers_branch_rev(d):
 revisions = oe.buildcfg.get_layer_revisions(d)
diff --git a/meta/classes-recipe/image-artifact-names.bbclass 
b/meta/classes-recipe/image-artifact-names.bbclass
index d0f1b0dc55..2d18f34c9c 100644
--- a/meta/classes-recipe/image-artifact-names.bbclass
+++ b/meta/classes-recipe/image-artifact-names.bbclass
@@ -9,8 +9,9 @@
 ##
 
 IMAGE_BASENAME ?= "${PN}"
-IMAGE_VERSION_SUFFIX ?= "-${PKGE}-${PKGV}-${PKGR}-${DATETIME}"
-IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME SOURCE_DATE_EPOCH"
+IMAGE_VERSION_SUFFIX_DATETIME = "${@get_source_date_epoch_value_datetime(d)}"
+IMAGE_VERSION_SUFFIX_DATETIME[vardepvalue] = ""
+IMAGE_VERSION_SUFFIX ?= 
"-${PKGE}-${PKGV}-${PKGR}-${IMAGE_VERSION_SUFFIX_DATETIME}"
 IMAGE_NAME ?= "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}"
 IMAGE_LINK_NAME ?= "${IMAGE_NAME}${IMAGE_VERSION_SUFFIX}"
 
@@ -32,10 +33,3 @@ IMAGE_MACHINE_SUFFIX ??= "-${MACHINE}"
 # by default) followed by additional suffices which describe the format (.ext4,
 # .ext4.xz, etc.).
 IMAGE_NAME_SUFFIX ??= ".rootfs"
-
-python () {
-if bb.data.inherits_class('deploy', d) and 
d.getVar("IMAGE_VERSION_SUFFIX") == "-${DATETIME}":
-import datetime
-d.setVar("IMAGE_VERSION_SUFFIX", "-" + 
datetime.datetime.fromtimestamp(int(d.getVar("SOURCE_DATE_EPOCH")), 
datetime.timezone.utc).strftime('%Y%m%d%H%M%S'))
-d.setVarFlag("IMAGE_VERSION_SUFFIX", "vardepvalue", "")
-}
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191086): 
https://lists.openembedded.org/g/openembedded-core/message/191086
Mute This Topic: https://lists.openembedded.org/mt/102747727/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 07/21] uboot: use ${IMAGE_MACHINE_SUFFIX} instead of -${MACHINE} and use hardlinks

2023-11-22 Thread Martin Jansa
* rename variables to match the conventions used in kernel and image recipes
* use versioned hardlinks as kernel and image recipes, but don't split
  the do_deploy_links task (can be split later).

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-recipe/uboot-config.bbclass |  22 ++-
 meta/classes-recipe/uboot-sign.bbclass   |  68 -
 meta/recipes-bsp/u-boot/u-boot.inc   | 177 +++
 3 files changed, 129 insertions(+), 138 deletions(-)

diff --git a/meta/classes-recipe/uboot-config.bbclass 
b/meta/classes-recipe/uboot-config.bbclass
index 9be1d64d3e..a3c875e762 100644
--- a/meta/classes-recipe/uboot-config.bbclass
+++ b/meta/classes-recipe/uboot-config.bbclass
@@ -19,6 +19,12 @@ def removesuffix(s, suffix):
 return s[:-len(suffix)]
 return s
 
+inherit kernel-artifact-names
+
+UBOOT_VERSION_SUFFIX ?= "${IMAGE_VERSION_SUFFIX}"
+UBOOT_ARTIFACT_NAME ?= "${IMAGE_MACHINE_SUFFIX}"
+UBOOT_ARTIFACT_LINK_NAME ?= "${UBOOT_ARTIFACT_NAME}${UBOOT_VERSION_SUFFIX}"
+
 UBOOT_ENTRYPOINT ?= "20008000"
 UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
 
@@ -27,8 +33,8 @@ UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
 UBOOT_SUFFIX ??= "bin"
 UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
 UBOOT_BINARYNAME ?= "${@os.path.splitext(d.getVar("UBOOT_BINARY"))[0]}"
-UBOOT_IMAGE ?= "${UBOOT_BINARYNAME}-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK ?= "${UBOOT_BINARYNAME}-${MACHINE}.${UBOOT_SUFFIX}"
+UBOOT_IMAGE ?= "${UBOOT_BINARYNAME}${UBOOT_ARTIFACT_NAME}.${UBOOT_SUFFIX}"
+UBOOT_LINK ?= "${UBOOT_BINARYNAME}${UBOOT_ARTIFACT_LINK_NAME}.${UBOOT_SUFFIX}"
 UBOOT_MAKE_TARGET ?= "all"
 
 # Output the ELF generated. Some platforms can use the ELF file and directly
@@ -38,7 +44,7 @@ UBOOT_ELF ?= ""
 UBOOT_ELF_SUFFIX ?= "elf"
 UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}"
 UBOOT_ELF_BINARY ?= "u-boot.${UBOOT_ELF_SUFFIX}"
-UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_ELF_SUFFIX}"
+UBOOT_ELF_LINK ?= "u-boot${UBOOT_ARTIFACT_LINK_NAME}.${UBOOT_ELF_SUFFIX}"
 
 # Some versions of u-boot build an SPL (Second Program Loader) image that
 # should be packaged along with the u-boot binary as well as placed in the
@@ -49,8 +55,8 @@ SPL_BINARY ?= ""
 SPL_DELIMITER  ?= "${@'.' if d.getVar("SPL_SUFFIX") else ''}"
 SPL_BINARYFILE ?= "${@os.path.basename(d.getVar("SPL_BINARY"))}"
 SPL_BINARYNAME ?= "${@removesuffix(d.getVar("SPL_BINARYFILE"), "." + 
d.getVar("SPL_SUFFIX"))}"
-SPL_IMAGE ?= 
"${SPL_BINARYNAME}-${MACHINE}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX}"
-SPL_SYMLINK ?= "${SPL_BINARYNAME}-${MACHINE}${SPL_DELIMITER}${SPL_SUFFIX}"
+SPL_IMAGE ?= 
"${SPL_BINARYNAME}${UBOOT_ARTIFACT_NAME}${SPL_DELIMITER}${SPL_SUFFIX}"
+SPL_LINK ?= 
"${SPL_BINARYNAME}${UBOOT_ARTIFACT_LINK_NAME}${SPL_DELIMITER}${SPL_SUFFIX}"
 
 # Additional environment variables or a script can be installed alongside
 # u-boot to be used automatically on boot.  This file, typically 'uEnv.txt'
@@ -62,8 +68,8 @@ UBOOT_ENV ?= ""
 UBOOT_ENV_SRC_SUFFIX ?= "cmd"
 UBOOT_ENV_SRC ?= "${UBOOT_ENV}.${UBOOT_ENV_SRC_SUFFIX}"
 UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}"
-UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}"
-UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}"
+UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}${UBOOT_ARTIFACT_NAME}.${UBOOT_ENV_SUFFIX}"
+UBOOT_ENV_LINK ?= "${UBOOT_ENV}${UBOOT_ARTIFACT_LINK_NAME}.${UBOOT_ENV_SUFFIX}"
 
 # Default name of u-boot initial env, but enable individual recipes to change
 # this value.
@@ -73,7 +79,7 @@ UBOOT_INITIAL_ENV ?= "${PN}-initial-env"
 # to find EXTLINUX conf file.
 UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux"
 UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf"
-UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}"
+UBOOT_EXTLINUX_CONF_LINK ?= 
"${UBOOT_EXTLINUX_CONF_NAME}${UBOOT_ARTIFACT_LINK_NAME}"
 
 # Options for the device tree compiler passed to mkimage '-D' feature:
 UBOOT_MKIMAGE_DTCOPTS ??= ""
diff --git a/meta/classes-recipe/uboot-sign.bbclass 
b/meta/classes-recipe/uboot-sign.bbclass
index ad04c82378..e89c8214d3 100644
--- a/meta/classes-recipe/uboot-sign.bbclass
+++ b/meta/classes-recipe/uboot-sign.bbclass
@@ -34,27 +34,27 @@ UBOOT_FITIMAGE_ENABLE ?= "0"
 SPL_SIGN_ENABLE ?= "0"
 
 # Default value for deployment filenames.
-UBOOT_DTB_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.dtb"
+UBOOT_DTB_IMAGE ?= "u-boot${UBOOT_ARTIFACT_NAME}.dtb"
 UBOOT_DTB_BINARY ?= "u-boot.dtb"
 UBOOT_DTB_SIGNED ?= "${UBOOT_DTB_BINARY}-signed"
-UBOOT_DTB_SYMLINK ?= "u-boot-${MACHINE}.dtb"
-UBOOT_NODTB_IMAGE ?= "u-boot-nodtb-${MACHINE}-${PV}-${PR}.bin"
+UBOOT_DTB_LINK ?= "u-boot${UBOOT_ARTIFACT_LINK_NAME}.dtb"
+UBOOT_NODTB_IMAGE ?= "u-boot-nodtb${UBOOT_ARTIFACT_NAME}.bin"
 UBOOT_NODTB_BINARY ?= "u-boot-nodtb.bin"
-UBOOT_NODTB_SYMLINK ?= "u-boot-nodtb-${MACHINE}.bin"
-UBOOT_ITS_IMAGE ?= "u-boot-its-${MACHINE}-${PV}-${PR}"
+UBOOT_NODTB_LINK ?= "u-boot-nodtb${UBOOT_ARTIFACT_LINK_NAME}.bin"
+UBOOT_ITS_IMAGE ?= "u-boot-its${UBOOT_ARTIFACT_NAME}"

[OE-core] [PATCH 08/21] image.bbclass: rename create_symlinks to create_hardlinks

2023-11-22 Thread Martin Jansa
* to make it more clear what this postfunc does now

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-recipe/image-live.bbclass | 2 +-
 meta/classes-recipe/image.bbclass  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes-recipe/image-live.bbclass 
b/meta/classes-recipe/image-live.bbclass
index 95dd44a8c0..4d926cb7a7 100644
--- a/meta/classes-recipe/image-live.bbclass
+++ b/meta/classes-recipe/image-live.bbclass
@@ -257,7 +257,7 @@ python do_bootimg() {
 bb.build.exec_func('build_efi_cfg', d)
 bb.build.exec_func('build_hddimg', d)
 bb.build.exec_func('build_iso', d)
-bb.build.exec_func('create_symlinks', d)
+bb.build.exec_func('create_hardlinks', d)
 }
 do_bootimg[subimages] = "hddimg iso"
 
diff --git a/meta/classes-recipe/image.bbclass 
b/meta/classes-recipe/image.bbclass
index 48dc70b8fc..aa24a92245 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -508,7 +508,7 @@ python () {
 d.setVarFlag(task, 'fakeroot', '1')
 
 d.appendVarFlag(task, 'prefuncs', ' ' + debug + ' set_image_size')
-d.prependVarFlag(task, 'postfuncs', 'create_symlinks ')
+d.prependVarFlag(task, 'postfuncs', 'create_hardlinks ')
 d.appendVarFlag(task, 'subimages', ' ' + ' '.join(subimages))
 d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps))
 d.appendVarFlag(task, 'vardepsexclude', ' DATETIME DATE ' + ' 
'.join(vardepsexclude))
@@ -584,9 +584,9 @@ python set_image_size () {
 }
 
 #
-# Create symlinks to the newly created image
+# Create hardlinks to the newly created image
 #
-python create_symlinks() {
+python create_hardlinks() {
 
 deploy_dir = d.getVar('IMGDEPLOYDIR')
 img_name = d.getVar('IMAGE_NAME')
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191085): 
https://lists.openembedded.org/g/openembedded-core/message/191085
Mute This Topic: https://lists.openembedded.org/mt/102747726/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 02/21] create-spdx-2.2.bbclass: use hardlink as well

2023-11-22 Thread Martin Jansa
[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes/create-spdx-2.2.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/create-spdx-2.2.bbclass 
b/meta/classes/create-spdx-2.2.bbclass
index b0aef80db1..8c77f6b886 100644
--- a/meta/classes/create-spdx-2.2.bbclass
+++ b/meta/classes/create-spdx-2.2.bbclass
@@ -967,7 +967,7 @@ python image_combine_spdx() {
 if image_link_name:
 link = imgdeploydir / (image_link_name + suffix)
 if link != target_path:
-link.symlink_to(os.path.relpath(target_path, link.parent))
+os.link(target_path, link)
 
 spdx_tar_path = imgdeploydir / (image_name + ".spdx.tar.zst")
 make_image_link(spdx_tar_path, ".spdx.tar.zst")
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191079): 
https://lists.openembedded.org/g/openembedded-core/message/191079
Mute This Topic: https://lists.openembedded.org/mt/102747720/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 06/21] kernel-fitimage.bbclass: add .its extension also to links

2023-11-22 Thread Martin Jansa
* for consistency with the names

[YOCTO #12937]
---
 meta/classes-recipe/kernel-artifact-names.bbclass | 2 ++
 meta/classes-recipe/kernel-fitimage.bbclass   | 8 
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta/classes-recipe/kernel-artifact-names.bbclass 
b/meta/classes-recipe/kernel-artifact-names.bbclass
index 023ce61de5..1117a5b61f 100644
--- a/meta/classes-recipe/kernel-artifact-names.bbclass
+++ b/meta/classes-recipe/kernel-artifact-names.bbclass
@@ -31,6 +31,8 @@ KERNEL_FIT_NAME ?= "${KERNEL_ARTIFACT_NAME}"
 KERNEL_FIT_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}"
 KERNEL_FIT_BIN_EXT ?= "${KERNEL_ARTIFACT_BIN_EXT}"
 
+KERNEL_FIT_ITS_EXT ?= ".its"
+
 MODULE_TARBALL_NAME ?= "${KERNEL_ARTIFACT_NAME}"
 MODULE_TARBALL_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}"
 MODULE_TARBALL_DEPLOY ?= "1"
diff --git a/meta/classes-recipe/kernel-fitimage.bbclass 
b/meta/classes-recipe/kernel-fitimage.bbclass
index 25a33123a6..ee2496fedc 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -843,14 +843,14 @@ kernel_do_deploy:append() {
 
if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
bbnote "Copying fit-image.its source file..."
-   install -m 0644 ${B}/fit-image.its 
"$deployDir/fitImage-its${KERNEL_FIT_NAME}.its"
+   install -m 0644 ${B}/fit-image.its 
"$deployDir/fitImage-its${KERNEL_FIT_NAME}${KERNEL_FIT_ITS_EXT}"
bbnote "Copying linux.bin file..."
install -m 0644 ${B}/linux.bin 
$deployDir/fitImage-linux${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}
fi
 
if [ -n "${INITRAMFS_IMAGE}" ]; then
bbnote "Copying fit-image-${INITRAMFS_IMAGE}.its source 
file..."
-   install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its 
"$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}.its"
+   install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its 
"$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}${KERNEL_FIT_ITS_EXT}"
if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
bbnote "Copying fitImage-${INITRAMFS_IMAGE} 
file..."
install -m 0644 
${B}/${KERNEL_OUTPUT_DIR}/fitImage-${INITRAMFS_IMAGE} 
"$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}"
@@ -864,12 +864,12 @@ kernel_do_deploy_links:append() {
bbnote "Not creating versioned hardlinks, because 
KERNEL_FIT_LINK_NAME is empty or identical to KERNEL_FIT_NAME"
else
if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
-   ln -vf 
$deployDir/fitImage-its${KERNEL_FIT_NAME}.its 
"$deployDir/fitImage-its${KERNEL_FIT_LINK_NAME}"
+   ln -vf 
$deployDir/fitImage-its${KERNEL_FIT_NAME}${KERNEL_FIT_ITS_EXT} 
"$deployDir/fitImage-its${KERNEL_FIT_LINK_NAME}${KERNEL_FIT_ITS_EXT}"
ln -vf 
$deployDir/fitImage-linux${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} 
"$deployDir/fitImage-linux${KERNEL_FIT_LINK_NAME}${KERNEL_FIT_BIN_EXT}"
fi
 
if [ -n "${INITRAMFS_IMAGE}" ]; then
-   ln -vf 
$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}.its 
"$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_LINK_NAME}"
+   ln -vf 
$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}${KERNEL_FIT_ITS_EXT}
 
"$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_LINK_NAME}${KERNEL_FIT_ITS_EXT}"
if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
ln -vf 
$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}
 
"$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_LINK_NAME}${KERNEL_FIT_BIN_EXT}"
fi
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191083): 
https://lists.openembedded.org/g/openembedded-core/message/191083
Mute This Topic: https://lists.openembedded.org/mt/102747724/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 04/21] kernel: move the leading dash into KERNEL_ARTIFACT_NAME

2023-11-22 Thread Martin Jansa
* this matches how IMAGE_MACHINE_SUFFIX works and we can use
  that for the default value

* allows to set IMAGE_MACHINE_SUFFIX to empty for people
  who prefer to keep MACHINE name only in the directory name
  otherwise there would be a stray dash in:
  lrwxrwxrwx 2 martin martin   12 Nov 18 13:25 bzImage -> bzImage-.bin
  -rw-r--r-- 2 martin martin  12M Nov 18 13:25 bzImage-.bin
  -rw-r--r-- 2 martin martin 182M Nov 18 13:25 modules-.tgz
  if you set
  KERNEL_ARTIFACT_NAME = ""

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 .../classes-recipe/kernel-artifact-names.bbclass |  6 +++---
 meta/classes-recipe/kernel-devicetree.bbclass| 12 ++--
 meta/classes-recipe/kernel-fitimage.bbclass  | 16 
 meta/classes-recipe/kernel.bbclass   | 10 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/meta/classes-recipe/kernel-artifact-names.bbclass 
b/meta/classes-recipe/kernel-artifact-names.bbclass
index 186c6bc5b9..023ce61de5 100644
--- a/meta/classes-recipe/kernel-artifact-names.bbclass
+++ b/meta/classes-recipe/kernel-artifact-names.bbclass
@@ -14,7 +14,7 @@ inherit image-artifact-names
 
 KERNEL_VERSION_SUFFIX ?= "${IMAGE_VERSION_SUFFIX}"
 
-KERNEL_ARTIFACT_NAME ?= "${MACHINE}"
+KERNEL_ARTIFACT_NAME ?= "${IMAGE_MACHINE_SUFFIX}"
 KERNEL_ARTIFACT_LINK_NAME ?= "${KERNEL_ARTIFACT_NAME}${KERNEL_VERSION_SUFFIX}"
 KERNEL_ARTIFACT_BIN_EXT ?= ".bin"
 
@@ -35,5 +35,5 @@ MODULE_TARBALL_NAME ?= "${KERNEL_ARTIFACT_NAME}"
 MODULE_TARBALL_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}"
 MODULE_TARBALL_DEPLOY ?= "1"
 
-INITRAMFS_NAME ?= "initramfs-${KERNEL_ARTIFACT_NAME}"
-INITRAMFS_LINK_NAME ?= "initramfs-${KERNEL_ARTIFACT_LINK_NAME}"
+INITRAMFS_NAME ?= "initramfs${KERNEL_ARTIFACT_NAME}"
+INITRAMFS_LINK_NAME ?= "initramfs${KERNEL_ARTIFACT_LINK_NAME}"
diff --git a/meta/classes-recipe/kernel-devicetree.bbclass 
b/meta/classes-recipe/kernel-devicetree.bbclass
index 1fde90f023..2cd8588304 100644
--- a/meta/classes-recipe/kernel-devicetree.bbclass
+++ b/meta/classes-recipe/kernel-devicetree.bbclass
@@ -102,7 +102,7 @@ kernel_do_deploy:append() {
fi
install -m 0644 ${D}/${KERNEL_DTBDEST}/$dtb 
$deployDir/$dtb_base_name.$dtb_ext
if [ -n "${KERNEL_DTB_NAME}" ] ; then
-   ln -vf $deployDir/$dtb_base_name.$dtb_ext 
$deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext
+   ln -vf $deployDir/$dtb_base_name.$dtb_ext 
$deployDir/$dtb_base_name${KERNEL_DTB_NAME}.$dtb_ext
fi
for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
if [ "$type" = "zImage" ] && [ 
"${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
@@ -111,7 +111,7 @@ kernel_do_deploy:append() {
> 
$deployDir/$type-$dtb_base_name.$dtb_ext${KERNEL_DTB_BIN_EXT}
if [ -n "${KERNEL_DTB_NAME}" ]; then
ln -sf 
$type-$dtb_base_name.$dtb_ext${KERNEL_DTB_BIN_EXT} \
-   
$deployDir/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
+   
$deployDir/$type-$dtb_base_name${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
fi
if [ -e 
"${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
cat 
${KERNEL_OUTPUT_DIR}/${type}.initramfs \
@@ -119,7 +119,7 @@ kernel_do_deploy:append() {
>  
$deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name.$dtb_ext${KERNEL_DTB_BIN_EXT}
if [ -n "${KERNEL_DTB_NAME}" ]; then
ln -sf 
${type}-${INITRAMFS_NAME}-$dtb_base_name.$dtb_ext${KERNEL_DTB_BIN_EXT} \
-   
$deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
+   
$deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
fi
fi
fi
@@ -134,14 +134,14 @@ kernel_do_deploy_links:append() {
dtb=`normalize_dtb "$dtbf"`
dtb_ext=${dtb##*.}
dtb_base_name=`basename $dtb .$dtb_ext`
-   ln -vf $deployDir/$dtb_base_name.$dtb_ext 
$deployDir/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext
+   ln -vf $deployDir/$dtb_base_name.$dtb_ext 
$deployDir/$dtb_base_name${KERNEL_DTB_LINK_NAME}.$dtb_ext
for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
if [ "$type" = "zImage" ] && [ 
"${KERNEL_DEVICETREE_BUNDLE}" = "1" ] ; then
ln

[OE-core] [PATCH 05/21] kernel-fitimage.bbclass: avoid duplicate .bin extension

2023-11-22 Thread Martin Jansa
* the linux.bin was deployed as:
  fitImage-linux.bin${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}
  where KERNEL_FIT_BIN_EXT is the 2nd ".bin"

* add the${KERNEL_FIT_BIN_EXT} also to corresponding links:
  fitImage-linux${KERNEL_FIT_LINK_NAME}${KERNEL_FIT_BIN_EXT}

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-recipe/kernel-fitimage.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass 
b/meta/classes-recipe/kernel-fitimage.bbclass
index 266680ffa8..25a33123a6 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -845,7 +845,7 @@ kernel_do_deploy:append() {
bbnote "Copying fit-image.its source file..."
install -m 0644 ${B}/fit-image.its 
"$deployDir/fitImage-its${KERNEL_FIT_NAME}.its"
bbnote "Copying linux.bin file..."
-   install -m 0644 ${B}/linux.bin 
$deployDir/fitImage-linux.bin${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}
+   install -m 0644 ${B}/linux.bin 
$deployDir/fitImage-linux${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}
fi
 
if [ -n "${INITRAMFS_IMAGE}" ]; then
@@ -865,13 +865,13 @@ kernel_do_deploy_links:append() {
else
if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
ln -vf 
$deployDir/fitImage-its${KERNEL_FIT_NAME}.its 
"$deployDir/fitImage-its${KERNEL_FIT_LINK_NAME}"
-   ln -vf 
$deployDir/fitImage-linux.bin${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} 
"$deployDir/fitImage-linux.bin${KERNEL_FIT_LINK_NAME}"
+   ln -vf 
$deployDir/fitImage-linux${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} 
"$deployDir/fitImage-linux${KERNEL_FIT_LINK_NAME}${KERNEL_FIT_BIN_EXT}"
fi
 
if [ -n "${INITRAMFS_IMAGE}" ]; then
ln -vf 
$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}.its 
"$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_LINK_NAME}"
if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
-   ln -vf 
$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}
 "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_LINK_NAME}"
+   ln -vf 
$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}
 
"$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}${KERNEL_FIT_LINK_NAME}${KERNEL_FIT_BIN_EXT}"
fi
fi
fi
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191082): 
https://lists.openembedded.org/g/openembedded-core/message/191082
Mute This Topic: https://lists.openembedded.org/mt/102747723/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 03/21] image, kernel: allow to disable creating the hardlinks by setting *LINK_NAME variables to empty

2023-11-22 Thread Martin Jansa
From: Martin Jansa 

* they can be disabled individually by setting *_LINK_NAME
  to empty or disable them all by setting IMAGE_VERSION_SUFFIX
  to empty (making them equal to *_NAME variables)

There are couple *_LINK_NAME variables:

IMAGE_LINK_NAME = ""
KERNEL_IMAGE_LINK_NAME = ""
KERNEL_DTB_LINK_NAME = ""
KERNEL_FIT_LINK_NAME = ""
MODULE_TARBALL_LINK_NAME = ""
INITRAMFS_LINK_NAME = ""

or

IMAGE_MACHINE_SUFFIX = ""
IMAGE_NAME_SUFFIX = ""
IMAGE_VERSION_SUFFIX = ""

to have really the minimal filenames:

$ ls tmp/deploy/images/qemux86-64/
bzImage  core-image-minimal.manifest   
core-image-minimal.tar.bz2
bzImage-qemux86-64.bin   core-image-minimal.qemuboot.conf  
core-image-minimal.testdata.json
core-image-minimal.ext4  core-image-minimal.spdx.tar.zst   
modules-qemux86-64.tgz

and to remove MACHINE name from kernel artifacts as well
(if you prefer the MACHINE name in directory only), you can set:
KERNEL_ARTIFACT_NAME = ""

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 meta/classes-recipe/image.bbclass |  3 +-
 meta/classes-recipe/kernel-devicetree.bbclass | 32 +
 meta/classes-recipe/kernel-fitimage.bbclass   | 17 -
 meta/classes-recipe/kernel.bbclass| 36 ---
 4 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/meta/classes-recipe/image.bbclass 
b/meta/classes-recipe/image.bbclass
index 2dd004d312..48dc70b8fc 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -595,7 +595,8 @@ python create_symlinks() {
 taskname = d.getVar("BB_CURRENTTASK")
 subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or 
"").split()
 
-if not link_name:
+if not link_name or link_name == img_name:
+bb.note("Not creating versioned hardlinks, because IMAGE_LINK_NAME is 
empty or identical to IMAGE_NAME")
 return
 for type in subimages:
 dst = os.path.join(deploy_dir, link_name + "." + type)
diff --git a/meta/classes-recipe/kernel-devicetree.bbclass 
b/meta/classes-recipe/kernel-devicetree.bbclass
index cbfaa5c183..1fde90f023 100644
--- a/meta/classes-recipe/kernel-devicetree.bbclass
+++ b/meta/classes-recipe/kernel-devicetree.bbclass
@@ -127,22 +127,24 @@ kernel_do_deploy:append() {
done
 }
 kernel_do_deploy_links:append() {
-   for dtbf in ${KERNEL_DEVICETREE}; do
-   dtb=`normalize_dtb "$dtbf"`
-   dtb_ext=${dtb##*.}
-   dtb_base_name=`basename $dtb .$dtb_ext`
-   if [ -n "${KERNEL_DTB_LINK_NAME}" ] ; then
+   if [ -z "${KERNEL_DTB_LINK_NAME}" -o "${KERNEL_DTB_LINK_NAME}" = 
"${KERNEL_DTB_NAME}" ] ; then
+   bbnote "Not creating versioned hardlinks, because 
KERNEL_DTB_LINK_NAME is empty or identical to KERNEL_DTB_NAME"
+   else
+   for dtbf in ${KERNEL_DEVICETREE}; do
+   dtb=`normalize_dtb "$dtbf"`
+   dtb_ext=${dtb##*.}
+   dtb_base_name=`basename $dtb .$dtb_ext`
ln -vf $deployDir/$dtb_base_name.$dtb_ext 
$deployDir/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext
-   fi
-   for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
-   if [ "$type" = "zImage" ] && [ 
"${KERNEL_DEVICETREE_BUNDLE}" = "1" ] && [ -n "${KERNEL_DTB_LINK_NAME}" ]; then
-   ln -vf 
$deployDir/$type-$dtb_base_name.$dtb_ext${KERNEL_DTB_BIN_EXT} \
-   
$deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
-   if [ -e 
"${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
-   ln -vf 
$deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name.$dtb_ext${KERNEL_DTB_BIN_EXT}
 \
-   
$deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
+   for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
+   if [ "$type" = "zImage" ] && [ 
"${KERNEL_DEVICETREE_BUNDLE}" = "1" ] ; then
+   ln -vf 
$deployDir/$type-$dtb_base_name.$dtb_ext${KERNEL_DTB_BIN_EXT} \
+   
$deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
+   if [ -e 
"${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
+   ln -vf 
$deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name.$dtb_ext${KERNEL_DTB_BIN_EXT}
 \
+   
$deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
+   fi
fi
-   fi
+   done
done
-   done
+   fi
 }

[OE-core] [PATCH 00/21] Consistent naming scheme for deployed artifacts

2023-11-22 Thread Martin Jansa
This is the final part of changes for [YOCTO #12937].

I've run complete selftest with this and didn't see any failures.

Only these 4 fail once, but pass when re-executed (and the same is
reproducible here with master):
pkgdata.OePkgdataUtilTests.test_lookup_recipe
spdx.SPDXCheck.test_spdx_base_files
esdk.oeSDKExtSelfTest.test_image_generation_binary_feeds
esdk.oeSDKExtSelfTest.test_install_libraries_headers

runtime_test.TestImage.test_testimage_virgl_gtk_sdl and this one
needs extra "xhost +local" otherwise fails with:
  runqemu - ERROR - Failed to run qemu: Invalid MIT-MAGIC-COOKIE-1 key
  qemu-system-x86_64: OpenGL is not supported by the display

The short description of these changes is that instead of symlinks
it creates hardlinks in deploy dir and the kernel do_deploy creates
the artifacts without version suffix and the do_deploy_links task
adds those versioned hardlinks (this way do_deploy can be reused from
sstate and only quick do_deploy_links is re-executed when the
IMAGE_VERSION_SUFFIX changes - before that if you cannot re-use do_deploy
from sstate due to different artifact filenames you had to re-run e.g.
do_compile as well if you haven't built the same in the same TMPDIR
before).

Here are some examples how the artifacts change with these changes.
To shows more artifacts all 3 builds are executed with this in local.conf:

IMAGE_FSTYPES:append:pn-core-image-base = " ubi"
MKUBIFS_ARGS = "-m 2048 -e 129024 -c 968 -x zlib"
UBINIZE_ARGS = "-m 2048 -p 131072 -s 512"

IMAGE_GEN_DEBUGFS = "1"
IMAGE_FSTYPES_DEBUGFS = "tar.bz2"

## RAM disk variables including load address and entrypoint for kernel and RAM 
disk
IMAGE_FSTYPES += "cpio.gz"
INITRAMFS_IMAGE = "core-image-minimal"
## core-image-minimal is used as initramfs here, drop the rootfs suffix
IMAGE_NAME_SUFFIX:pn-core-image-minimal = "" 

MACHINE = "qemuarm"
UBOOT_MACHINE = "am57xx_evm_defconfig"
SPL_BINARY = "MLO"

# Enable creation of the U-Boot fitImage
UBOOT_FITIMAGE_ENABLE = "1"

# (U-boot) fitImage properties
UBOOT_LOADADDRESS = "0x8008"
UBOOT_ENTRYPOINT = "0x8008"
UBOOT_FIT_DESC = "A model description"

# Enable creation of Kernel fitImage
KERNEL_IMAGETYPES += " fitImage "
KERNEL_CLASSES = " kernel-fitimage"
UBOOT_SIGN_ENABLE = "1"
FIT_GENERATE_KEYS = "1"
UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys"
UBOOT_SIGN_IMG_KEYNAME = "img-oe-selftest"
UBOOT_SIGN_KEYNAME = "cfg-oe-selftest"
FIT_SIGN_INDIVIDUAL = "1"

And in all 4 cases I'm building:
bitbake -k core-image-base virtual/bootloader

1) current state without these changes (poky master 
4d6c63a56c50536806b21cbe72416d8f1b84f589):
$ ls -lai tmp/deploy/images/qemuarm/
total 953640
50382661 drwxr-xr-x 2 martin martin  4096 Nov 21 21:09 .
50343736 drwxr-xr-x 3 martin martin  4096 Nov 21 18:38 ..
55399695 lrwxrwxrwx 2 martin martin22 Nov 21 21:06 MLO -> 
MLO-qemuarm-2023.10-r0
55399694 lrwxrwxrwx 2 martin martin22 Nov 21 21:06 MLO-qemuarm -> 
MLO-qemuarm-2023.10-r0
55399696 -rw-r--r-- 2 martin martin127376 Nov 21 21:06 
MLO-qemuarm-2023.10-r0
56663681 -rw-r--r-- 2 martin martin  27929206 Nov 21 21:09 
core-image-base-qemuarm.rootfs-20231121200800.cpio.gz
56663745 -rw-r--r-- 2 martin martin  68956160 Nov 21 21:09 
core-image-base-qemuarm.rootfs-20231121200800.ext4
56653281 -rw-r--r-- 2 martin martin  3902 Nov 21 21:08 
core-image-base-qemuarm.rootfs-20231121200800.manifest
56653982 -rw-r--r-- 2 martin martin  1855 Nov 21 21:08 
core-image-base-qemuarm.rootfs-20231121200800.qemuboot.conf
56653221 -rw-r--r-- 2 martin martin412044 Nov 21 21:08 
core-image-base-qemuarm.rootfs-20231121200800.spdx.tar.zst
56664021 -rw-r--r-- 2 martin martin  27268823 Nov 21 21:09 
core-image-base-qemuarm.rootfs-20231121200800.tar.bz2
56653314 -rw-r--r-- 2 martin martin263900 Nov 21 21:08 
core-image-base-qemuarm.rootfs-20231121200800.testdata.json
56663665 -rw-r--r-- 2 martin martin  34209792 Nov 21 21:09 
core-image-base-qemuarm.rootfs-20231121200800.ubi
56653782 -rw-r--r-- 2 martin martin  33417216 Nov 21 21:09 
core-image-base-qemuarm.rootfs-20231121200800.ubifs
56664023 -rw-r--r-- 2 martin martin 381871540 Nov 21 21:09 
core-image-base-qemuarm.rootfs-dbg-20231121200800-dbg.tar.bz2
56653980 lrwxrwxrwx 2 martin martin61 Nov 21 21:09 
core-image-base-qemuarm.rootfs-dbg.tar.bz2 -> 
core-image-base-qemuarm.rootfs-dbg-20231121200800-dbg.tar.bz2
56663713 lrwxrwxrwx 2 martin martin53 Nov 21 21:09 
core-image-base-qemuarm.rootfs.cpio.gz -> 
core-image-base-qemuarm.rootfs-20231121200800.cpio.gz
56663729 lrwxrwxrwx 2 martin martin50 Nov 21 21:09 
core-image-base-qemuarm.rootfs.ext4 -> 
core-image-base-qemuarm.rootfs-20231121200800.ext4
56653265 lrwxrwxrwx 2 martin martin54 Nov 21 21:08 
core-image-base-qemuarm.rootfs.manifest -> 
core-image-base-qemuarm.rootfs-20231121200800.manifest
56653981 lrwxrwxrwx 2 martin martin59 Nov 21 21:08 
core-image-base-qemuarm.rootfs.qemuboot.conf -> 
core-image-base-qemuarm.rootfs-20231121200800.qemub

[OE-core] [PATCH 01/21] image*.bbclass, kernel*.bbclass: create version-less artifacts and versioned hard links

2023-11-22 Thread Martin Jansa
From: Martin Jansa 

* instead of versioned artifacts and version-less symlinks

* We used to create the actual artifact files with some version
  in the filename and then created symlink without any version
  which was updated to point to the latest one created.
  In some scenarios it's useful to create all artifacts - typically
  rootfs and kernel images with the same version - like release
  build even when the kernel itself wasn't modified since the
  previous release.

  If we include the release version in the regular _NAME variables
  then we'll need to re-run do_deploy and do_image which will cause
  kernel to be rebuilt and image to be re-created even when the
  only change since last build was the version number.

  With this change we can re-use kernel and image from sstate when
  nothing was changed and run only very fast do_deploy_links task
  which just adds another hard link to existing artifact from
  sstate.

* This is already used by various LGE builds as do_webos_deploy_fixup()
  
https://github.com/webosose/meta-webosose/blob/master/meta-webos/classes/webos_deploy.bbclass
  but injecting this task in all the right places is difficult
  and sometimes requires whole bbclass to be duplicated. Having
  simpler way of versioning artifacts directly in oe-core might
  be useful for others.

* move IMAGE_VERSION_SUFFIX from _NAME variables to _LINK_NAME
  that way e.g. kernel.do_deploy can be reused from sstate to
  provide "version-less" artifacts and then very fast
  do_deploy_links task just adds links with consistent suffixes
  (by default the version from the recipe but could be easily set
  to e.g. some release name when building some products).
* create hard links instead of symlinks, so that whatever version
  the filename says is really there
* some IMAGE_FSTYPES might need the "version-less" IMAGE_NAME file
  to be removed first or they might either append or update the
  content of the image instead of creating new image file from
  scratch - I have seen this only with one proprietary format we
  generate with our own tool, so hopefully this isn't very common
* this is basically the mechanism are using in webOS with
  WEBOS_IMAGE_NAME_SUFFIX which is for official builds set from
  jenkins job and then all artifacts (images as well as corresponding
  kernel files) have the same version string)

* without this, you can still easily set the variables to contain
  the version from jenkins job (excluded from sstate signature like
  DATETIME currently is to prevent rebuilding it everytime even when
  the content didn't change) but then when kernel is reused from sstate
  you can have version 1.0 used on kernel artifacts and 2.0 on image
  artifacts.

* if you don't exclude the version string with vardepsexclude, then
  you get the right version in the filenames but for cost of
  re-executing do_deploy every single time, which with rm_work will
  cause all kernel tasks to be re-executed (together with everything
  which depends on it like external modules etc).

* the implementation "from outside" is a bit tricky as shown in webOS
  OSE, because first you need to reverse the meaning of IMAGE_NAME
  and IMAGE_LINK_NAME like here, but also replace all symlinks with
  hardlinks and then adjust all recipes/bbclasses to depend on our
  do_deploy_fixup task instead of the original do_deploy
  see the variable modifications:
  
https://github.com/webosose/meta-webosose/blob/a35e81622aae1066591e44a132d01297ff478248/meta-webos/conf/distro/include/webos.inc#L65
  and then various bbclasses to hook do_webos_deploy_fixup task creating
  the hardlinks for possible artifacts:
  
https://github.com/webosose/meta-webosose/blob/a35e81622aae1066591e44a132d01297ff478248/meta-webos/classes/webos_deploy.bbclass
  
https://github.com/webosose/meta-webosose/blob/a35e81622aae1066591e44a132d01297ff478248/meta-webos/classes/kernel.bbclass
  
https://github.com/webosose/meta-webosose/blob/a35e81622aae1066591e44a132d01297ff478248/meta-webos/classes/image.bbclass
  so hopefully with all these changes in oe-core other project can
  achieve the same just by setting one variable IMAGE_VERSION_SUFFIX

* drop ${PKGE}-${PKGV}-${PR} from kernel artifacts names (this is the
  latest build) and add it only in hardlinks created in do_deploy_links
  so that we can use PKGR there again (because these links are generally
  used only by human operators and they don't have their own TASKHASH or
  the IMAGE_VERSION_SUFFIX might be set to some release name which they
  do understand

* this allows to drop package_get_auto_pr from kernel do_deploy as well,
  leaving only 2 EXTENDPRAUTO bumps for each kernel build (do_package
  and do_deploy_links, unfortunatelly these will still have different
  value, so if you're looking for the exact kernel image in deploy
  directory based on kernel image package version seen on the device the
  EXTENDPRAUTO part of PR will be different).

[YOCTO #12937]

Signed-off-by: Martin Jansa 
---
 .../image-

Re: [OE-core] [PATCH v8 3/8] image-combined-dbg: make this the default

2023-11-22 Thread Adrian Freihofer
On Wed, 2023-11-22 at 13:25 +0100, Alexander Kanavin wrote:
> On Wed, 22 Nov 2023 at 13:23, Adrian Freihofer
>  wrote:
> 
> > But I also have to say that recent documentation points out that
> > the
> > rootfs.tar must be extracted into the extracted rootfs-dbg which is
> > a
> > working solution. The issue which I have is with the SDK which
> > tries to
> > avoid building the tars and extracting them again just for
> > providing
> > the debug symbols on the host. This use case is probably new.
> 
> Sorry for barging in without fully understanding the issue, but I've
> added debuginfod support to yocto precisely to avoid having to deal
> with large, awkward, slow debug filesystems. It's a lot leaner and
> slimmer approach.
> 
Thank you Alex. Looking at that is already on my todo list. I think is
is a very interesting approach.
But I hesitated a bit because creating some files seems to be easier
than starting and stopping a daemon behind an IDE. And the fact that
debuginfod is available probably doesn't mean that rootfs-dbg is no
longer supported. So let's just get started and then improve.

Adrian



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191076): 
https://lists.openembedded.org/g/openembedded-core/message/191076
Mute This Topic: https://lists.openembedded.org/mt/102316026/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 v8 3/8] image-combined-dbg: make this the default

2023-11-22 Thread Alexander Kanavin
On Wed, 22 Nov 2023 at 13:23, Adrian Freihofer
 wrote:

> But I also have to say that recent documentation points out that the
> rootfs.tar must be extracted into the extracted rootfs-dbg which is a
> working solution. The issue which I have is with the SDK which tries to
> avoid building the tars and extracting them again just for providing
> the debug symbols on the host. This use case is probably new.

Sorry for barging in without fully understanding the issue, but I've
added debuginfod support to yocto precisely to avoid having to deal
with large, awkward, slow debug filesystems. It's a lot leaner and
slimmer approach.

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191075): 
https://lists.openembedded.org/g/openembedded-core/message/191075
Mute This Topic: https://lists.openembedded.org/mt/102316026/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 v8 3/8] image-combined-dbg: make this the default

2023-11-22 Thread Adrian Freihofer
On Mon, 2023-11-20 at 22:53 +, Peter Kjellerstedt wrote:
> > -Original Message-
> > From: openembedded-core@lists.openembedded.org  > c...@lists.openembedded.org> On Behalf Of Adrian Freihofer
> > Sent: den 15 november 2023 23:33
> > To: Christopher Larson 
> > Cc: openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH v8 3/8] image-combined-dbg: make this
> > the
> > default
> > 
> > On Wed, 2023-11-15 at 09:26 -0700, Christopher Larson wrote:
> > > 
> > > Can you explain your issues with gdb with using a rootfs-dbg,
> > > because
> > > I don’t see any problem with a filesystem that only contains
> > > debug
> > > symbols, given how easily gdb can be configured to look into
> > > alternate paths. I’ll admit I also don’t know the difference
> > > between
> > > these modes, and also wonder how IMAGE_GEN_DEBUGFS relates.
> > > 
> > > 
> > It simply does not find the symbols if only the rootfs-dbg is
> > available. If this class
> > https://git.yoctoproject.org/poky/tree/meta/classes-recipe/image-combined-dbg.bbclass
> > is added to the build it just works.
> > 
> > Since this is not too obvious, I wondered if it wouldn't be better
> > if
> > the combined debugfs were the default behavior. Then Ross asked the
> > same question and I developed a patch to simplify this.
> > 
> > But either way, there are too many unanswered questions to change a
> > well-established default behavior. And there are other ways to deal
> > with it.
> > Thank you for pointing this out.
> 
> For what it's worth, we have local changes that more or less do this 
> (predating image-combined-dbg.bbclass), as we have only seen a use 
> case for the combined debugfs tar ball. So I was rather hoping this 
> would be accepted, so that we can drop our local changes...
> 
> //Peter
> 

In theory, I completely agree with Christopher. That seems to be the
right way to go. But I have tested this again. I am not able to
configure GDB to find the sources with a split rootf + rootfs-dbg. I
tried adding rootfs and rootfs-dbg in different order and with
different paths to the solib search path. Stepping into libraries
contained in rootfs/rootfs-dbg does not work. Maybe I did something
wrong or we could consider this a bug in GDB. But with a combined
rootfs-dbg this works in all the different variants I have tried.

One approach to handle this is to improve GDB's solib search function
to support a shared rootfs dbg. But it's not only about GDB. There are
other tools which most probably have similar issues. 

>From a usability point of view, I would at least like to have an easy
and obvious way to configure a combined rootfs-dbg for an image. It
took me an infinite amount of time to figure out why GDB doesn't work
and that there is an image-combined-dbg.bbclass supposed to fix that. 
Defaulting to a not combined rootfs-dbg and providing code in a hidden
bbclass is misleading.

What could also help a bit is to make the code of the image-combined-
dbg.bbclass more prominent and more official e.g. by moving it into the
image.bbclass and support to enable it via variable which can be
documented and referred in various sections of the documentation but
also in the local.conf.template. The documentation should then point
out that e.g. stepping with GDB does not work until the binaries are
available from the same rootfs folder as the debug symbols are. Such a
patch would be a minor refactoring only. @Peter: Would this help for
your use case?

This would also allow the default to be changed some when in the
future. The question of who needs a shared dbg rootfs for which use
case, as opposed to those who struggle with simple remote debugging
because of this default behavior, still seems valid to me.

But I also have to say that recent documentation points out that the
rootfs.tar must be extracted into the extracted rootfs-dbg which is a
working solution. The issue which I have is with the SDK which tries to
avoid building the tars and extracting them again just for providing
the debug symbols on the host. This use case is probably new.

Best regards,
Adrian



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191074): 
https://lists.openembedded.org/g/openembedded-core/message/191074
Mute This Topic: https://lists.openembedded.org/mt/102316026/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 v4] wic: rawcopy: add support for zstd decompression

2023-11-22 Thread Lukas Funke
From: Malte Schmidt 

Add support for zstd decompression in rawcopy plugin. zstd claims
to reach higher, uniform decompression rates.

Signed-off-by: Malte Schmidt 
Signed-off-by: Lukas Funke 
---
 scripts/lib/wic/plugins/source/rawcopy.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/source/rawcopy.py 
b/scripts/lib/wic/plugins/source/rawcopy.py
index ccf332554e..21903c2f23 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -58,7 +58,8 @@ class RawCopyPlugin(SourcePlugin):
 decompressor = {
 ".bz2": "bzip2",
 ".gz": "gzip",
-".xz": "xz"
+".xz": "xz",
+".zst": "zstd -f",
 }.get(extension)
 if not decompressor:
 raise WicError("Not supported compressor filename extension: %s" % 
extension)
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191073): 
https://lists.openembedded.org/g/openembedded-core/message/191073
Mute This Topic: https://lists.openembedded.org/mt/102747437/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] poky: kirkstone: eSDK: fix build-in eSDK environment file generation

2023-11-22 Thread Alexander Kanavin
On Wed, 22 Nov 2023 at 13:10, Alberto Merciai  wrote:
> > Alberto, can you check that this works as expected on master or any
> > more recent release where my commit is present, and the file is set
> > correctly?
> Let me understand if we are both at the same page.
> That feture will be not integrate in kirkstone, right?
> Are you askin me to try that on a more recent version different from
> kirkstone?

That's right. If you have to stay on kirkstone, then you have to
maintain a private backport.

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191072): 
https://lists.openembedded.org/g/openembedded-core/message/191072
Mute This Topic: https://lists.openembedded.org/mt/102745821/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] poky: kirkstone: eSDK: fix build-in eSDK environment file generation

2023-11-22 Thread Alberto Merciai
On Wed, Nov 22, 2023 at 10:30:49AM +0100, Alexander Kanavin wrote:

> Alberto, can you check that this works as expected on master or any
> more recent release where my commit is present, and the file is set
> correctly?
>
> Alex

Hi Alex,

Let me understand if we are both at the same page.
That feture will be not integrate in kirkstone, right?
Are you askin me to try that on a more recent version different from
kirkstone?

Thanks,
Alberto

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



[OE-core][mickledore][PATCH] avahi: backport Debian patches to fix multiple CVE's

2023-11-22 Thread Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri 

import patches from ubuntu to fix
 CVE-2023-1981
 CVE-2023-38469
 CVE-2023-38470
 CVE-2023-38471
 CVE-2023-38472
 CVE-2023-38473

Upstream-Status: Backport [import from ubuntu 
https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches?h=ubuntu/jammy-security
Upstream commit
https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f
&
https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
&
https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
&
https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
&
https://github.com/lathiat/avahi/commit/20dec84b2480821704258bc908e7b2bd2e883b24
&
https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
&
https://github.com/lathiat/avahi/commit/b675f70739f404342f7f78635d6e2dcd85a13460
&
https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
&
https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797]

Signed-off-by: Vijay Anusuri 
---
 meta/recipes-connectivity/avahi/avahi_0.8.bb  |   9 ++
 .../avahi/files/CVE-2023-1981.patch   |  58 ++
 .../avahi/files/CVE-2023-38469-1.patch|  48 
 .../avahi/files/CVE-2023-38469-2.patch|  65 +++
 .../avahi/files/CVE-2023-38470-1.patch|  57 +
 .../avahi/files/CVE-2023-38470-2.patch|  52 +
 .../avahi/files/CVE-2023-38471-1.patch|  73 
 .../avahi/files/CVE-2023-38471-2.patch|  52 +
 .../avahi/files/CVE-2023-38472.patch  |  45 
 .../avahi/files/CVE-2023-38473.patch  | 109 ++
 10 files changed, 568 insertions(+)
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-1981.patch
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38469-1.patch
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38469-2.patch
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38470-1.patch
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38470-2.patch
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38471-1.patch
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38471-2.patch
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2023-38473.patch

diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb 
b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index 3fb082cf3f..418b0c8ccf 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -27,6 +27,15 @@ SRC_URI = 
"${GITHUB_BASE_URI}/download/v${PV}/avahi-${PV}.tar.gz \
file://handle-hup.patch \
file://local-ping.patch \
file://invalid-service.patch \
+   file://CVE-2023-1981.patch \
+   file://CVE-2023-38469-1.patch \
+   file://CVE-2023-38469-2.patch \
+   file://CVE-2023-38470-1.patch \
+   file://CVE-2023-38470-2.patch \
+   file://CVE-2023-38471-1.patch \
+   file://CVE-2023-38471-2.patch \
+   file://CVE-2023-38472.patch \
+   file://CVE-2023-38473.patch \
"
 
 GITHUB_BASE_URI = "https://github.com/lathiat/avahi/releases/";
diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-1981.patch 
b/meta/recipes-connectivity/avahi/files/CVE-2023-1981.patch
new file mode 100644
index 00..4d7924d13a
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/CVE-2023-1981.patch
@@ -0,0 +1,58 @@
+From a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= 
+Date: Thu, 17 Nov 2022 01:51:53 +0100
+Subject: [PATCH] Emit error if requested service is not found
+
+It currently just crashes instead of replying with error. Check return
+value and emit error instead of passing NULL pointer to reply.
+
+Fixes #375
+
+Upstream-Status: Backport [import from ubuntu 
https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-1981.patch?h=ubuntu/jammy-security
+Upstream commit 
https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f]
+CVE: CVE-2023-1981
+Signed-off-by: Vijay Anusuri 
+---
+ avahi-daemon/dbus-protocol.c | 20 ++--
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
+index 70d7687bc..406d0b441 100644
+--- a/avahi-daemon/dbus-protocol.c
 b/avahi-daemon/dbus-protocol.c
+@@ -375,10 +375,14 @@ static DBusHandlerResult 
dbus_get_alternative_host_name(DBusConnection *c, DBusM
+ }
+ 
+ t = avahi_alternative_host_name(n);
+-avahi_dbus_respond_string(c, m, t);
+-avahi_free(t);
++if (t) {
++avahi_dbus_respond_string(c, m, t);
++avahi_free(t);
+ 
+-return DBUS_HANDLER_RESUL

[oe-core][kirkstone][PATCH 1/1] gstreamer1.0-plugins-bad: fix CVE-2023-44429

2023-11-22 Thread Polampalli, Archana via lists.openembedded.org
From: Archana Polampalli 

AV1 codec parser buffer overflow

Signed-off-by: Archana Polampalli 
---
 .../CVE-2023-44429.patch  | 38 +++
 .../gstreamer1.0-plugins-bad_1.20.7.bb|  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/CVE-2023-44429.patch

diff --git 
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/CVE-2023-44429.patch
 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/CVE-2023-44429.patch
new file mode 100644
index 00..5070d6b865
--- /dev/null
+++ 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/CVE-2023-44429.patch
@@ -0,0 +1,38 @@
+From 1db83d3f745332cbda6adf954b2c53a10caa205e Mon Sep 17 00:00:00 2001
+From: Benjamin Gaignard 
+Date: Wed, 4 Oct 2023 11:14:38 +0200
+Subject: [PATCH] codecparsers: av1: Clip max tile rows and cols values
+
+Clip tile rows and cols to 64 as describe in AV1 specification.
+
+Fixes ZDI-CAN-6 / CVE-2023-44429
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3015
+
+Part-of: 

+
+CVE: CVE-2023-44429
+
+Upstream-Status: Backport
+[https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/1db83d3f745332cbda6adf954b2c53a10caa205e]
+
+Signed-off-by: Archana Polampalli 
+---
+ gst-libs/gst/codecparsers/gstav1parser.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gst-libs/gst/codecparsers/gstav1parser.c 
b/gst-libs/gst/codecparsers/gstav1parser.c
+index 7b9378c..68f8a76 100644
+--- a/gst-libs/gst/codecparsers/gstav1parser.c
 b/gst-libs/gst/codecparsers/gstav1parser.c
+@@ -2219,6 +2219,8 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, 
GstBitReader * br,
+   ((parser->state.mi_cols + 31) >> 5) : ((parser->state.mi_cols + 15) >> 
4);
+   sb_rows = seq_header->use_128x128_superblock ? ((parser->state.mi_rows +
+   31) >> 5) : ((parser->state.mi_rows + 15) >> 4);
++  sb_cols = MIN (GST_AV1_MAX_TILE_COLS, sb_cols);
++  sb_rows = MIN (GST_AV1_MAX_TILE_ROWS, sb_rows);
+   sb_shift = seq_header->use_128x128_superblock ? 5 : 4;
+   sb_size = sb_shift + 2;
+   max_tile_width_sb = GST_AV1_MAX_TILE_WIDTH >> sb_size;
+--
+2.40.0
diff --git 
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.7.bb 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.7.bb
index fbaabda3f9..504cfce1fd 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.7.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.7.bb
@@ -13,6 +13,7 @@ SRC_URI = 
"https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
file://CVE-2023-40474.patch \
file://CVE-2023-40475.patch \
file://CVE-2023-40476.patch \
+   file://CVE-2023-44429.patch \
"
 SRC_URI[sha256sum] = 
"87251beebfd1325e5118cc67774061f6e8971761ca65a9e5957919610080d195"
 
-- 
2.40.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191069): 
https://lists.openembedded.org/g/openembedded-core/message/191069
Mute This Topic: https://lists.openembedded.org/mt/102747135/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] cmake.bbclass: optionally support qemu

2023-11-22 Thread Jose Quaresma
Alexander Kanavin  escreveu no dia terça,
21/11/2023 à(s) 11:21:

> On Tue, 21 Nov 2023 at 12:12, Jose Quaresma 
> wrote:
> >> I was using it for running Unit Tests on the host before I deployed
> >> them to the target device as ptest. This worked well. It is well
> >> integrated with cmake and therefore also with IDEs. So I thought that
> >> there are certain use cases where it would be nice to have it opt-in.
> >>
> >> meson offers qemu-user as well (because of gobject). So if qemu-user is
> >> not usable there will be other challenges as well.
> >>
> >> There is also a MACHINE_FEATURE which allows to support it for ARCHs
> >> where it works well but not for ARCHs where qemu-user is known to be
> >> broken.
> >>
> >> I think it would be a nice optional feature.
> >
> >
> > I agree without any doubt on that part.
> >
> > But I believe this doesn't work for applications that are using the fork
> system call.
> > So consider this will also break any ptest using fork, giving the wrong
> impression the test is failing.
>
> I think this needs to be double checked. I find it odd that qemu
> usermode would fail on such a basic thing, and it would not show up
> anywhere in places where it's used in core (not just g-i - all the
> various postinst utilities for generating indexes etc.).
>
> Alex
>

There is no recent information on the internet about the fork issue on qemu
user mode
so this may no longer be a problem.
I can back again, not now, testing some of the oe-core packages who uses
the meson build
system to get some results about failing/passing. The approach is the same
used in this patchset.

It will be good also to have some numbers and example recipes in oe-core
where we can use this patchset.
In conclusion, this is really a great future imo and improves a lot the
integrations of new tests in the ptest infrastructure.

Jose

-- 
Best regards,

José Quaresma

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191068): 
https://lists.openembedded.org/g/openembedded-core/message/191068
Mute This Topic: https://lists.openembedded.org/mt/102708283/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] joe editor broken with current ncurses

2023-11-22 Thread Alexander Kanavin
I think you can use
https://docs.yoctoproject.org/brief-yoctoprojectqs/index.html even.

Alex

On Wed, 22 Nov 2023 at 11:58, Tobias Jakobi
 wrote:
>
> Any pointers on how to setup such machine? Quick goggling gives me 
> https://docs.yoctoproject.org/dev-manual/qemu.html, but would this be 
> satisfactory for the test?
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191067): 
https://lists.openembedded.org/g/openembedded-core/message/191067
Mute This Topic: https://lists.openembedded.org/mt/102726054/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 6/6] lib/oe/recipeutils.py: remove trailing white-spaces

2023-11-22 Thread Julien Stephan
Remove useless trailing white-spaces

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

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 58776f4a9a7..25b159bc1bc 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -1042,7 +1042,7 @@ def get_recipe_upstream_version(rd):
 revision = ud.method.latest_revision(ud, rd, 'default')
 upversion = pv
 if revision != rd.getVar("SRCREV"):
-upversion = upversion + "-new-commits-available" 
+upversion = upversion + "-new-commits-available"
 else:
 pupver = ud.method.latest_versionstring(ud, rd)
 (upversion, revision) = pupver
-- 
2.42.0


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



[OE-core] [PATCH 5/6] oeqa/selftest/devtool: add test for git submodules

2023-11-22 Thread Julien Stephan
Add a test for gitsm recipes.
This tests that we can do changes on submodules, commit them and
properly extract the patches

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

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index ab58971fec7..2a11886e4b5 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1598,6 +1598,53 @@ class DevtoolUpdateTests(DevtoolBase):
 # Try building
 bitbake('%s -c patch' % testrecipe)
 
+def test_devtool_git_submodules(self):
+# This tests if we can add a patch in a git submodule and extract it 
properly using devtool finish
+# Check preconditions
+self.assertTrue(not os.path.exists(self.workspacedir), 'This test 
cannot be run with a workspace directory under the build directory')
+self.track_for_cleanup(self.workspacedir)
+recipe = 'vulkan-samples'
+src_uri = get_bb_var('SRC_URI', recipe)
+self.assertIn('gitsm://', src_uri, 'This test expects the %s recipe to 
be a git recipe with submodules' % recipe)
+oldrecipefile = get_bb_var('FILE', recipe)
+recipedir = os.path.dirname(oldrecipefile)
+result = runCmd('git status --porcelain .', cwd=recipedir)
+if result.output.strip():
+self.fail('Recipe directory for %s contains uncommitted changes' % 
recipe)
+self.assertIn('/meta/', recipedir)
+tempdir = tempfile.mkdtemp(prefix='devtoolqa')
+self.track_for_cleanup(tempdir)
+self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
+result = runCmd('devtool modify %s %s' % (recipe, tempdir))
+self.assertExists(os.path.join(tempdir, 'CMakeLists.txt'), 'Extracted 
source could not be found')
+# Test devtool status
+result = runCmd('devtool status')
+self.assertIn(recipe, result.output)
+self.assertIn(tempdir, result.output)
+# Modify a source file in a submodule, (grab the first one)
+result = runCmd('git submodule --quiet foreach \'echo $sm_path\'', 
cwd=tempdir)
+submodule = result.output.splitlines()[0]
+submodule_path = os.path.join(tempdir, submodule)
+runCmd('echo "#This is a first comment" >> testfile', 
cwd=submodule_path)
+result = runCmd('git status --porcelain . ', cwd=submodule_path)
+self.assertIn("testfile", result.output)
+runCmd('git add testfile; git commit -m "Adding a new file"', 
cwd=submodule_path)
+
+# Try finish to the original layer
+self.add_command_to_tearDown('rm -rf %s ; cd %s ; git checkout %s' % 
(recipedir, os.path.dirname(recipedir), recipedir))
+runCmd('devtool finish -f %s meta' % recipe)
+result = runCmd('devtool status')
+self.assertNotIn(recipe, result.output, 'Recipe should have been reset 
by finish but wasn\'t')
+self.assertNotExists(os.path.join(self.workspacedir, 'recipes', 
recipe), 'Recipe directory should not exist after finish')
+expected_status = [(' M', '.*/%s$' % os.path.basename(oldrecipefile)),
+   ('??', '.*/.*-Adding-a-new-file.patch$')]
+self._check_repo_status(recipedir, expected_status)
+# Make sure the patch is added to the recipe with the correct 
"patchdir" option
+result = runCmd('git diff .', cwd=recipedir)
+addlines = [
+   'file://0001-Adding-a-new-file.patch;patchdir=%s ' % submodule
+]
+self._check_diff(result.output, addlines, [])
 
 class DevtoolExtractTests(DevtoolBase):
 
-- 
2.42.0


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



[OE-core] [PATCH 4/6] devtool: add support for git submodules

2023-11-22 Thread Julien Stephan
Adding the support of submodules required a lot of changes on the
internal data structures:
* initial_rev/startcommit used as a starting point for looking at new
  / updated commits was replaced by a dictionary where the keys are the
  submodule name ("." for main repo) and the values are the
  initial_rev/startcommit

* the extractPatches function now extracts patch for the main repo and
  for all submodules and stores them in a hierarchical way describing the
submodule path

* store initial_rev/commit also for all submodules inside the recipe
  bbappend file

* _export_patches now returns dictionaries that contains the 'patchdir'
  parameter (if any). This parameter is used to add the correct
  'patchdir=' parameter on the recipe

Also, recipe can extract a secondary git tree inside the workdir.

By default, at the end of the do_patch function, there is a hook in
devtool that commits everything that was modified to have a clean
repository. It uses the command: "git add .; git commit ..."

The issue here is that, it adds the secondary git tree as a submodule
but in a wrong way. Doing "git add " declares a submodule but do
not adds a url associated to it, and all following "git submodule foreach"
commands will fail.

So detect that a git tree was extracted inside S and correctly add it
using "git submodule add  ", so that it will be considered as a
regular git submodule

Signed-off-by: Julien Stephan 
---
 meta/lib/oe/patch.py |  64 
 meta/lib/oe/recipeutils.py   |  27 ++--
 scripts/lib/devtool/__init__.py  |  21 +++
 scripts/lib/devtool/standard.py  | 269 +++
 scripts/lib/devtool/upgrade.py   |  51 +++---
 scripts/lib/recipetool/append.py |   4 +-
 6 files changed, 270 insertions(+), 166 deletions(-)

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index ff9afc9df9f..36157c72478 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -461,41 +461,43 @@ class GitApplyTree(PatchTree):
 return (tmpfile, cmd)
 
 @staticmethod
-def extractPatches(tree, startcommit, outdir, paths=None):
+def extractPatches(tree, startcommits, outdir, paths=None):
 import tempfile
 import shutil
 tempdir = tempfile.mkdtemp(prefix='oepatch')
 try:
-shellcmd = ["git", "format-patch", "--no-signature", 
"--no-numbered", startcommit, "-o", tempdir]
-if paths:
-shellcmd.append('--')
-shellcmd.extend(paths)
-out = runcmd(["sh", "-c", " ".join(shellcmd)], tree)
-if out:
-for srcfile in out.split():
-for encoding in ['utf-8', 'latin-1']:
-patchlines = []
-outfile = None
-try:
-with open(srcfile, 'r', encoding=encoding) as f:
-for line in f:
-if 
line.startswith(GitApplyTree.patch_line_prefix):
-outfile = line.split()[-1].strip()
-continue
-if 
line.startswith(GitApplyTree.ignore_commit_prefix):
-continue
-patchlines.append(line)
-except UnicodeDecodeError:
-continue
-break
-else:
-raise PatchError('Unable to find a character encoding 
to decode %s' % srcfile)
-
-if not outfile:
-outfile = os.path.basename(srcfile)
-with open(os.path.join(outdir, outfile), 'w') as of:
-for line in patchlines:
-of.write(line)
+for name, rev in startcommits.items():
+shellcmd = ["git", "format-patch", "--no-signature", 
"--no-numbered", rev, "-o", tempdir]
+if paths:
+shellcmd.append('--')
+shellcmd.extend(paths)
+out = runcmd(["sh", "-c", " ".join(shellcmd)], 
os.path.join(tree, name))
+if out:
+for srcfile in out.split():
+for encoding in ['utf-8', 'latin-1']:
+patchlines = []
+outfile = None
+try:
+with open(srcfile, 'r', encoding=encoding) as 
f:
+for line in f:
+if 
line.startswith(GitApplyTree.patch_line_prefix):
+outfile = line.split()[-1].strip()
+continue
+if 
line.startswith(GitApplyTree.ignore_commit_prefix):
+

[OE-core] [PATCH 3/6] devtool: tag all submodules

2023-11-22 Thread Julien Stephan
In the case of a repository with submodules, we need to add the
"devtool-base" and "devtool-patched" tag on all submodules in order to
properly detect the added/removed/modified patches

Signed-off-by: Julien Stephan 
---
 meta/classes/devtool-source.bbclass | 3 +++
 scripts/lib/devtool/__init__.py | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/meta/classes/devtool-source.bbclass 
b/meta/classes/devtool-source.bbclass
index a02b1e9b0ec..4158c20c7e8 100644
--- a/meta/classes/devtool-source.bbclass
+++ b/meta/classes/devtool-source.bbclass
@@ -232,6 +232,9 @@ python devtool_post_patch() {
 bb.process.run('git rebase devtool-no-overrides', 
cwd=srcsubdir)
 bb.process.run('git checkout %s' % devbranch, cwd=srcsubdir)
 bb.process.run('git tag -f devtool-patched', cwd=srcsubdir)
+if os.path.exists(os.path.join(srcsubdir, '.gitmodules')):
+bb.process.run('git submodule foreach --recursive  "git tag -f 
devtool-patched"', cwd=srcsubdir)
+
 }
 
 python devtool_post_configure() {
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index 702db669de3..e9e88a55336 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -233,6 +233,9 @@ def setup_git_repo(repodir, version, devbranch, 
basetag='devtool-base', d=None):
 bb.process.run('git checkout -b %s' % devbranch, cwd=repodir)
 bb.process.run('git tag -f %s' % basetag, cwd=repodir)
 
+if os.path.exists(os.path.join(repodir, '.gitmodules')):
+bb.process.run('git submodule foreach --recursive  "git tag -f %s"' % 
basetag, cwd=repodir)
+
 def recipe_to_append(recipefile, config, wildcard=False):
 """
 Convert a recipe file to a bbappend file path within the workspace.
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191063): 
https://lists.openembedded.org/g/openembedded-core/message/191063
Mute This Topic: https://lists.openembedded.org/mt/102746730/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/6] devtool: add support of submodules

2023-11-22 Thread Julien Stephan
This series adds the support of git submodules, so we can use devtool
modify with gitsm recipes to create modify and export patches using
devtool finish.

This series also adds support of git submodules defined inside SRC_URI
(i.e extracting a secondary git tree inside S)

My dev branch is available here : [1].

It passed full recipetool/devtool oeselftest locally

Cheers
Julien

[1]: 
https://git.yoctoproject.org/poky-contrib/log/?h=jstephan/devtool-submodule-fix


Julien Stephan (6):
  devtool: fix update-recipe dry-run mode
  devtool: finish/update-recipe: restrict mode srcrev to recipes fetched
from SCM
  devtool: tag all submodules
  devtool: add support for git submodules
  oeqa/selftest/devtool: add test for git submodules
  lib/oe/recipeutils.py: remove trailing white-spaces

 meta/classes/devtool-source.bbclass |   3 +
 meta/lib/oe/patch.py|  64 +++---
 meta/lib/oe/recipeutils.py  |  29 ++-
 meta/lib/oeqa/selftest/cases/devtool.py |  47 
 scripts/lib/devtool/__init__.py |  24 ++
 scripts/lib/devtool/standard.py | 284 +++-
 scripts/lib/devtool/upgrade.py  |  51 +++--
 scripts/lib/recipetool/append.py|   4 +-
 8 files changed, 333 insertions(+), 173 deletions(-)

--
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191061): 
https://lists.openembedded.org/g/openembedded-core/message/191061
Mute This Topic: https://lists.openembedded.org/mt/102746727/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/6] devtool: finish/update-recipe: restrict mode srcrev to recipes fetched from SCM

2023-11-22 Thread Julien Stephan
When specifying --mode / -m srcrev with devtool finish/update-recipe on
recipes that are not fetched from a SCM repository we get the following
error:

  Traceback (most recent call last):
  [..]
File "<...>/poky/meta/lib/oe/patch.py", line 49, in runcmd
raise CmdError(cmd, exitstatus >> 8, "stdout: %s\nstderr: %s" % (stdout, 
stderr))
oe.patch.CmdError: Command Error: 'sh -c 'git format-patch --no-signature 
--no-numbered INVALID -o /tmp/oepatchbj7pfmzj -- .'' exited with 0  Output:
stdout:
stderr: fatal: bad revision 'INVALID'

Fix this by adding a check and abort with a proper error message.

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

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index cd79c7802cb..55fa38ccfb8 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1530,6 +1530,11 @@ def _update_recipe_srcrev(recipename, workspace, 
srctree, rd, appendlayerdir, wi
 recipedir = os.path.basename(recipefile)
 logger.info('Updating SRCREV in recipe %s%s' % (recipedir, dry_run_suffix))
 
+# Get original SRCREV
+old_srcrev = rd.getVar('SRCREV') or ''
+if old_srcrev == "INVALID":
+raise DevtoolError('Update mode srcrev is only valid for recipe 
fetched from an SCM repository')
+
 # Get HEAD revision
 try:
 stdout, _ = bb.process.run('git rev-parse HEAD', cwd=srctree)
@@ -1556,7 +1561,6 @@ def _update_recipe_srcrev(recipename, workspace, srctree, 
rd, appendlayerdir, wi
 if not no_remove:
 # Find list of existing patches in recipe file
 patches_dir = tempfile.mkdtemp(dir=tempdir)
-old_srcrev = rd.getVar('SRCREV') or ''
 upd_p, new_p, del_p = _export_patches(srctree, rd, old_srcrev,
   patches_dir)
 logger.debug('Patches: update %s, new %s, delete %s' % 
(dict(upd_p), dict(new_p), dict(del_p)))
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191062): 
https://lists.openembedded.org/g/openembedded-core/message/191062
Mute This Topic: https://lists.openembedded.org/mt/102746729/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/6] devtool: fix update-recipe dry-run mode

2023-11-22 Thread Julien Stephan
When running devtool update-recipe with --mode=srcrev AND --append switch
in dry-run, we get the following error:

  Traceback (most recent call last):
  [...]
  Exception: destpath should be set here

Fix this by removing a misplaced else statement in _update_recipe_srcrev

Signed-off-by: Julien Stephan 
---
 scripts/lib/devtool/standard.py | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index d53fb810071..cd79c7802cb 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1576,11 +1576,10 @@ def _update_recipe_srcrev(recipename, workspace, 
srctree, rd, appendlayerdir, wi
 patchfields['SRC_URI'] = '\\\n'.join(srcuri)
 if dry_run_outdir:
 logger.info('Creating bbappend (dry-run)')
-else:
-appendfile, destpath = oe.recipeutils.bbappend_recipe(
-rd, appendlayerdir, files, 
wildcardver=wildcard_version,
-extralines=patchfields, removevalues=removevalues,
-redirect_output=dry_run_outdir)
+appendfile, destpath = oe.recipeutils.bbappend_recipe(
+rd, appendlayerdir, files, wildcardver=wildcard_version,
+extralines=patchfields, removevalues=removevalues,
+redirect_output=dry_run_outdir)
 else:
 files_dir = _determine_files_dir(rd)
 for basepath, path in upd_f.items():
-- 
2.42.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191060): 
https://lists.openembedded.org/g/openembedded-core/message/191060
Mute This Topic: https://lists.openembedded.org/mt/102746726/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] joe editor broken with current ncurses

2023-11-22 Thread Tobias Jakobi
Any pointers on how to setup such machine? Quick goggling gives me 
https://docs.yoctoproject.org/dev-manual/qemu.html, but would this be 
satisfactory for the test?

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



[OE-core] [meta-oe][PATCH v2 0/1] wic: extend empty plugin with options to write zeros to partiton

2023-11-22 Thread Lukas Funke
From: Lukas Funke 

Adds features to explicitly write zeros to the start of the
partition. This is useful to overwrite old content like
filesystem signatures which may be re-recognized otherwise.

The new features can be enabled with
'--soucreparams="[fill|size=[S|s|K|k|M|G]][,][bs=[S|s|K|k|M|G]]"'
Conflicting or missing options throw errors.

The features are:
- fill
  Fill the entire partition with zeros. Requires '--fixed-size' option
  to be set.
- size=[S|s|K|k|M|G]
  Set the first N bytes of the partition to zero. Default unit is 'K'.
- bs=[S|s|K|k|M|G]
  Write at most N bytes at a time during source file creation.
  Defaults to '1M'. Default unit is 'K'.

Changed in v2:
 - Added SoB
---

Malte Schmidt (1):
  wic: extend empty plugin with options to write zeros to partiton

 scripts/lib/wic/plugins/source/empty.py | 57 -
 1 file changed, 56 insertions(+), 1 deletion(-)

-- 
2.30.2


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



[OE-core] [meta-oe][PATCH v2 1/1] wic: extend empty plugin with options to write zeros to partiton

2023-11-22 Thread Lukas Funke
From: Malte Schmidt 

Adds features to explicitly write zeros to the start of the
partition. This is useful to overwrite old content like
filesystem signatures which may be re-recognized otherwise.

The new features can be enabled with
'--soucreparams="[fill|size=[S|s|K|k|M|G]][,][bs=[S|s|K|k|M|G]]"'
Conflicting or missing options throw errors.

The features are:
- fill
  Fill the entire partition with zeros. Requires '--fixed-size' option
  to be set.
- size=[S|s|K|k|M|G]
  Set the first N bytes of the partition to zero. Default unit is 'K'.
- bs=[S|s|K|k|M|G]
  Write at most N bytes at a time during source file creation.
  Defaults to '1M'. Default unit is 'K'.

Signed-off-by: Malte Schmidt 
Signed-off-by: Lukas Funke 
---
 scripts/lib/wic/plugins/source/empty.py | 57 -
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/source/empty.py 
b/scripts/lib/wic/plugins/source/empty.py
index 9c492ca206..775631b588 100644
--- a/scripts/lib/wic/plugins/source/empty.py
+++ b/scripts/lib/wic/plugins/source/empty.py
@@ -9,9 +9,19 @@
 # To use it you must pass "empty" as argument for the "--source" parameter in
 # the wks file. For example:
 # part foo --source empty --ondisk sda --size="1024" --align 1024
+#
+# The plugin supports writing zeros to the start of the
+# partition. This is useful to overwrite old content like
+# filesystem signatures which may be re-recognized otherwise.
+# This feature can be enabled with
+# '--soucreparams="[fill|size=[S|s|K|k|M|G]][,][bs=[S|s|K|k|M|G]]"'
+# Conflicting or missing options throw errors.
 
 import logging
+import os
 
+from wic import WicError
+from wic.ksparser import sizetype
 from wic.pluginbase import SourcePlugin
 
 logger = logging.getLogger('wic')
@@ -19,6 +29,16 @@ logger = logging.getLogger('wic')
 class EmptyPartitionPlugin(SourcePlugin):
 """
 Populate unformatted empty partition.
+
+The following sourceparams are supported:
+- fill
+  Fill the entire partition with zeros. Requires '--fixed-size' option
+  to be set.
+- size=[S|s|K|k|M|G]
+  Set the first N bytes of the partition to zero. Default unit is 'K'.
+- bs=[S|s|K|k|M|G]
+  Write at most N bytes at a time during source file creation.
+  Defaults to '1M'. Default unit is 'K'.
 """
 
 name = 'empty'
@@ -31,4 +51,39 @@ class EmptyPartitionPlugin(SourcePlugin):
 Called to do the actual content population for a partition i.e. it
 'prepares' the partition to be incorporated into the image.
 """
-return
+get_byte_count = sizetype('K', True)
+size = 0
+
+if 'fill' in source_params and 'size' in source_params:
+raise WicError("Conflicting source parameters 'fill' and 'size' 
specified, exiting.")
+
+# Set the size of the zeros to be written to the partition
+if 'fill' in source_params:
+if part.fixed_size == 0:
+raise WicError("Source parameter 'fill' only works with the 
'--fixed-size' option, exiting.")
+size = part.fixed_size
+elif 'size' in source_params:
+size = get_byte_count(source_params['size'])
+
+if size == 0:
+# Nothing to do, create empty partition
+return
+
+if 'bs' in source_params:
+bs = get_byte_count(source_params['bs'])
+else:
+bs = get_byte_count('1M')
+
+# Create a binary file of the requested size filled with zeros
+source_file = os.path.join(cr_workdir, 'empty-plugin-zeros%s.bin' % 
part.lineno)
+if not os.path.exists(os.path.dirname(source_file)):
+os.makedirs(os.path.dirname(source_file))
+
+quotient, remainder = divmod(size, bs)
+with open(source_file, 'wb') as file:
+for _ in range(quotient):
+file.write(bytearray(bs))
+file.write(bytearray(remainder))
+
+part.size = (size + 1024 - 1) // 1024  # size in KB rounded up
+part.source_file = source_file
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191058): 
https://lists.openembedded.org/g/openembedded-core/message/191058
Mute This Topic: https://lists.openembedded.org/mt/102746529/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] joe editor broken with current ncurses

2023-11-22 Thread Alexander Kanavin
On Wed, 22 Nov 2023 at 11:20,  wrote:
>
> I verified this by:
> - copying the recipe from master verbatim into our layer
> - building our image
> - putting image on hardware
> - firing up joe
>
> Joe then shows the same broken behaviour that it does with the ncurses 6.3 
> snapshot in kirkstone.
>
> Or do you want me to replace our kirkstone oe-core layer with master oe-core? 
> I don't think this is going to work anyway, since some of our support layers 
> (we are using a Toradex SoM powered by a NXP i.MX7) are not compatible with 
> master.

You then need to build master with something that works, perhaps
simply a qemu machine? No layers needed other than oe-core and
whatever provides ncurses apps you need to test.

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191056): 
https://lists.openembedded.org/g/openembedded-core/message/191056
Mute This Topic: https://lists.openembedded.org/mt/102726054/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] systemd-compat-units.bb: fix postinstall script

2023-11-22 Thread Michael Opdenacker via lists.openembedded.org
From: Michael Opdenacker 

This fixes an issue running "opkg upgrade" on a system with systemd
(and when there is an update to "systemd-compat-units",
for example between yocto 4.2.2 and 4.2.3):

//var/lib/opkg/info/systemd-compat-units.postinst: cd: line 3: can't cd to 
/etc/init.d: No such file or directory

The existence of /etc/init.d is now tested
without causing an error if doesn't exist.

Fixes [YOCTO #15292]

Signed-off-by: Michael Opdenacker 
---
 meta/recipes-core/systemd/systemd-compat-units.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb 
b/meta/recipes-core/systemd/systemd-compat-units.bb
index 253bc9fcf1..c03d97f9c9 100644
--- a/meta/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta/recipes-core/systemd/systemd-compat-units.bb
@@ -27,7 +27,8 @@ SYSTEMD_DISABLED_SYSV_SERVICES = " \
 
 pkg_postinst:${PN} () {
 
-   cd $D${sysconfdir}/init.d  ||  exit 0
+   test -d $D${sysconfdir}/init.d  ||  exit 0
+   cd $D${sysconfdir}/init.d
 
echo "Disabling the following sysv scripts: "
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191055): 
https://lists.openembedded.org/g/openembedded-core/message/191055
Mute This Topic: https://lists.openembedded.org/mt/102746398/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] wic: add test for partition hidden attributes

2023-11-22 Thread Lee Chee Yang
From: Lee Chee Yang 

Add test for the --hidden argument introduced in Oe-Core
rev 7a111ff58d7390b79e2e63c8059f6c25f40f8977.

Signed-off-by: Lee Chee Yang 
---
 meta/lib/oeqa/selftest/cases/wic.py | 24 
 1 file changed, 24 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/wic.py 
b/meta/lib/oeqa/selftest/cases/wic.py
index b4866bcb32..ab248c5898 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -748,6 +748,30 @@ part /etc --source rootfs --fstype=ext4 
--change-directory=etc
 
 os.remove(wks_file)
 
+def test_partition_hidden_attributes(self):
+"""Test --hidden wks option."""
+wks_file = 'temp.wks'
+sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
+try:
+with open(wks_file, 'w') as wks:
+wks.write("""
+part / --source rootfs --fstype=ext4
+part / --source rootfs --fstype=ext4 --hidden
+bootloader --ptable gpt""")
+
+runCmd("wic create %s -e core-image-minimal -o %s" \
+   % (wks_file, self.resultdir))
+wicout = os.path.join(self.resultdir, "*.direct")
+
+result = runCmd("%s/usr/sbin/sfdisk --part-attrs %s 1" % (sysroot, 
wicout))
+self.assertEqual('', result.output)
+result = runCmd("%s/usr/sbin/sfdisk --part-attrs %s 2" % (sysroot, 
wicout))
+self.assertEqual('RequiredPartition', result.output)
+
+finally:
+os.remove(wks_file)
+
+
 class Wic2(WicTestCase):
 
 def test_bmap_short(self):
-- 
2.37.3


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191054): 
https://lists.openembedded.org/g/openembedded-core/message/191054
Mute This Topic: https://lists.openembedded.org/mt/102746380/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] joe editor broken with current ncurses

2023-11-22 Thread tobias . jakobi
I verified this by:
- copying the recipe from master verbatim into our layer
- building our image
- putting image on hardware
- firing up joe

Joe then shows the same broken behaviour that it does with the ncurses 6.3 
snapshot in kirkstone.

Or do you want me to replace our kirkstone oe-core layer with master oe-core? I 
don't think this is going to work anyway, since some of our support layers (we 
are using a Toradex SoM powered by a NXP i.MX7) are not compatible with master.

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191053): 
https://lists.openembedded.org/g/openembedded-core/message/191053
Mute This Topic: https://lists.openembedded.org/mt/102726054/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] joe editor broken with current ncurses

2023-11-22 Thread Alexander Kanavin
On Wed, 22 Nov 2023 at 11:10,  wrote:
> P.S.: So oe-core/master does *not* work. master has ncurses 6.4 (no 
> patchlevel), plus the patch for CVE-2023-29491.

But did you specifically verify this or is this a conjecture based on
your backport? We would need to fix master before fixing any of the
release branches :-/

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191052): 
https://lists.openembedded.org/g/openembedded-core/message/191052
Mute This Topic: https://lists.openembedded.org/mt/102726054/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] joe editor broken with current ncurses

2023-11-22 Thread tobias . jakobi
Hello Alex,

thanks for the suggestion. I've imported the ncurses recipe from 
oe-core/master, but the problem remained. It turns out that the CVE patch is 
what is causing the problems here. I read through the Gentoo bugreports again, 
and noticed that one user reported p20230918 to be working. Checking the 
ncurses commit log it seems like p20230918 includes a fix for the CVE, so 
additional patching is unnecessary.

So my current approach is to use p20230918 
(https://github.com/ThomasDickey/ncurses-snapshots/releases/tag/v6_4_20230918), 
but drop the CVE patch that the recipe is master applies. This seems to work, 
i.e. joe and tmux are both functional again.

Sadly I have no idea which changes one would need to backport to the 6.3 
version to fix the issue... :(

P.S.: So oe-core/master does *not* work. master has ncurses 6.4 (no 
patchlevel), plus the patch for CVE-2023-29491.

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191051): 
https://lists.openembedded.org/g/openembedded-core/message/191051
Mute This Topic: https://lists.openembedded.org/mt/102726054/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] elfutils: upgrade 0.189 -> 0.190

2023-11-22 Thread Alexander Kanavin
On Wed, 22 Nov 2023 at 10:59, Zang Ruochen  wrote:
> -From c5fb59ac0819b5b6d8244c613cbcf92cb09840c1 Mon Sep 17 00:00:00 2001
> -From: Hongxu Jia 
> -Date: Tue, 15 Aug 2017 17:10:57 +0800
> +From a54d70478157f3528c2ed73afd57020b59571fc7 Mon Sep 17 00:00:00 2001
> +From: Zang Ruochen 
> +Date: Wed, 22 Nov 2023 00:52:53 -0800
>  Subject: [PATCH] dso link change

Thanks, the update looks ok, except this bit. Please do not change the
patch authorship: the From field with the author and their email must
remain as it was before. You can manually insert the previous lines
into the file, but it's perhaps better to check at which point it was
rewritten, and see how that can be prevented.

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191050): 
https://lists.openembedded.org/g/openembedded-core/message/191050
Mute This Topic: https://lists.openembedded.org/mt/102746232/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] meta/lib/oeqa/selftest/cases/wic: Add tests for configuring kernel image install into boot partition.

2023-11-22 Thread Taedcke, Christian

Hello Kareem,

are you planning to continue withis this review? If not i would try to 
get this merged.


On 08.03.2023 11:34, Kareem Zarka wrote:

- test_skip_kernel_install: This test verifies that the kernel is not
installed in the boot partition when the 'install-kernel-into-boot-dir'
parameter is set to false.
- test_kernel_install: This test verifies that the kernel is installed
in the boot partition when the 'install-kernel-into-boot-dir' parameter
is set to true .
Both tests use a WKS (Kickstart) file to specify the desired
configuration, build a disk image using WIC, and extract the disk image
to a temporary directory to verify the results.

Signed-off-by: Kareem Zarka 
---
  meta/lib/oeqa/selftest/cases/wic.py | 70 +
  1 file changed, 70 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/wic.py 
b/meta/lib/oeqa/selftest/cases/wic.py
index b9430cdb3b..7f5db1dc73 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -16,6 +16,7 @@ import hashlib
  from glob import glob
  from shutil import rmtree, copy
  from tempfile import NamedTemporaryFile
+from tempfile import TemporaryDirectory
  
  from oeqa.selftest.case import OESelftestTestCase

  from oeqa.core.decorator import OETestTag
@@ -146,6 +147,75 @@ class CLITests(OESelftestTestCase):
  self.assertEqual(1, runCmd('wic', ignore_status=True).status)
  
  class Wic(WicTestCase):

+def test_skip_kernel_install(self):
+"""Test the functionality of not installing the kernel in the boot directory using 
the wic plugin"""
+# Build the mtools package to support FAT filesystem handling
+bitbake("mtools")


I believe this should be 'bitbake("mtools-native")'. This should fix the 
error on the build server.



+# create a temporary file for the WKS content
+with NamedTemporaryFile("w", suffix=".wks") as wks:
+wks.write(
+'part --source bootimg-efi '
+
'--sourceparams="loader=grub-efi,install-kernel-into-boot-dir=false" '
+'--label boot --active\n'
+)
+wks.flush()
+# create a temporary directory to extract the disk image to
+with TemporaryDirectory() as tmpdir:
+img = 'core-image-minimal'
+# build the image using the WKS file
+cmd = "wic create %s -e %s -o %s" % (
+wks.name, img, self.resultdir)
+runCmd(cmd)
+wksname = os.path.splitext(os.path.basename(wks.name))[0]
+out = glob(os.path.join(
+self.resultdir, "%s-*.direct" % wksname))
+self.assertEqual(1, len(out))
+# extract the content of the disk image to the temporary 
directory
+cmd = "wic cp %s:1 %s" % (out[0], tmpdir)
+runCmd(cmd)
+# check if the kernel is installed or not
+kimgtype = get_bb_var('KERNEL_IMAGETYPE', img)
+for file in os.listdir(tmpdir):
+if file == kimgtype:
+raise AssertionError(
+"The kernel image '{}' was found in the 
partition".format(kimgtype)
+)
+
+def test_kernel_install(self):
+"""Test the installation of the kernel to the boot directory in the wic 
plugin"""
+# Build the mtools package to support FAT filesystem handling
+bitbake("mtools")


Probably 'bitbake("mtools-native")'


+# create a temporary file for the WKS content
+with NamedTemporaryFile("w", suffix=".wks") as wks:
+wks.write(
+'part --source bootimg-efi '
+
'--sourceparams="loader=grub-efi,install-kernel-into-boot-dir=true" '
+'--label boot --active\n'
+)
+wks.flush()
+# create a temporary directory to extract the disk image to
+with TemporaryDirectory() as tmpdir:
+img = 'core-image-minimal'
+# build the image using the WKS file
+cmd = "wic create %s -e %s -o %s" % (wks.name, img, 
self.resultdir)
+runCmd(cmd)
+wksname = os.path.splitext(os.path.basename(wks.name))[0]
+out = glob(os.path.join(self.resultdir, "%s-*.direct" % 
wksname))
+self.assertEqual(1, len(out))
+# extract the content of the disk image to the temporary 
directory
+cmd = "wic cp %s:1 %s" % (out[0], tmpdir)
+runCmd(cmd)
+# check if the kernel is installed or not
+kimgtype = get_bb_var('KERNEL_IMAGETYPE', img)
+found = False
+for file in os.listdir(tmpdir):
+if file == kimgtype:
+found = True
+break
+self.assertTrue(
+  

[OE-core] [PATCH] elfutils: upgrade 0.189 -> 0.190

2023-11-22 Thread Zang Ruochen
From: Zang Ruochen 

The following patches have been fixed:
0001-libasm-may-link-with-libbz2-if-found.patch

Refresh the following patch:
0001-dso-link-change.patch

Signed-off-by: Zang Ruochen 
---
 .../{elfutils_0.189.bb => elfutils_0.190.bb}  |  3 +-
 .../elfutils/files/0001-dso-link-change.patch | 21 ++-
 ...libasm-may-link-with-libbz2-if-found.patch | 36 ---
 3 files changed, 13 insertions(+), 47 deletions(-)
 rename meta/recipes-devtools/elfutils/{elfutils_0.189.bb => elfutils_0.190.bb} 
(98%)
 delete mode 100644 
meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.189.bb 
b/meta/recipes-devtools/elfutils/elfutils_0.190.bb
similarity index 98%
rename from meta/recipes-devtools/elfutils/elfutils_0.189.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.190.bb
index d8bf82b022..8657080830 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.189.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.190.bb
@@ -16,7 +16,6 @@ SRC_URI = 
"https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
file://0003-fixheadercheck.patch \
file://0006-Fix-build-on-aarch64-musl.patch \
-   file://0001-libasm-may-link-with-libbz2-if-found.patch \

file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
file://0001-skip-the-test-when-gcc-not-deployed.patch \
file://ptest.patch \
@@ -25,7 +24,7 @@ SRC_URI = 
"https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
 SRC_URI:append:libc-musl = " \
file://0003-musl-utils.patch \
"
-SRC_URI[sha256sum] = 
"39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8"
+SRC_URI[sha256sum] = 
"8e00a3a9b5f04bc1dc273ae86281d2d26ed412020b391ffcc23198f10231d692"
 
 inherit autotools gettext ptest pkgconfig
 
diff --git a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch 
b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
index 6acc036406..b719efdf32 100644
--- a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
@@ -1,6 +1,6 @@
-From c5fb59ac0819b5b6d8244c613cbcf92cb09840c1 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia 
-Date: Tue, 15 Aug 2017 17:10:57 +0800
+From a54d70478157f3528c2ed73afd57020b59571fc7 Mon Sep 17 00:00:00 2001
+From: Zang Ruochen 
+Date: Wed, 22 Nov 2023 00:52:53 -0800
 Subject: [PATCH] dso link change
 
 Upstream-Status: Pending
@@ -16,18 +16,18 @@ more details.
 Rebase to 0.170
 
 Signed-off-by: Hongxu Jia 
-
+Signed-off-by: Zang Ruochen 
 ---
  src/Makefile.am   | 2 +-
  tests/Makefile.am | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 88d0ac8..c28d81f 100644
+index d3d9d40..ea61616 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl 
-lpthread
- libelf = ../libelf/libelf.a -lz
+ libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
  else
  libasm = ../libasm/libasm.so
 -libdw = ../libdw/libdw.so
@@ -36,11 +36,11 @@ index 88d0ac8..c28d81f 100644
  endif
  libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index c145720..72afd0e 100644
+index 7fb8efb..71c1a61 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -554,7 +554,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) 
$(libebl) -ldl -lpthread
- libelf = ../libelf/libelf.a -lz
+@@ -680,7 +680,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) 
$(libebl) -ldl -lpthread
+ libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
  libasm = ../libasm/libasm.a
  else
 -libdw = ../libdw/libdw.so
@@ -48,3 +48,6 @@ index c145720..72afd0e 100644
  libelf = ../libelf/libelf.so
  libasm = ../libasm/libasm.so
  endif
+-- 
+2.25.1
+
diff --git 
a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
 
b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
deleted file mode 100644
index 09c9d3ea24..00
--- 
a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ed1975deeaa47f98d212fd144c8bda075b1a5d36 Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Wed, 4 Oct 2017 22:30:46 -0700
-Subject: [PATCH] libasm may link with libbz2 if found
-
-This can fail to link binaries like objdump
-where indirect libraries may be not found by linker
-
-| 
/mnt/a/oe/build/tmp/work/riscv64-bec-linux/elfutils/0.170-r0/recipe-sysroot/usr/lib/libbz2.so.1:
 error adding symbols: DSO missing from command line
-| collect2: error: ld returned 1 exit status
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj 
-

- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletion

Re: Private: Re: [OE-core] [Kirkstone] joe editor broken with current ncurses

2023-11-22 Thread Alexander Kanavin
It's not clear to me: do you also see the issues with master? Can you
try that please?

Please keep all responses on the mailing list.


Alex

On Wed, 22 Nov 2023 at 10:48,  wrote:
>
> Hello Alex,
>
> thanks for the suggestion. I've imported the ncurses recipe from 
> oe-core/master, but the problem remained. It turns out that the CVE patch is 
> what is causing the problems here. I read through the Gentoo bugreports 
> again, and noticed that one user reported p20230918 to be working. Checking 
> the ncurses commit log it seems like p20230918 includes a fix for the CVE, so 
> additional patching is unnecessary.
>
> So my current approach is to use p20230918 
> (https://github.com/ThomasDickey/ncurses-snapshots/releases/tag/v6_4_20230918),
>  but drop the CVE patch that the recipe is master applies. This seems to 
> work, i.e. joe and tmux are both functional again.
>
> Sadly I have no idea which changes one would need to backport to the 6.3 
> version to fix the issue... :(

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191047): 
https://lists.openembedded.org/g/openembedded-core/message/191047
Mute This Topic: https://lists.openembedded.org/mt/102746224/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] poky: kirkstone: eSDK: fix build-in eSDK environment file generation

2023-11-22 Thread Alexander Kanavin
On Wed, 22 Nov 2023 at 10:18, Alberto Merciai  wrote:
> Of course
> I'm following the guide
> https://docs.yoctoproject.org/4.0.14/sdk-manual/extensible.html#setting-up-the-extensible-sdk-environment-directly-in-a-yocto-build
>
> create environment file for cross compilation
>
> $ bitbake meta-ide-support
> $ bitbake -c populate_sysroot gtk+3
> # or any other target or native item that the application developer would need
> $ bitbake build-sysroots
>
> then you can open a new terminal and sourcing the file generated by the above 
> steps using
>source tmp/deploy/images/qemux86-64/environment-setup-core2-64-poky-linux
>
> go inside the project you would like cross-compile and you get errors

Thanks, now I understand what happened. This feature was actually
never backported to kirkstone (and won't be because of LTS policy - no
new features), but documentation was (mistakenly) updated to state
that it was:
https://git.yoctoproject.org/yocto-docs/commit/?h=kirkstone&id=5e2ec35e3d63f9c73726122fe2b3dd6d6f85a77e

Michael, the bits about meta-ide-suppport/build-sysroots need to be
reverted, before more people get misled.

Alberto, can you check that this works as expected on master or any
more recent release where my commit is present, and the file is set
correctly?

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191046): 
https://lists.openembedded.org/g/openembedded-core/message/191046
Mute This Topic: https://lists.openembedded.org/mt/102745821/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] poky: kirkstone: eSDK: fix build-in eSDK environment file generation

2023-11-22 Thread Alberto Merciai
Hello Alexander,

Of course
I'm following the guide
https://docs.yoctoproject.org/4.0.14/sdk-manual/extensible.html#setting-up-the-extensible-sdk-environment-directly-in-a-yocto-build

create environment file for cross compilation

$ bitbake meta-ide-support
$ bitbake -c populate_sysroot gtk+3
# or any other target or native item that the application developer would need
$ bitbake build-sysroots

then you can open a new terminal and sourcing the file generated by the
above steps using
   source tmp/deploy/images/qemux86-64/environment-setup-core2-64-poky-linux

go inside the project you would like cross-compile and you get errors

Let me know if it is enough for you, thanks :)


On Wed, Nov 22, 2023 at 9:59 AM Alexander Kanavin 
wrote:

> Can you please describe in the commit message how the issue can be
> reproduced and observed, because otherwise I can't do a meaningful
> review, and would have to say 'no' until I can?
>
> Do we need to improve the tests? Do they miss something?
>
> Alex
>
> On Wed, 22 Nov 2023 at 09:54, Alberto Merciai 
> wrote:
> >
> > From: amerciai 
> >
> > - Following Setting up the Extensible SDK environment directly in a
> Yocto build
> >
> https://docs.yoctoproject.org/4.0.14/sdk-manual/extensible.html#setting-up-the-extensible-sdk-environment-directly-in-a-yocto-build
> >   The generated environment file does not point to the
> >   correct sysroot folder, then the end user is not able
> >   to cross-compile by sourcing the file.
> >
> > - The same for kirkstone-4.0.10
> >
> > - By analyzing
> >
> https://lore.kernel.org/all/20220622103312.1098389-3-a...@linutronix.de/T/#m7eadf6c722410f5b233ebba9fc700a895af9f052
> >   I found that changes apllied to
> >   meta/classes/toolchain-scripts.bbclass
> >   solve the issue.
> >
> > Suggested-by: Alexander Kanavin 
> > Signed-off-by: Alberto Merciai 
> >
> > diff --git a/meta/classes/toolchain-scripts.bbclass
> b/meta/classes/toolchain-scripts.bbclass
> > index d735d434e6..ec50a1efa0 100644
> > --- a/meta/classes/toolchain-scripts.bbclass
> > +++ b/meta/classes/toolchain-scripts.bbclass
> > @@ -70,15 +70,23 @@ toolchain_create_tree_env_script () {
> > script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
> > rm -f $script
> > touch $script
> > +   echo 'standalone_sysroot_target="${STAGING_DIR}/${MACHINE}"' >>
> $script
> > +   echo 'standalone_sysroot_native="${STAGING_DIR}/${BUILD_ARCH}"'
> >> $script
> > echo 'orig=`pwd`; cd ${COREBASE}; . ./oe-init-build-env
> ${TOPDIR}; cd $orig' >> $script
> > -   echo 'export
> PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >>
> $script
> > -   echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}'
> >> $script
> > -   echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script
> > +
> > +   echo 'export
> PATH=$standalone_sysroot_native/${bindir_native}:$standalone_sysroot_native/${bindir_native}/${TARGET_SYS}:$PATH'
> >> $script
> > +   echo 'export PKG_CONFIG_SYSROOT_DIR=$standalone_sysroot_target'
> >> $script
> > +   echo 'export
> PKG_CONFIG_PATH=$standalone_sysroot_target'"$libdir"'/pkgconfig:$standalone_sysroot_target'"$prefix"'/share/pkgconfig'
> >> $script
> > +
> > echo 'export CONFIG_SITE="${CONFIG_SITE}"' >> $script
> > -   echo 'export SDKTARGETSYSROOT=${STAGING_DIR_TARGET}' >> $script
> > -   echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >>
> $script
> > -   echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >>
> $script
> > -   echo 'export OECORE_ACLOCAL_OPTS="-I
> ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script
> > +
> > +   echo 'export SDKTARGETSYSROOT=$standalone_sysroot_target' >>
> $script
> > +   echo 'export OECORE_NATIVE_SYSROOT=$standalone_sysroot_native'
> >> $script
> > +   echo 'export OECORE_TARGET_SYSROOT=$standalone_sysroot_target'
> >> $script
> > +   echo 'export OECORE_ACLOCAL_OPTS="-I
> $standalone_sysroot_native/usr/share/aclocal"' >> $script
> > +   echo 'export OECORE_BASELIB="${baselib}"' >> $script
> > +   echo 'export OECORE_TARGET_ARCH="${TARGET_ARCH}"' >>$script
> > +   echo 'export OECORE_TARGET_OS="${TARGET_OS}"' >>$script
> >
> > toolchain_shared_env_script
> >  }
> > --
> > 2.34.1
> >
>

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



[OE-core] [dunfell][PATCH 2/2] python3-setuptools: fix CVE-2022-40897

2023-11-22 Thread Lee Chee Yang
From: Lee Chee Yang 

import patch from ubuntu setuptools_45.2.0-1ubuntu0.1 .

Signed-off-by: Lee Chee Yang 
---
 .../python/python-setuptools.inc  |  2 ++
 .../python3-setuptools/CVE-2022-40897.patch   | 29 +++
 2 files changed, 31 insertions(+)
 create mode 100644 
meta/recipes-devtools/python/python3-setuptools/CVE-2022-40897.patch

diff --git a/meta/recipes-devtools/python/python-setuptools.inc 
b/meta/recipes-devtools/python/python-setuptools.inc
index 29be852f66..5faf62bc3a 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -8,6 +8,8 @@ PYPI_PACKAGE_EXT = "zip"
 
 inherit pypi
 
+SRC_URI += " file://CVE-2022-40897.patch "
+
 SRC_URI_append_class-native = " 
file://0001-conditionally-do-not-fetch-code-by-easy_install.patch"
 
 SRC_URI[md5sum] = "0c956eea142af9c2b02d72e3c042af30"
diff --git 
a/meta/recipes-devtools/python/python3-setuptools/CVE-2022-40897.patch 
b/meta/recipes-devtools/python/python3-setuptools/CVE-2022-40897.patch
new file mode 100644
index 00..9150cea07e
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-setuptools/CVE-2022-40897.patch
@@ -0,0 +1,29 @@
+From 43a9c9bfa6aa626ec2a22540bea28d2ca77964be Mon Sep 17 00:00:00 2001
+From: "Jason R. Coombs" 
+Date: Fri, 4 Nov 2022 13:47:53 -0400
+Subject: [PATCH] Limit the amount of whitespace to search/backtrack. Fixes
+ #3659.
+
+CVE: CVE-2022-40897
+Upstream-Status: Backport [
+Upstream :  
https://github.com/pypa/setuptools/commit/43a9c9bfa6aa626ec2a22540bea28d2ca77964be
+Import from Ubuntu: 
http://archive.ubuntu.com/ubuntu/pool/main/s/setuptools/setuptools_45.2.0-1ubuntu0.1.debian.tar.xz
+]
+Signed-off-by: Lee Chee Yang 
+
+---
+ setuptools/package_index.py   | 2 +-
+ setuptools/tests/test_packageindex.py | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+--- setuptools-45.2.0.orig/setuptools/package_index.py
 setuptools-45.2.0/setuptools/package_index.py
+@@ -215,7 +215,7 @@ def unique_values(func):
+ return wrapper
+ 
+ 
+-REL = re.compile(r"""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
++REL = re.compile(r"""<([^>]*\srel\s{0,10}=\s{0,10}['"]?([^'" >]+)[^>]*)>""", 
re.I)
+ # this line is here to fix emacs' cruddy broken syntax highlighting
+ 
+ 
-- 
2.37.3


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



[OE-core] [dunfell][PATCH 1/2] wayland: fix CVE-2021-3782

2023-11-22 Thread Lee Chee Yang
From: Lee Chee Yang 

take CVE-2021-3782.patch from OE-core rev 
09b8ff8d2361b2db001bc963f481db294ccf2170.

Signed-off-by: Lee Chee Yang 
---
 .../wayland/wayland/CVE-2021-3782.patch   | 111 ++
 .../wayland/wayland_1.18.0.bb |   1 +
 2 files changed, 112 insertions(+)
 create mode 100644 meta/recipes-graphics/wayland/wayland/CVE-2021-3782.patch

diff --git a/meta/recipes-graphics/wayland/wayland/CVE-2021-3782.patch 
b/meta/recipes-graphics/wayland/wayland/CVE-2021-3782.patch
new file mode 100644
index 00..df204508e9
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/CVE-2021-3782.patch
@@ -0,0 +1,111 @@
+From 5eed6609619cc2e4eaa8618d11c15d442abf54be Mon Sep 17 00:00:00 2001
+From: Derek Foreman 
+Date: Fri, 28 Jan 2022 13:18:37 -0600
+Subject: [PATCH] util: Limit size of wl_map
+
+Since server IDs are basically indistinguishable from really big client
+IDs at many points in the source, it's theoretically possible to overflow
+a map and either overflow server IDs into the client ID space, or grow
+client IDs into the server ID space. This would currently take a massive
+amount of RAM, but the definition of massive changes yearly.
+
+Prevent this by placing a ridiculous but arbitrary upper bound on the
+number of items we can put in a map: 0xF0, somewhere over 15 million.
+This should satisfy pathological clients without restriction, but stays
+well clear of the 0xFF00 transition point between server and client
+IDs. It will still take an improbable amount of RAM to hit this, and a
+client could still exhaust all RAM in this way, but our goal is to prevent
+overflow and undefined behaviour.
+
+Fixes #224
+
+Signed-off-by: Derek Foreman 
+
+Upstream-Status: Backport
+CVE: CVE-2021-3782
+
+Reference to upstream patch:
+https://gitlab.freedesktop.org/wayland/wayland/-/commit/b19488c7154b902354cb26a27f11415d7799b0b2
+
+[DP: adjust context for wayland version 1.20.0]
+Signed-off-by: Dragos-Marian Panait 
+---
+ src/wayland-private.h |  1 +
+ src/wayland-util.c| 25 +++--
+ 2 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/src/wayland-private.h b/src/wayland-private.h
+index 9bf8cb7..35dc40e 100644
+--- a/src/wayland-private.h
 b/src/wayland-private.h
+@@ -45,6 +45,7 @@
+ #define WL_MAP_SERVER_SIDE 0
+ #define WL_MAP_CLIENT_SIDE 1
+ #define WL_SERVER_ID_START 0xff00
++#define WL_MAP_MAX_OBJECTS 0x00f0
+ #define WL_CLOSURE_MAX_ARGS 20
+ 
+ struct wl_object {
+diff --git a/src/wayland-util.c b/src/wayland-util.c
+index d5973bf..3e45d19 100644
+--- a/src/wayland-util.c
 b/src/wayland-util.c
+@@ -195,6 +195,7 @@ wl_map_insert_new(struct wl_map *map, uint32_t flags, void 
*data)
+   union map_entry *start, *entry;
+   struct wl_array *entries;
+   uint32_t base;
++  uint32_t count;
+ 
+   if (map->side == WL_MAP_CLIENT_SIDE) {
+   entries = &map->client_entries;
+@@ -215,10 +216,25 @@ wl_map_insert_new(struct wl_map *map, uint32_t flags, 
void *data)
+   start = entries->data;
+   }
+ 
++  /* wl_array only grows, so if we have too many objects at
++   * this point there's no way to clean up. We could be more
++   * pro-active about trying to avoid this allocation, but
++   * it doesn't really matter because at this point there is
++   * nothing to be done but disconnect the client and delete
++   * the whole array either way.
++   */
++  count = entry - start;
++  if (count > WL_MAP_MAX_OBJECTS) {
++  /* entry->data is freshly malloced garbage, so we'd
++   * better make it a NULL so wl_map_for_each doesn't
++   * dereference it later. */
++  entry->data = NULL;
++  return 0;
++  }
+   entry->data = data;
+   entry->next |= (flags & 0x1) << 1;
+ 
+-  return (entry - start) + base;
++  return count + base;
+ }
+ 
+ int
+@@ -235,6 +251,9 @@ wl_map_insert_at(struct wl_map *map, uint32_t flags, 
uint32_t i, void *data)
+   i -= WL_SERVER_ID_START;
+   }
+ 
++  if (i > WL_MAP_MAX_OBJECTS)
++  return -1;
++
+   count = entries->size / sizeof *start;
+   if (count < i)
+   return -1;
+@@ -269,8 +288,10 @@ wl_map_reserve_new(struct wl_map *map, uint32_t i)
+   i -= WL_SERVER_ID_START;
+   }
+ 
+-  count = entries->size / sizeof *start;
++  if (i > WL_MAP_MAX_OBJECTS)
++  return -1;
+ 
++  count = entries->size / sizeof *start;
+   if (count < i)
+   return -1;
+ 
+-- 
+2.37.3
diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb 
b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
index 00be3aac27..e621abddbf 100644
--- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
@@ -18,6 +18,7 @@ SRC_URI = 
"https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://0002-Do-not

Re: [OE-core] [PATCH] poky: kirkstone: eSDK: fix build-in eSDK environment file generation

2023-11-22 Thread Alexander Kanavin
There is still no description of how to observe the issue, no answer
to my question, and I did not suggest any of this at any point (I had
to go and check - some of my old patches were used as a reference,
this is not the same as Suggested-by).

NACK.

Alex



On Wed, 22 Nov 2023 at 10:04, Alberto Merciai  wrote:
>
> From: amerciai 
>
> - Following Setting up the Extensible SDK environment directly in a Yocto 
> build
>   
> https://docs.yoctoproject.org/4.0.14/sdk-manual/extensible.html#setting-up-the-extensible-sdk-environment-directly-in-a-yocto-build
>   The generated environment file does not point to the
>   correct sysroot folder, then the end user is not able
>   to cross-compile by sourcing the file.
>
> - The same for kirkstone-4.0.10
>
> - By analyzing
>   
> https://lore.kernel.org/all/20220622103312.1098389-3-a...@linutronix.de/T/#m7eadf6c722410f5b233ebba9fc700a895af9f052
>   I found that changes apllied to
>   meta/classes/toolchain-scripts.bbclass
>   solve the issue.
>
> Suggested-by: Alexander Kanavin 
> Signed-off-by: Alberto Merciai 
>
> diff --git a/meta/classes/toolchain-scripts.bbclass 
> b/meta/classes/toolchain-scripts.bbclass
> index d735d434e6..ec50a1efa0 100644
> --- a/meta/classes/toolchain-scripts.bbclass
> +++ b/meta/classes/toolchain-scripts.bbclass
> @@ -70,15 +70,23 @@ toolchain_create_tree_env_script () {
> script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
> rm -f $script
> touch $script
> +   echo 'standalone_sysroot_target="${STAGING_DIR}/${MACHINE}"' >> 
> $script
> +   echo 'standalone_sysroot_native="${STAGING_DIR}/${BUILD_ARCH}"' >> 
> $script
> echo 'orig=`pwd`; cd ${COREBASE}; . ./oe-init-build-env ${TOPDIR}; cd 
> $orig' >> $script
> -   echo 'export 
> PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >> 
> $script
> -   echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> 
> $script
> -   echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script
> +
> +   echo 'export 
> PATH=$standalone_sysroot_native/${bindir_native}:$standalone_sysroot_native/${bindir_native}/${TARGET_SYS}:$PATH'
>  >> $script
> +   echo 'export PKG_CONFIG_SYSROOT_DIR=$standalone_sysroot_target' >> 
> $script
> +   echo 'export 
> PKG_CONFIG_PATH=$standalone_sysroot_target'"$libdir"'/pkgconfig:$standalone_sysroot_target'"$prefix"'/share/pkgconfig'
>  >> $script
> +
> echo 'export CONFIG_SITE="${CONFIG_SITE}"' >> $script
> -   echo 'export SDKTARGETSYSROOT=${STAGING_DIR_TARGET}' >> $script
> -   echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
> -   echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
> -   echo 'export OECORE_ACLOCAL_OPTS="-I 
> ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script
> +
> +   echo 'export SDKTARGETSYSROOT=$standalone_sysroot_target' >> $script
> +   echo 'export OECORE_NATIVE_SYSROOT=$standalone_sysroot_native' >> 
> $script
> +   echo 'export OECORE_TARGET_SYSROOT=$standalone_sysroot_target' >> 
> $script
> +   echo 'export OECORE_ACLOCAL_OPTS="-I 
> $standalone_sysroot_native/usr/share/aclocal"' >> $script
> +   echo 'export OECORE_BASELIB="${baselib}"' >> $script
> +   echo 'export OECORE_TARGET_ARCH="${TARGET_ARCH}"' >>$script
> +   echo 'export OECORE_TARGET_OS="${TARGET_OS}"' >>$script
>
> toolchain_shared_env_script
>  }
> --
> 2.34.1
>

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



[OE-core] [PATCH] python3-urllib3: upgrade 2.0.7 -> 2.1.0

2023-11-22 Thread wangmy
From: Wang Mingyu 

Changelog:

-Removed support for the deprecated urllib3[secure] extra.
-Removed support for the deprecated SecureTransport TLS implementation.
-Removed support for the end-of-life Python 3.7.
-Allowed loading CA certificates from memory for proxies.
-Fixed decoding Gzip-encoded responses which specified x-gzip content-encoding.

Signed-off-by: Wang Mingyu 
---
 .../{python3-urllib3_2.0.7.bb => python3-urllib3_2.1.0.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-urllib3_2.0.7.bb => 
python3-urllib3_2.1.0.bb} (87%)

diff --git a/meta/recipes-devtools/python/python3-urllib3_2.0.7.bb 
b/meta/recipes-devtools/python/python3-urllib3_2.1.0.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-urllib3_2.0.7.bb
rename to meta/recipes-devtools/python/python3-urllib3_2.1.0.bb
index c286838086..b5b37e2924 100644
--- a/meta/recipes-devtools/python/python3-urllib3_2.0.7.bb
+++ b/meta/recipes-devtools/python/python3-urllib3_2.1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3";
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda"
 
-SRC_URI[sha256sum] = 
"c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"
+SRC_URI[sha256sum] = 
"df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"
 
 inherit pypi python_hatchling
 
-- 
2.34.1


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



[OE-core] [PATCH] python3-scons: upgrade 4.5.2 -> 4.6.0

2023-11-22 Thread wangmy
From: Wang Mingyu 

Changelog:
https://github.com/SCons/scons/releases/tag/4.6.0

Signed-off-by: Wang Mingyu 
---
 .../python/{python3-scons_4.5.2.bb => python3-scons_4.6.0.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-scons_4.5.2.bb => 
python3-scons_4.6.0.bb} (90%)

diff --git a/meta/recipes-devtools/python/python3-scons_4.5.2.bb 
b/meta/recipes-devtools/python/python3-scons_4.6.0.bb
similarity index 90%
rename from meta/recipes-devtools/python/python3-scons_4.5.2.bb
rename to meta/recipes-devtools/python/python3-scons_4.6.0.bb
index e0173a309e..c3cc3f0373 100644
--- a/meta/recipes-devtools/python/python3-scons_4.5.2.bb
+++ b/meta/recipes-devtools/python/python3-scons_4.6.0.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d903b0b8027f461402bac9b5169b36f7"
 
 SRC_URI += " file://0001-Fix-man-page-installation.patch"
-SRC_URI[sha256sum] = 
"813360b2bce476bc9cc12a0f3a22d46ce520796b352557202cb07d3e402f5458"
+SRC_URI[sha256sum] = 
"7db28958b188b800f803c287d0680cc3ac7c422ed0b1cf9895042c52567803ec"
 
 PYPI_PACKAGE = "SCons"
 
-- 
2.34.1


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



[OE-core] [PATCH] python3-pyasn1: upgrade 0.5.0 -> 0.5.1

2023-11-22 Thread wangmy
From: Wang Mingyu 

Changelog:

-Added support for PyPy 3.10 and Python 3.12
-Updated RTD configuration to include a dummy index.rst redirecting to
 contents.html, ensuring compatibility with third-party documentation and search
 indexes.
-Fixed the API breakage wih decoder.decode(substrateFun=...).

Signed-off-by: Wang Mingyu 
---
 meta/recipes-devtools/python/python-pyasn1.inc  | 2 +-
 .../python/{python3-pyasn1_0.5.0.bb => python3-pyasn1_0.5.1.bb} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pyasn1_0.5.0.bb => 
python3-pyasn1_0.5.1.bb} (100%)

diff --git a/meta/recipes-devtools/python/python-pyasn1.inc 
b/meta/recipes-devtools/python/python-pyasn1.inc
index 9eb87354cf..52fd98589d 100644
--- a/meta/recipes-devtools/python/python-pyasn1.inc
+++ b/meta/recipes-devtools/python/python-pyasn1.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://pyasn1.sourceforge.net/";
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=190f79253908c986e6cacf380c3a5f6d"
 
-SRC_URI[sha256sum] = 
"97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde"
+SRC_URI[sha256sum] = 
"6d391a96e59b23130a5cfa74d6fd7f388dbbe26cc8f1edf39fdddf08d9d6676c"
 
 RDEPENDS:${PN}:class-target += " \
 ${PYTHON_PN}-codecs \
diff --git a/meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb 
b/meta/recipes-devtools/python/python3-pyasn1_0.5.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb
rename to meta/recipes-devtools/python/python3-pyasn1_0.5.1.bb
-- 
2.34.1


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



[OE-core] [PATCH] python3-hypothesis: upgrade 6.89.0 -> 6.90.0

2023-11-22 Thread wangmy
From: Wang Mingyu 

Changelog:

-makes it an error to assign settings = settings(...) as a class attribute on a
 RuleBasedStateMachine.
-refactors some internals. 

Signed-off-by: Wang Mingyu 
---
 ...ython3-hypothesis_6.89.0.bb => python3-hypothesis_6.90.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-hypothesis_6.89.0.bb => 
python3-hypothesis_6.90.0.bb} (91%)

diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.89.0.bb 
b/meta/recipes-devtools/python/python3-hypothesis_6.90.0.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.89.0.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.90.0.bb
index 035809c394..1760bb37a2 100644
--- a/meta/recipes-devtools/python/python3-hypothesis_6.89.0.bb
+++ b/meta/recipes-devtools/python/python3-hypothesis_6.90.0.bb
@@ -13,7 +13,7 @@ SRC_URI += " \
 file://test_rle.py \
 "
 
-SRC_URI[sha256sum] = 
"9168bb12cd29001067e66b5f25f1bbdeff08b80c29c3909e19fc8205d8b9aeed"
+SRC_URI[sha256sum] = 
"0ab33900b9362318bd03d911a77a0dda8629c1877420074d87ae466919f6e4c0"
 
 RDEPENDS:${PN} += " \
 python3-attrs \
-- 
2.34.1


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



[OE-core] [PATCH] python3-wcwidth: upgrade 0.2.9 -> 0.2.11

2023-11-22 Thread wangmy
From: Wang Mingyu 

Changelog:

-Include tests files in the source distribution
-bugfix Emojis made wide by Variation Selector-16

Signed-off-by: Wang Mingyu 
---
 .../{python3-wcwidth_0.2.9.bb => python3-wcwidth_0.2.11.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-wcwidth_0.2.9.bb => 
python3-wcwidth_0.2.11.bb} (87%)

diff --git a/meta/recipes-devtools/python/python3-wcwidth_0.2.9.bb 
b/meta/recipes-devtools/python/python3-wcwidth_0.2.11.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-wcwidth_0.2.9.bb
rename to meta/recipes-devtools/python/python3-wcwidth_0.2.11.bb
index 983852d07d..c4db61e062 100644
--- a/meta/recipes-devtools/python/python3-wcwidth_0.2.9.bb
+++ b/meta/recipes-devtools/python/python3-wcwidth_0.2.11.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/jquast/wcwidth";
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b15979c39a2543892fca8cd86b4b52cb"
 
-SRC_URI[sha256sum] = 
"a675d1a4a2d24ef67096a04b85b02deeecd8e226f57b5e3a72dbb9ed99d27da8"
+SRC_URI[sha256sum] = 
"25eb3ecbec328cdb945f56f2a7cfe784bdf7a73a8197398c7a7c65e7fe93e9ae"
 
 inherit pypi setuptools3 ptest
 
-- 
2.34.1


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



[OE-core] [PATCH] python3-setuptools: upgrade 68.2.2 -> 69.0.2

2023-11-22 Thread wangmy
From: Wang Mingyu 

Changelog:

-Added missing estimated date for removing setuptools.dep_util
-Fixed imports of setuptools.dep_util.newer_group. A deprecation warning is
 issued instead of a hard failure.
-Include type information (py.typed, *.pyi) by default
-Exported distutils.dep_util and setuptools.dep_util through setuptools.modified
-Merged with pypa/distutils@7a04cbda0fc714.
-Replaced hardcoded numeric values with dis.opmap, fixing problem with 3.13.0a1.

Signed-off-by: Wang Mingyu 
---
 ...ython3-setuptools_68.2.2.bb => python3-setuptools_69.0.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-setuptools_68.2.2.bb => 
python3-setuptools_69.0.2.bb} (95%)

diff --git a/meta/recipes-devtools/python/python3-setuptools_68.2.2.bb 
b/meta/recipes-devtools/python/python3-setuptools_69.0.2.bb
similarity index 95%
rename from meta/recipes-devtools/python/python3-setuptools_68.2.2.bb
rename to meta/recipes-devtools/python/python3-setuptools_69.0.2.bb
index 06957d7000..8093ab9ba8 100644
--- a/meta/recipes-devtools/python/python3-setuptools_68.2.2.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_69.0.2.bb
@@ -11,7 +11,7 @@ SRC_URI:append:class-native = " 
file://0001-conditionally-do-not-fetch-code-by-e
 SRC_URI += " \
 
file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch"
 
-SRC_URI[sha256sum] = 
"4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"
+SRC_URI[sha256sum] = 
"735896e78a4742605974de002ac60562d286fa8051a7e2299445e8e8fbb01aa6"
 
 DEPENDS += "${PYTHON_PN}"
 
-- 
2.34.1


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



  1   2   >