* [OE-core][kirkstone 01/35] dbus: fix CVE-2022-42010 Check brackets in signature nest correctly
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 02/35] dbus: fix CVE-2022-42011 dbus-daemon can be crashed by messages with array length inconsistent with element type Steve Sakoman
` (33 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
From: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
Signed-off-by: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...idate-Check-brackets-in-signature-ne.patch | 119 ++++++++++++++++++
meta/recipes-core/dbus/dbus_1.14.0.bb | 1 +
2 files changed, 120 insertions(+)
create mode 100644 meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch
diff --git a/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch
new file mode 100644
index 0000000000..f2e14fb8d5
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch
@@ -0,0 +1,119 @@
+From 3e53a785dee8d1432156188a2c4260e4cbc78c4d Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Tue, 13 Sep 2022 15:10:22 +0100
+Subject: [PATCH] dbus-marshal-validate: Check brackets in signature nest
+ correctly
+
+In debug builds with assertions enabled, a signature with incorrectly
+nested `()` and `{}`, for example `a{i(u}` or `(a{ii)}`, could result
+in an assertion failure.
+
+In production builds without assertions enabled, a signature with
+incorrectly nested `()` and `{}` could potentially result in a crash
+or incorrect message parsing, although we do not have a concrete example
+of either of these failure modes.
+
+Thanks: Evgeny Vereshchagin
+Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/418
+Resolves: CVE-2022-42010
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/dbus/dbus/-/commit/3e53a785dee8d1432156188a2c4260e4cbc78c4d]
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+(cherry picked from commit 9d07424e9011e3bbe535e83043d335f3093d2916)
+Signed-off-by: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
+---
+ dbus/dbus-marshal-validate.c | 38 +++++++++++++++++++++++++++++++++++-
+ 1 file changed, 37 insertions(+), 1 deletion(-)
+
+diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c
+index 4d492f3f..ae68414d 100644
+--- a/dbus/dbus-marshal-validate.c
++++ b/dbus/dbus-marshal-validate.c
+@@ -62,6 +62,8 @@ _dbus_validate_signature_with_reason (const DBusString *type_str,
+
+ int element_count;
+ DBusList *element_count_stack;
++ char opened_brackets[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH * 2 + 1] = { '\0' };
++ char last_bracket;
+
+ result = DBUS_VALID;
+ element_count_stack = NULL;
+@@ -93,6 +95,10 @@ _dbus_validate_signature_with_reason (const DBusString *type_str,
+
+ while (p != end)
+ {
++ _dbus_assert (struct_depth + dict_entry_depth >= 0);
++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets));
++ _dbus_assert (opened_brackets[struct_depth + dict_entry_depth] == '\0');
++
+ switch (*p)
+ {
+ case DBUS_TYPE_BYTE:
+@@ -136,6 +142,10 @@ _dbus_validate_signature_with_reason (const DBusString *type_str,
+ goto out;
+ }
+
++ _dbus_assert (struct_depth + dict_entry_depth >= 1);
++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets));
++ _dbus_assert (opened_brackets[struct_depth + dict_entry_depth - 1] == '\0');
++ opened_brackets[struct_depth + dict_entry_depth - 1] = DBUS_STRUCT_BEGIN_CHAR;
+ break;
+
+ case DBUS_STRUCT_END_CHAR:
+@@ -151,9 +161,20 @@ _dbus_validate_signature_with_reason (const DBusString *type_str,
+ goto out;
+ }
+
++ _dbus_assert (struct_depth + dict_entry_depth >= 1);
++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets));
++ last_bracket = opened_brackets[struct_depth + dict_entry_depth - 1];
++
++ if (last_bracket != DBUS_STRUCT_BEGIN_CHAR)
++ {
++ result = DBUS_INVALID_STRUCT_ENDED_BUT_NOT_STARTED;
++ goto out;
++ }
++
+ _dbus_list_pop_last (&element_count_stack);
+
+ struct_depth -= 1;
++ opened_brackets[struct_depth + dict_entry_depth] = '\0';
+ break;
+
+ case DBUS_DICT_ENTRY_BEGIN_CHAR:
+@@ -178,6 +199,10 @@ _dbus_validate_signature_with_reason (const DBusString *type_str,
+ goto out;
+ }
+
++ _dbus_assert (struct_depth + dict_entry_depth >= 1);
++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets));
++ _dbus_assert (opened_brackets[struct_depth + dict_entry_depth - 1] == '\0');
++ opened_brackets[struct_depth + dict_entry_depth - 1] = DBUS_DICT_ENTRY_BEGIN_CHAR;
+ break;
+
+ case DBUS_DICT_ENTRY_END_CHAR:
+@@ -186,8 +211,19 @@ _dbus_validate_signature_with_reason (const DBusString *type_str,
+ result = DBUS_INVALID_DICT_ENTRY_ENDED_BUT_NOT_STARTED;
+ goto out;
+ }
+-
++
++ _dbus_assert (struct_depth + dict_entry_depth >= 1);
++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets));
++ last_bracket = opened_brackets[struct_depth + dict_entry_depth - 1];
++
++ if (last_bracket != DBUS_DICT_ENTRY_BEGIN_CHAR)
++ {
++ result = DBUS_INVALID_DICT_ENTRY_ENDED_BUT_NOT_STARTED;
++ goto out;
++ }
++
+ dict_entry_depth -= 1;
++ opened_brackets[struct_depth + dict_entry_depth] = '\0';
+
+ element_count =
+ _DBUS_POINTER_TO_INT (_dbus_list_pop_last (&element_count_stack));
+--
+2.34.1
+
diff --git a/meta/recipes-core/dbus/dbus_1.14.0.bb b/meta/recipes-core/dbus/dbus_1.14.0.bb
index 7598c45f8e..4577da782c 100644
--- a/meta/recipes-core/dbus/dbus_1.14.0.bb
+++ b/meta/recipes-core/dbus/dbus_1.14.0.bb
@@ -13,6 +13,7 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \
file://run-ptest \
file://tmpdir.patch \
file://dbus-1.init \
+ file://0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch \
"
SRC_URI[sha256sum] = "ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 02/35] dbus: fix CVE-2022-42011 dbus-daemon can be crashed by messages with array length inconsistent with element type
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 01/35] dbus: fix CVE-2022-42010 Check brackets in signature nest correctly Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 03/35] dbus: fix CVE-2022-42012 dbus-marshal-byteswap: Byte-swap Unix fd indexes if needed Steve Sakoman
` (32 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
From: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
Backport a patch from upstream[1] to fix CVE-2022-42011 dbus-daemon can be crashed by messages with array length inconsistent with element type
[1] https://gitlab.freedesktop.org/dbus/dbus/-/commit/b9e6a7523085a2cfceaffca7ba1ab4251f12a984
Signed-off-by: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...idate-Validate-length-of-arrays-of-f.patch | 61 +++++++++++++++++++
meta/recipes-core/dbus/dbus_1.14.0.bb | 1 +
2 files changed, 62 insertions(+)
create mode 100644 meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch
diff --git a/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch
new file mode 100644
index 0000000000..f953326f78
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch
@@ -0,0 +1,61 @@
+From b9e6a7523085a2cfceaffca7ba1ab4251f12a984 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Mon, 12 Sep 2022 13:14:18 +0100
+Subject: [PATCH] dbus-marshal-validate: Validate length of arrays of
+ fixed-length items
+
+This fast-path previously did not check that the array was made up
+of an integer number of items. This could lead to assertion failures
+and out-of-bounds accesses during subsequent message processing (which
+assumes that the message has already been validated), particularly after
+the addition of _dbus_header_remove_unknown_fields(), which makes it
+more likely that dbus-daemon will apply non-trivial edits to messages.
+
+Thanks: Evgeny Vereshchagin
+Fixes: e61f13cf "Bug 18064 - more efficient validation for fixed-size type arrays"
+Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/413
+Resolves: CVE-2022-42011
+
+Upstream-Status: Backport from
+[https://gitlab.freedesktop.org/dbus/dbus/-/commit/b9e6a7523085a2cfceaffca7ba1ab4251f12a984]
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+(cherry picked from commit 079bbf16186e87fb0157adf8951f19864bc2ed69)
+Signed-off-by: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
+---
+ dbus/dbus-marshal-validate.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c
+index ae68414d..7d0d6cf7 100644
+--- a/dbus/dbus-marshal-validate.c
++++ b/dbus/dbus-marshal-validate.c
+@@ -503,13 +503,24 @@ validate_body_helper (DBusTypeReader *reader,
+ */
+ if (dbus_type_is_fixed (array_elem_type))
+ {
++ /* Note that fixed-size types all have sizes equal to
++ * their alignments, so this is really the item size. */
++ alignment = _dbus_type_get_alignment (array_elem_type);
++ _dbus_assert (alignment == 1 || alignment == 2 ||
++ alignment == 4 || alignment == 8);
++
++ /* Because the alignment is a power of 2, this is
++ * equivalent to: (claimed_len % alignment) != 0,
++ * but avoids slower integer division */
++ if ((claimed_len & (alignment - 1)) != 0)
++ return DBUS_INVALID_ARRAY_LENGTH_INCORRECT;
++
+ /* bools need to be handled differently, because they can
+ * have an invalid value
+ */
+ if (array_elem_type == DBUS_TYPE_BOOLEAN)
+ {
+ dbus_uint32_t v;
+- alignment = _dbus_type_get_alignment (array_elem_type);
+
+ while (p < array_end)
+ {
+--
+2.34.1
+
diff --git a/meta/recipes-core/dbus/dbus_1.14.0.bb b/meta/recipes-core/dbus/dbus_1.14.0.bb
index 4577da782c..e1efa9e058 100644
--- a/meta/recipes-core/dbus/dbus_1.14.0.bb
+++ b/meta/recipes-core/dbus/dbus_1.14.0.bb
@@ -14,6 +14,7 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \
file://tmpdir.patch \
file://dbus-1.init \
file://0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch \
+ file://0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch \
"
SRC_URI[sha256sum] = "ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 03/35] dbus: fix CVE-2022-42012 dbus-marshal-byteswap: Byte-swap Unix fd indexes if needed
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 01/35] dbus: fix CVE-2022-42010 Check brackets in signature nest correctly Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 02/35] dbus: fix CVE-2022-42011 dbus-daemon can be crashed by messages with array length inconsistent with element type Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 04/35] systemd: CVE-2022-3821 Fix buffer overrun Steve Sakoman
` (31 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
From: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
Backport a patch from upstream [1] to fix CVE-2022-42012
dbus-marshal-byteswap: Byte-swap Unix fd indexes if needed
[1] https://gitlab.freedesktop.org/dbus/dbus/-/commit/3fb065b0752db1e298e4ada52cf4adc414f5e946
Signed-off-by: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...eswap-Byte-swap-Unix-fd-indexes-if-n.patch | 76 +++++++++++++++++++
meta/recipes-core/dbus/dbus_1.14.0.bb | 1 +
2 files changed, 77 insertions(+)
create mode 100644 meta/recipes-core/dbus/dbus/0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch
diff --git a/meta/recipes-core/dbus/dbus/0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch
new file mode 100644
index 0000000000..47f4f1e0d3
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch
@@ -0,0 +1,76 @@
+From 3fb065b0752db1e298e4ada52cf4adc414f5e946 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Fri, 30 Sep 2022 13:46:31 +0100
+Subject: [PATCH] dbus-marshal-byteswap: Byte-swap Unix fd indexes if needed
+
+When a D-Bus message includes attached file descriptors, the body of the
+message contains unsigned 32-bit indexes pointing into an out-of-band
+array of file descriptors. Some D-Bus APIs like GLib's GDBus refer to
+these indexes as "handles" for the associated fds (not to be confused
+with a Windows HANDLE, which is a kernel object).
+
+The assertion message removed by this commit is arguably correct up to
+a point: fd-passing is only reasonable on a local machine, and no known
+operating system allows processes of differing endianness even on a
+multi-endian ARM or PowerPC CPU, so it makes little sense for the sender
+to specify a byte-order that differs from the byte-order of the recipient.
+
+However, this doesn't account for the fact that a malicious sender
+doesn't have to restrict itself to only doing things that make sense.
+On a system with untrusted local users, a message sender could crash
+the system dbus-daemon (a denial of service) by sending a message in
+the opposite endianness that contains handles to file descriptors.
+
+Before this commit, if assertions are enabled, attempting to byteswap
+a fd index would cleanly crash the message recipient with an assertion
+failure. If assertions are disabled, attempting to byteswap a fd index
+would silently do nothing without advancing the pointer p, causing the
+message's type and the pointer into its contents to go out of sync, which
+can result in a subsequent crash (the crash demonstrated by fuzzing was
+a use-after-free, but other failure modes might be possible).
+
+In principle we could resolve this by rejecting wrong-endianness messages
+from a local sender, but it's actually simpler and less code to treat
+wrong-endianness messages as valid and byteswap them.
+
+Thanks: Evgeny Vereshchagin
+Fixes: ba7daa60 "unix-fd: add basic marshalling code for unix fds"
+Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/417
+Resolves: CVE-2022-42012
+
+Upstream-Status: Backport from [https://gitlab.freedesktop.org/dbus/dbus/-/commit/3fb065b0752db1e298e4ada52cf4adc414f5e946]
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+(cherry picked from commit 236f16e444e88a984cf12b09225e0f8efa6c5b44)
+Signed-off-by: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
+---
+ dbus/dbus-marshal-byteswap.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/dbus/dbus-marshal-byteswap.c b/dbus/dbus-marshal-byteswap.c
+index 27695aaf..7104e9c6 100644
+--- a/dbus/dbus-marshal-byteswap.c
++++ b/dbus/dbus-marshal-byteswap.c
+@@ -61,6 +61,7 @@ byteswap_body_helper (DBusTypeReader *reader,
+ case DBUS_TYPE_BOOLEAN:
+ case DBUS_TYPE_INT32:
+ case DBUS_TYPE_UINT32:
++ case DBUS_TYPE_UNIX_FD:
+ {
+ p = _DBUS_ALIGN_ADDRESS (p, 4);
+ *((dbus_uint32_t*)p) = DBUS_UINT32_SWAP_LE_BE (*((dbus_uint32_t*)p));
+@@ -188,11 +189,6 @@ byteswap_body_helper (DBusTypeReader *reader,
+ }
+ break;
+
+- case DBUS_TYPE_UNIX_FD:
+- /* fds can only be passed on a local machine, so byte order must always match */
+- _dbus_assert_not_reached("attempted to byteswap unix fds which makes no sense");
+- break;
+-
+ default:
+ _dbus_assert_not_reached ("invalid typecode in supposedly-validated signature");
+ break;
+--
+2.34.1
+
diff --git a/meta/recipes-core/dbus/dbus_1.14.0.bb b/meta/recipes-core/dbus/dbus_1.14.0.bb
index e1efa9e058..484629e987 100644
--- a/meta/recipes-core/dbus/dbus_1.14.0.bb
+++ b/meta/recipes-core/dbus/dbus_1.14.0.bb
@@ -15,6 +15,7 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \
file://dbus-1.init \
file://0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch \
file://0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch \
+ file://0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch \
"
SRC_URI[sha256sum] = "ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 04/35] systemd: CVE-2022-3821 Fix buffer overrun
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (2 preceding siblings ...)
2022-11-20 14:14 ` [OE-core][kirkstone 03/35] dbus: fix CVE-2022-42012 dbus-marshal-byteswap: Byte-swap Unix fd indexes if needed Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 05/35] Revert "expat: backport the fix for CVE-2022-43680" Steve Sakoman
` (30 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
From: Hitendra Prajapati <hprajapati@mvista.com>
Upstream-Status: Backport from https://github.com/systemd/systemd-stable/commit/72d4c15a946d20143cd4c6783c802124bc894dc7
Affects "systemd <= 251"
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../systemd/systemd/CVE-2022-3821.patch | 45 +++++++++++++++++++
meta/recipes-core/systemd/systemd_250.5.bb | 1 +
2 files changed, 46 insertions(+)
create mode 100644 meta/recipes-core/systemd/systemd/CVE-2022-3821.patch
diff --git a/meta/recipes-core/systemd/systemd/CVE-2022-3821.patch b/meta/recipes-core/systemd/systemd/CVE-2022-3821.patch
new file mode 100644
index 0000000000..eb8b0cba12
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/CVE-2022-3821.patch
@@ -0,0 +1,45 @@
+From bff52d96598956163d73b7c7bdec7b0ad5b3c2d4 Mon Sep 17 00:00:00 2001
+From: Hitendra Prajapati <hprajapati@mvista.com>
+Date: Tue, 15 Nov 2022 16:52:03 +0530
+Subject: [PATCH] CVE-2022-3821
+
+Upstream-Status: Backport [https://github.com/systemd/systemd-stable/commit/72d4c15a946d20143cd4c6783c802124bc894dc7]
+CVE: CVE-2022-3821
+Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
+---
+ src/basic/time-util.c | 2 +-
+ src/test/test-time-util.c | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/basic/time-util.c b/src/basic/time-util.c
+index b659d6905d..89dc593d44 100644
+--- a/src/basic/time-util.c
++++ b/src/basic/time-util.c
+@@ -588,7 +588,7 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
+ t = b;
+ }
+
+- n = MIN((size_t) k, l);
++ n = MIN((size_t) k, l-1);
+
+ l -= n;
+ p += n;
+diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
+index 4d0131827e..8db6b25279 100644
+--- a/src/test/test-time-util.c
++++ b/src/test/test-time-util.c
+@@ -238,6 +238,11 @@ TEST(format_timespan) {
+ test_format_timespan_accuracy(1);
+ test_format_timespan_accuracy(USEC_PER_MSEC);
+ test_format_timespan_accuracy(USEC_PER_SEC);
++
++ /* See issue #23928. */
++ _cleanup_free_ char *buf;
++ assert_se(buf = new(char, 5));
++ assert_se(buf == format_timespan(buf, 5, 100005, 1000));
+ }
+
+ TEST(verify_timezone) {
+--
+2.25.1
+
diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb
index 5d568f639e..8b6d0e8580 100644
--- a/meta/recipes-core/systemd/systemd_250.5.bb
+++ b/meta/recipes-core/systemd/systemd_250.5.bb
@@ -25,6 +25,7 @@ SRC_URI += "file://touchscreen.rules \
file://0003-implment-systemd-sysv-install-for-OE.patch \
file://0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \
file://0001-resolve-Use-sockaddr-pointer-type-for-bind.patch \
+ file://CVE-2022-3821.patch \
"
# patches needed by musl
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 05/35] Revert "expat: backport the fix for CVE-2022-43680"
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (3 preceding siblings ...)
2022-11-20 14:14 ` [OE-core][kirkstone 04/35] systemd: CVE-2022-3821 Fix buffer overrun Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 06/35] expat: upgrade to 2.5.0 Steve Sakoman
` (29 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
Prepare for version bump which includes this fix
This reverts commit 791fe354e5887af3fa3d3f772fafacc5eaedca21.
---
.../expat/expat/CVE-2022-43680.patch | 33 -------------------
meta/recipes-core/expat/expat_2.4.9.bb | 1 -
2 files changed, 34 deletions(-)
delete mode 100644 meta/recipes-core/expat/expat/CVE-2022-43680.patch
diff --git a/meta/recipes-core/expat/expat/CVE-2022-43680.patch b/meta/recipes-core/expat/expat/CVE-2022-43680.patch
deleted file mode 100644
index 76c55edc76..0000000000
--- a/meta/recipes-core/expat/expat/CVE-2022-43680.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-CVE: CVE-2022-43680
-Upstream-Status: Backport [5290462a7ea1278a8d5c0d5b2860d4e244f997e4]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 5290462a7ea1278a8d5c0d5b2860d4e244f997e4 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 20 Sep 2022 02:44:34 +0200
-Subject: [PATCH] lib: Fix overeager DTD destruction in
- XML_ExternalEntityParserCreate
-
----
- expat/lib/xmlparse.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/lib/xmlparse.c b/lib/xmlparse.c
-index aacd6e7fc..57bf103cc 100644
---- a/lib/xmlparse.c
-+++ b/lib/xmlparse.c
-@@ -1068,6 +1068,14 @@ parserCreate(const XML_Char *encodingName,
- parserInit(parser, encodingName);
-
- if (encodingName && ! parser->m_protocolEncodingName) {
-+ if (dtd) {
-+ // We need to stop the upcoming call to XML_ParserFree from happily
-+ // destroying parser->m_dtd because the DTD is shared with the parent
-+ // parser and the only guard that keeps XML_ParserFree from destroying
-+ // parser->m_dtd is parser->m_isParamEntity but it will be set to
-+ // XML_TRUE only later in XML_ExternalEntityParserCreate (or not at all).
-+ parser->m_dtd = NULL;
-+ }
- XML_ParserFree(parser);
- return NULL;
- }
diff --git a/meta/recipes-core/expat/expat_2.4.9.bb b/meta/recipes-core/expat/expat_2.4.9.bb
index 22f9845a99..cb007708c7 100644
--- a/meta/recipes-core/expat/expat_2.4.9.bb
+++ b/meta/recipes-core/expat/expat_2.4.9.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7b3b078238d0901d3b339289117cb7fb"
VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}"
SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2 \
- file://CVE-2022-43680.patch \
file://run-ptest \
"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 06/35] expat: upgrade to 2.5.0
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (4 preceding siblings ...)
2022-11-20 14:14 ` [OE-core][kirkstone 05/35] Revert "expat: backport the fix for CVE-2022-43680" Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 07/35] lttng-tools: Upgrade 2.13.4 -> 2.13.8 Steve Sakoman
` (28 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
Release 2.5.0 Tue October 25 2022
Security fixes:
#616 #649 #650 CVE-2022-43680 -- Fix heap use-after-free after overeager
destruction of a shared DTD in function
XML_ExternalEntityParserCreate in out-of-memory situations.
Expected impact is denial of service or potentially
arbitrary code execution.
Bug fixes:
#612 #645 Fix curruption from undefined entities
#613 #654 Fix case when parsing was suspended while processing nested
entities
#616 #652 #653 Stop leaking opening tag bindings after a closing tag
mismatch error where a parser is reset through
XML_ParserReset and then reused to parse
#656 CMake: Fix generation of pkg-config file
#658 MinGW|CMake: Fix static library name
Other changes:
#663 Protect header expat_config.h from multiple inclusion
#666 examples: Make use of XML_GetBuffer and be more
consistent across examples
#648 Address compiler warnings
#667 #668 Version info bumped from 9:9:8 to 9:10:8;
see https://verbump.de/ for what these numbers do
Includes a fix for CVE-2022-43680.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a257a674272dc638f09167e9b9202adfb477ef1e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/expat/{expat_2.4.9.bb => expat_2.5.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/expat/{expat_2.4.9.bb => expat_2.5.0.bb} (91%)
diff --git a/meta/recipes-core/expat/expat_2.4.9.bb b/meta/recipes-core/expat/expat_2.5.0.bb
similarity index 91%
rename from meta/recipes-core/expat/expat_2.4.9.bb
rename to meta/recipes-core/expat/expat_2.5.0.bb
index cb007708c7..7080f934d1 100644
--- a/meta/recipes-core/expat/expat_2.4.9.bb
+++ b/meta/recipes-core/expat/expat_2.5.0.bb
@@ -14,7 +14,7 @@ SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TA
UPSTREAM_CHECK_URI = "https://github.com/libexpat/libexpat/releases/"
-SRC_URI[sha256sum] = "7f44d1469b110773a94b0d5abeeeffaef79f8bd6406b07e52394bcf48126437a"
+SRC_URI[sha256sum] = "6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67"
EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 07/35] lttng-tools: Upgrade 2.13.4 -> 2.13.8
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (5 preceding siblings ...)
2022-11-20 14:14 ` [OE-core][kirkstone 06/35] expat: upgrade to 2.5.0 Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 08/35] lttng-tools: submit determinism.patch upstream Steve Sakoman
` (27 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
From: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb} | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/lttng/{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb} (90%)
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
similarity index 90%
rename from meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
index 0ea4da05ce..a814eb79f9 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
@@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
file://disable-tests.patch \
"
-SRC_URI[sha256sum] = "565f3102410a53d484f4c8ff517978f1dc59f67f9d16f872f4357f3ca12200f6"
+SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1"
inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
@@ -113,7 +113,7 @@ do_install_ptest () {
for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do
cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f
case $f in
- *.so|userspace-probe-elf-binary)
+ *.so|userspace-probe-elf-*)
install -d ${D}${PTEST_PATH}/tests/$d/
ln -s ../$f ${D}${PTEST_PATH}/tests/$d/$f
# Remove any rpath/runpath to pass QA check.
@@ -124,6 +124,7 @@ do_install_ptest () {
done
chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary
+ chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary
chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so
chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so
@@ -185,4 +186,10 @@ do_install_ptest () {
INHIBIT_PACKAGE_STRIP_FILES = "\
${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \
${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \
+ ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary \
+ ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/.libs/userspace-probe-elf-cxx-binary \
+ ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/gen-syscall-events \
+ ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/.libs/gen-syscall-events \
+ ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack \
+ ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/.libs/gen-syscall-events-callstack \
"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 08/35] lttng-tools: submit determinism.patch upstream
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (6 preceding siblings ...)
2022-11-20 14:14 ` [OE-core][kirkstone 07/35] lttng-tools: Upgrade 2.13.4 -> 2.13.8 Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 09/35] lttng-modules: upgrade 2.13.5 -> 2.13.7 Steve Sakoman
` (26 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit bec62455d900a0d3e18a62ea7053c214bc545fb6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-kernel/lttng/lttng-tools/determinism.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch b/meta/recipes-kernel/lttng/lttng-tools/determinism.patch
index b2ab880bd6..0a897a8e13 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/determinism.patch
@@ -13,7 +13,7 @@ to me whether the tests need that or not.
Fixes reproducibility issues for lttng-tools.
-Upstream-Status: Pending [needs discussion with upstream about the correct solution]
+Upstream-Status: Submitted [https://bugs.lttng.org/issues/1361 - needs discussion with upstream about the correct solution]
RP 2021/3/1
Index: lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 09/35] lttng-modules: upgrade 2.13.5 -> 2.13.7
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (7 preceding siblings ...)
2022-11-20 14:14 ` [OE-core][kirkstone 08/35] lttng-tools: submit determinism.patch upstream Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:14 ` [OE-core][kirkstone 10/35] bind: upgrade 9.18.7 -> 9.18.8 Steve Sakoman
` (25 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-09-30 (National Day for Truth and Reconciliation) LTTng modules 2.13.7
* Fix: handle integer capture page faults as skip field
2022-09-30 (National Day for Truth and Reconciliation) LTTng modules 2.13.6
* Fix: bytecode validator: reject specialized load field/context ref instructions
* Fix: bytecode validator: reject specialized load instructions
* Fix: honor "user" attribute for array/sequence of user integers
* wrapper: powerpc64: fix kernel crash caused by do_get_kallsyms
* Fix: event notification: Remove duplicate event enabled check
* Fix: event notification capture: validate buffer length
* Fix: handle capture page faults as skip field
* Fix: event notification capture error handling
* Fix: capture_sequence_element_{un,}signed: handle user-space input
* Fix: notification capture: handle userspace strings
* Implement lttng_msgpack_write_user_str
* Fix: bytecode interpreter: LOAD_FIELD: handle user fields
* Fix: move "user" attribute from field to type
* Introduce lttng_copy_from_user_check_nofault
* fix: adjust range v5.10.137 in block probe
Remove "fix: adjust range v5.10.137 in block probe" and "wrapper: powerpc64: fix kernel
crash caused by do_get_kallsyms" since they are included in this version bump.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 1243d6afc075e3c89ca69af214e70c0d159cb832)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...djust-range-v5.10.137-in-block-probe.patch | 92 ------------------
...4-fix-kernel-crash-caused-by-do_get_.patch | 94 -------------------
...ules_2.13.5.bb => lttng-modules_2.13.7.bb} | 4 +-
3 files changed, 1 insertion(+), 189 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch
rename meta/recipes-kernel/lttng/{lttng-modules_2.13.5.bb => lttng-modules_2.13.7.bb} (86%)
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch
deleted file mode 100644
index 1c3918be5c..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 5dab3d515b6f5c5ac80c8e7674628495e3bf4ac6 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 22 Aug 2022 14:16:27 -0400
-Subject: [PATCH] fix: adjust range v5.10.137 in block probe
-
-See upstream commit, backported in v5.10.137 :
-
-commit 1cb3032406423b25aa984854b4d78e0100d292dd
-Author: Christoph Hellwig <hch@lst.de>
-Date: Thu Dec 3 17:21:39 2020 +0100
-
- block: remove the request_queue to argument request based tracepoints
-
- [ Upstream commit a54895fa057c67700270777f7661d8d3c7fda88a ]
-
- The request_queue can trivially be derived from the request.
-
-Change-Id: I01f96a437641421faf993b4b031171c372bd0374
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-
-Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/5dab3d515b6f5c5ac80c8e7674628495e3bf4ac6]
-Signed-off-by: Steve Sakoman <steve@sakoman.com>
-
----
- include/instrumentation/events/block.h | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h
-index 882e6e08..d4821c12 100644
---- a/include/instrumentation/events/block.h
-+++ b/include/instrumentation/events/block.h
-@@ -366,7 +366,8 @@ LTTNG_TRACEPOINT_EVENT(block_rq_requeue,
- lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
- )
- )
--#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
- /**
- * block_rq_requeue - place block IO request back on a queue
- * @rq: block IO operation request
-@@ -611,7 +612,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
- ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
- )
- )
--#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
- LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
-
- TP_PROTO(struct request *rq),
-@@ -746,7 +748,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
- )
- #endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */
-
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
- /**
- * block_rq_insert - insert block operation request into queue
- * @rq: block IO operation request
-@@ -781,7 +784,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert,
- )
- #endif
-
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
- /**
- * block_rq_issue - issue pending block IO request operation to device driver
- * @rq: block IO operation operation request
-@@ -812,7 +816,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_issue,
- )
- #endif
-
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
- /**
- * block_rq_merge - merge request with another one in the elevator
- * @rq: block IO operation operation request
-@@ -1632,7 +1637,8 @@ LTTNG_TRACEPOINT_EVENT(block_rq_remap,
- lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
- )
- )
--#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
-+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
- /**
- * block_rq_remap - map request for a block operation request
- * @rq: block IO operation request
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch
deleted file mode 100644
index b3b191c7ac..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 480cce4315ce5bf59a509e8a53a52545f393de68 Mon Sep 17 00:00:00 2001
-From: He Zhe <zhe.he@windriver.com>
-Date: Tue, 27 Sep 2022 15:59:42 +0800
-Subject: [PATCH] wrapper: powerpc64: fix kernel crash caused by
- do_get_kallsyms
-
-Kernel crashes on powerpc64 ABIv2 as follow when lttng_tracer initializes,
-since do_get_kallsyms in lttng_wrapper fails to return a proper address of
-kallsyms_lookup_name.
-
-root@qemuppc64:~# lttng create trace_session --live -U net://127.0.0.1
-Spawning a session daemon
-lttng_kretprobes: loading out-of-tree module taints kernel.
-BUG: Unable to handle kernel data access on read at 0xfffffffffffffff8
-Faulting instruction address: 0xc0000000001f6fd0
-Oops: Kernel access of bad area, sig: 11 [#1]
-<snip>
-NIP [c0000000001f6fd0] module_kallsyms_lookup_name+0xf0/0x180
-LR [c0000000001f6f28] module_kallsyms_lookup_name+0x48/0x180
-Call Trace:
-module_kallsyms_lookup_name+0x34/0x180 (unreliable)
-kallsyms_lookup_name+0x258/0x2b0
-wrapper_kallsyms_lookup_name+0x4c/0xd0 [lttng_wrapper]
-wrapper_get_pfnblock_flags_mask_init+0x28/0x60 [lttng_wrapper]
-lttng_events_init+0x40/0x344 [lttng_tracer]
-do_one_initcall+0x78/0x340
-do_init_module+0x6c/0x2f0
-__do_sys_finit_module+0xd0/0x120
-system_call_exception+0x194/0x2f0
-system_call_vectored_common+0xe8/0x278
-<snip>
-
-do_get_kallsyms makes use of kprobe_register and in turn kprobe_lookup_name
-to get the address of the kernel function kallsyms_lookup_name. In case of
-PPC64_ELF_ABI_v2, when kprobes are placed at function entry,
-kprobe_lookup_name adjusts the global entry point of the function returned
-by kallsyms_lookup_name to the local entry point(at some fixed offset of
-global one). This adjustment is all for kprobes to be able to work properly.
-Global and local entry point are defined in powerpc64 ABIv2.
-
-When the local entry point is given, some instructions at the beginning of
-the function are skipped and thus causes the above kernel crash. We just
-want to make a simple function call which needs global entry point.
-
-This patch adds 4 bytes which is the length of one instruction to
-kallsyms_lookup_name so that it will not trigger the global to local
-adjustment, and then substracts 4 bytes from the returned address. See the
-following kernel change for more details.
-
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=290e3070762ac80e5fc4087d8c4de7e3f1d90aca
-
-Upstream-Status: Backport
-
-Signed-off-by: He Zhe <zhe.he@windriver.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Change-Id: I34e68e886b97e3976d0b5e25be295a8bb866c1a4
----
- src/wrapper/kallsyms.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/wrapper/kallsyms.c b/src/wrapper/kallsyms.c
-index d2848764..93017adc 100644
---- a/src/wrapper/kallsyms.c
-+++ b/src/wrapper/kallsyms.c
-@@ -39,10 +39,26 @@ unsigned long do_get_kallsyms(void)
- memset(&probe, 0, sizeof(probe));
- probe.pre_handler = dummy_kprobe_handler;
- probe.symbol_name = "kallsyms_lookup_name";
-+#ifdef PPC64_ELF_ABI_v2
-+ /*
-+ * With powerpc64 ABIv2, we need the global entry point of
-+ * kallsyms_lookup_name to call it later, while kprobe_register would
-+ * automatically adjust the global entry point to the local entry point,
-+ * when a kprobe was registered at a function entry. So we add 4 bytes
-+ * which is the length of one instruction to kallsyms_lookup_name to
-+ * avoid the adjustment.
-+ */
-+ probe.offset = 4;
-+#endif
- ret = register_kprobe(&probe);
- if (ret)
- return 0;
-+#ifdef PPC64_ELF_ABI_v2
-+ /* Substract 4 bytes to get what we originally want */
-+ addr = (unsigned long)(((char *)probe.addr) - 4);
-+#else
- addr = (unsigned long)probe.addr;
-+#endif
- #ifdef CONFIG_ARM
- #ifdef CONFIG_THUMB2_KERNEL
- if (addr)
---
-2.17.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb
similarity index 86%
rename from meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb
index 307fb912cf..49c584dff4 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb
@@ -11,14 +11,12 @@ include lttng-platforms.inc
SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0009-Rename-genhd-wrapper-to-blkdev.patch \
- file://0001-fix-adjust-range-v5.10.137-in-block-probe.patch \
- file://0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch \
"
# Use :append here so that the patch is applied also when using devupstream
SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch"
-SRC_URI[sha256sum] = "eceb3428d80e85a9f008425beb9526195c9f7f02b302f28add56df53aef3e708"
+SRC_URI[sha256sum] = "5a99679df7903160cbde3918fee5af90ffafc90fc96ccdefaa57cf230492b234"
export INSTALL_MOD_DIR="kernel/lttng-modules"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 10/35] bind: upgrade 9.18.7 -> 9.18.8
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (8 preceding siblings ...)
2022-11-20 14:14 ` [OE-core][kirkstone 09/35] lttng-modules: upgrade 2.13.5 -> 2.13.7 Steve Sakoman
@ 2022-11-20 14:14 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 11/35] socat: upgrade 1.7.4.3 -> 1.7.4.4 Steve Sakoman
` (24 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:14 UTC (permalink / raw)
To: openembedded-core
From: Wang Mingyu <wangmy@fujitsu.com>
Changelog:
https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_18_8/CHANGES
--- 9.18.7 released ---
5962. [security] Fix memory leak in EdDSA verify processing.
(CVE-2022-38178) [GL #3487]
5960. [security] Fix serve-stale crash that could happen when
stale-answer-client-timeout was set to 0 and there was
a stale CNAME in the cache for an incoming query.
(CVE-2022-3080) [GL #3517]
5959. [security] Fix memory leaks in the DH code when using OpenSSL 3.0.0
and later versions. The openssldh_compare(),
openssldh_paramcompare(), and openssldh_todns()
functions were affected. (CVE-2022-2906) [GL #3491]
5958. [security] When an HTTP connection was reused to get
statistics from the stats channel, and zlib
compression was in use, each successive
response sent larger and larger blocks of memory,
potentially reading past the end of the allocated
buffer. (CVE-2022-2881) [GL #3493]
5957. [security] Prevent excessive resource use while processing large
delegations. (CVE-2022-2795) [GL #3394]
5956. [func] Make RRL code treat all QNAMEs that are subject to
wildcard processing within a given zone as the same
name. [GL #3459]
5955. [port] The libxml2 library has deprecated the usage of
xmlInitThreads() and xmlCleanupThreads() functions. Use
xmlInitParser() and xmlCleanupParser() instead.
[GL #3518]
5954. [func] Fallback to IDNA2003 processing in dig when IDNA2008
conversion fails. [GL #3485]
5953. [bug] Fix a crash on shutdown in delete_trace_entry(). Add
mctx attach/detach pair to make sure that the memory
context used by a memory pool is not destroyed before
the memory pool itself. [GL #3515]
5952. [bug] Use quotes around address strings in YAML output.
[GL #3511]
5951. [bug] In some cases, the dnstap query_message field was
erroneously set when logging response messages.
[GL #3501]
5948. [bug] Fix nsec3.c:dns_nsec3_activex() function, add a missing
dns_db_detachnode() call. [GL #3500]
5947. [func] Change dnssec-policy to allow graceful transition from
an NSEC only zone to NSEC3. [GL #3486]
5946. [bug] Fix statistics channel's handling of multiple HTTP
requests in a single connection which have non-empty
request bodies. [GL #3463]
5945. [bug] If parsing /etc/bind.key failed, delv could assert
when trying to parse the built in trust anchors as
the parser hadn't been reset. [GL !6468]
5944. [bug] Fix +http-plain-get and +http-plain-post options
support in dig. Thanks to Marco Davids at SIDN for
reporting the problem. [GL !6672]
5942. [bug] Fix tkey.c:buildquery() function's error handling by
adding the missing cleanup code. [GL #3492]
5941. [func] Zones with dnssec-policy now require dynamic DNS or
inline-siging to be configured explicitly. [GL #3381]
5938. [bug] An integer type overflow could cause an assertion
failure when freeing memory. [GL #3483]
5936. [bug] Don't enable serve-stale for lookups that error because
it is a duplicate query or a query that would be
dropped. [GL #2982]
5935. [bug] Fix DiG lookup reference counting bug, which could
be observed in NSSEARCH mode. [GL #3478]
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 1d87d2652f7f6640dda85e037c580c83f99a8ba8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../0001-avoid-start-failure-with-bind-user.patch | 0
.../0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0
| 0
.../bind/{bind-9.18.7 => bind-9.18.8}/bind9 | 0
.../bind/{bind-9.18.7 => bind-9.18.8}/conf.patch | 0
.../bind/{bind-9.18.7 => bind-9.18.8}/generate-rndc-key.sh | 0
.../init.d-add-support-for-read-only-rootfs.patch | 0
.../make-etc-initd-bind-stop-work.patch | 0
.../bind/{bind-9.18.7 => bind-9.18.8}/named.service | 0
.../bind/{bind_9.18.7.bb => bind_9.18.8.bb} | 2 +-
10 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/0001-avoid-start-failure-with-bind-user.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/bind9 (100%)
rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/conf.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/generate-rndc-key.sh (100%)
rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/init.d-add-support-for-read-only-rootfs.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/make-etc-initd-bind-stop-work.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/named.service (100%)
rename meta/recipes-connectivity/bind/{bind_9.18.7.bb => bind_9.18.8.bb} (97%)
diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/0001-avoid-start-failure-with-bind-user.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/0001-named-lwresd-V-and-start-log-hide-build-options.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/bind-ensure-searching-for-json-headers-searches-sysr.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/bind9 b/meta/recipes-connectivity/bind/bind-9.18.8/bind9
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/bind9
rename to meta/recipes-connectivity/bind/bind-9.18.8/bind9
diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/conf.patch b/meta/recipes-connectivity/bind/bind-9.18.8/conf.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/conf.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/conf.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/generate-rndc-key.sh
rename to meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh
diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/init.d-add-support-for-read-only-rootfs.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/make-etc-initd-bind-stop-work.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/named.service b/meta/recipes-connectivity/bind/bind-9.18.8/named.service
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/named.service
rename to meta/recipes-connectivity/bind/bind-9.18.8/named.service
diff --git a/meta/recipes-connectivity/bind/bind_9.18.7.bb b/meta/recipes-connectivity/bind/bind_9.18.8.bb
similarity index 97%
rename from meta/recipes-connectivity/bind/bind_9.18.7.bb
rename to meta/recipes-connectivity/bind/bind_9.18.8.bb
index 11c8a4e9d3..2964dc9963 100644
--- a/meta/recipes-connectivity/bind/bind_9.18.7.bb
+++ b/meta/recipes-connectivity/bind/bind_9.18.8.bb
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
file://0001-avoid-start-failure-with-bind-user.patch \
"
-SRC_URI[sha256sum] = "9e2acf1698f49d70ad12ffbad39ec6716a7da524e9ebd98429c7c70ba1262981"
+SRC_URI[sha256sum] = "0e3c3ab9378db84ba0f37073d67ba125ae4f2ff8daf366c9db287e3f1b2c35f0"
UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
# follow the ESV versions divisible by 2
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 11/35] socat: upgrade 1.7.4.3 -> 1.7.4.4
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (9 preceding siblings ...)
2022-11-20 14:14 ` [OE-core][kirkstone 10/35] bind: upgrade 9.18.7 -> 9.18.8 Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 12/35] libxcrypt: upgrade 4.4.28 -> 4.4.30 Steve Sakoman
` (23 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Wang Mingyu <wangmy@fujitsu.com>
1.7.4.4 is a bug fix release
0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
removed since it's included in 1.7.4.4
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit c00e9d66f0b8449ff1bf24546f232345eb6feebd)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...ck-getprotobynumber_r-with-AC_TRY_LI.patch | 35 -------------------
.../{socat_1.7.4.3.bb => socat_1.7.4.4.bb} | 6 ++--
2 files changed, 2 insertions(+), 39 deletions(-)
delete mode 100644 meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
rename meta/recipes-connectivity/socat/{socat_1.7.4.3.bb => socat_1.7.4.4.bb} (89%)
diff --git a/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch b/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
deleted file mode 100644
index fbfb0816dd..0000000000
--- a/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d67d6b4f981db9612d808bd723176a1d2996d53a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Mon, 17 Jan 2022 13:21:32 +0100
-Subject: [PATCH] configure.ac: check getprotobynumber_r with AC_TRY_LINK
-
-AC_TRY_COMPILE won't error out if the function is altogether absent
-(e.g. on linux musl C library), the test needs to link all the way.
-
-Upstream-Status: Submitted [via email to socat@dest-unreach.org]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d4acc9e..973a7f2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror)
- # getprotobynumber_r() is not standardized
- AC_MSG_CHECKING(for getprotobynumber_r() variant)
- AC_CACHE_VAL(sc_cv_getprotobynumber_r,
--[AC_TRY_COMPILE([#include <stddef.h>
-+[AC_TRY_LINK([#include <stddef.h>
- #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024,NULL);],
- [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux],
-- [AC_TRY_COMPILE([#include <stddef.h>
-+ [AC_TRY_LINK([#include <stddef.h>
- #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024);],
- [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris],
-- [AC_TRY_COMPILE([#include <stddef.h>
-+ [AC_TRY_LINK([#include <stddef.h>
- #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL);],
- [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX],
-
diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.3.bb b/meta/recipes-connectivity/socat/socat_1.7.4.4.bb
similarity index 89%
rename from meta/recipes-connectivity/socat/socat_1.7.4.3.bb
rename to meta/recipes-connectivity/socat/socat_1.7.4.4.bb
index a4a0a8933e..5a379380d1 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.4.3.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.4.4.bb
@@ -9,11 +9,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86"
-SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
- file://0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch \
- "
+SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007"
+SRC_URI[sha256sum] = "fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac"
inherit autotools
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 12/35] libxcrypt: upgrade 4.4.28 -> 4.4.30
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (10 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 11/35] socat: upgrade 1.7.4.3 -> 1.7.4.4 Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 13/35] sudo: upgrade 1.9.10 -> sudo 1.9.12p1 Steve Sakoman
` (22 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Wang Mingyu <wangmy@fujitsu.com>
Changelog:
==========
* configure: Restore ucontext api functionality check.
In c3f01c72b303cbbb0cc8983120677edee2f3fa4b the use of the ucontext api
in the main program was removed, and with it the configure check for it.
However, the ucontext api is still used in the "explicit_bzero" test and
thus this test still needs to be in place.
See also: https://bugs.gentoo.org/838172
* configure: Restore the functionality of the '--disable-symvers' switch.
Without this fix the build was simply broken, if symbol versioning was
disabled for any reason, e.g. whether the compiler nor the linker
supporting it, or if disabled on purpose by the user (issue #142).
* Fix variable name in crypt(3) for a datamember of 'struct crypt_data'
(issue #153).
* Add glibc-on-loongarch-lp64 (Loongson LA464 / LA664) entry to
libcrypt.minver. This was added in GNU libc 2.36.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 7da5dd3b43718b876645602b1a23c739cbe8016d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../{libxcrypt-compat_4.4.28.bb => libxcrypt-compat_4.4.30.bb} | 0
meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +-
.../libxcrypt/{libxcrypt_4.4.28.bb => libxcrypt_4.4.30.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.28.bb => libxcrypt-compat_4.4.30.bb} (100%)
rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.28.bb => libxcrypt_4.4.30.bb} (100%)
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.28.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.28.bb
rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
index 39ba2636ff..2bdedcba6d 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
inherit autotools pkgconfig
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
-SRCREV = "50cf2b6dd4fdf04309445f2eec8de7051d953abf"
+SRCREV = "fee2687bad66e351a3dcc963a34ae80125923ff8"
SRCBRANCH ?= "develop"
SRC_URI += "file://fix_cflags_handling.patch"
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.28.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.30.bb
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.28.bb
rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.30.bb
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 13/35] sudo: upgrade 1.9.10 -> sudo 1.9.12p1
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (11 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 12/35] libxcrypt: upgrade 4.4.28 -> 4.4.30 Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 14/35] oeqa/selftest/lic_checksum: Cleanup changes to emptytest include Steve Sakoman
` (21 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
Signed-off-by: Xiangyu Chen <xiangyu.chen@eng.windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-extended/sudo/sudo.inc | 2 +-
meta/recipes-extended/sudo/{sudo_1.9.10.bb => sudo_1.9.12p1.bb} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/sudo/{sudo_1.9.10.bb => sudo_1.9.12p1.bb} (96%)
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 8947c46129..fd5bbf103d 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
BUGTRACKER = "http://www.sudo.ws/bugs/"
SECTION = "admin"
LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=16cf60b466f3a0606427a7b624a3a670 \
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7aacba499777b719416b293d16f29c8c \
file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \
file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \
file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \
diff --git a/meta/recipes-extended/sudo/sudo_1.9.10.bb b/meta/recipes-extended/sudo/sudo_1.9.12p1.bb
similarity index 96%
rename from meta/recipes-extended/sudo/sudo_1.9.10.bb
rename to meta/recipes-extended/sudo/sudo_1.9.12p1.bb
index aa0d814ed7..1495b67b8b 100644
--- a/meta/recipes-extended/sudo/sudo_1.9.10.bb
+++ b/meta/recipes-extended/sudo/sudo_1.9.12p1.bb
@@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
PAM_SRC_URI = "file://sudo.pam"
-SRC_URI[sha256sum] = "44a1461098e7c7b8e6ac597499c24fb2e43748c0c139a8b4944e57d1349a64f4"
+SRC_URI[sha256sum] = "475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8"
DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 14/35] oeqa/selftest/lic_checksum: Cleanup changes to emptytest include
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (12 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 13/35] sudo: upgrade 1.9.10 -> sudo 1.9.12p1 Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 15/35] oeqa/selftest/minidebuginfo: Create selftest for minidebuginfo Steve Sakoman
` (20 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Nathan Rossi <nathan.rossi@digi.com>
Config written to the emptytest include file is invalid after the test
has cleaned up its temporary directories resulting in the emptytest
recipe potentially having invalid content when parsed by successive
bitbake runs.
This presents the following error in tests after lic_checksum execution,
e.g. 'oe-selftest -r lic_checksum recipetool'
ERROR: .../emptytest.bb: Unable to get checksum for emptytest SRC_URI entry tmpn_nyosnq: file could not be found
Remove the recipe include content once the bitbake runs are completed in
each lic_checksum test case.
Signed-off-by: Nathan Rossi <nathan.rossi@digi.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 087df767a64b271b503d714df3df6d8b3caad1c0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/lic_checksum.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/lic_checksum.py b/meta/lib/oeqa/selftest/cases/lic_checksum.py
index 8f1226e6a5..bc0a2b5d8e 100644
--- a/meta/lib/oeqa/selftest/cases/lic_checksum.py
+++ b/meta/lib/oeqa/selftest/cases/lic_checksum.py
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e"
SRC_URI = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e"
""" % (urllib.parse.quote(lic_path), urllib.parse.quote(lic_path)))
result = bitbake(bitbake_cmd)
+ self.delete_recipeinc('emptytest')
# Verify that changing a license file that has an absolute path causes
@@ -51,5 +52,6 @@ SRC_URI = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e"
f.write("data")
result = bitbake(bitbake_cmd, ignore_status=True)
+ self.delete_recipeinc('emptytest')
if error_msg not in result.output:
raise AssertionError(result.output)
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 15/35] oeqa/selftest/minidebuginfo: Create selftest for minidebuginfo
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (13 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 14/35] oeqa/selftest/lic_checksum: Cleanup changes to emptytest include Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 16/35] glibc-locale: Do not INHIBIT_DEFAULT_DEPS Steve Sakoman
` (19 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Nathan Rossi <nathan.rossi@digi.com>
Add a new selftest to validate minidebuginfo support. This selftest
builds a complete target image with PACKAGE_MINIDEBUGINFO enabled. ELFs
included in the image are expected to have minidebuginfo included in the
resulting executables and shared libraries, the self test validates this
by unpacking the image and checking for the associated ".gnu_debugdata"
section on busybox and libc ELFs.
Signed-off-by: Nathan Rossi <nathan.rossi@digi.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 5063a31ad05b75ec6ac12158fe759e81fcdb1585)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/minidebuginfo.py | 49 +++++++++++++++++++
1 file changed, 49 insertions(+)
create mode 100644 meta/lib/oeqa/selftest/cases/minidebuginfo.py
diff --git a/meta/lib/oeqa/selftest/cases/minidebuginfo.py b/meta/lib/oeqa/selftest/cases/minidebuginfo.py
new file mode 100644
index 0000000000..414dad64a3
--- /dev/null
+++ b/meta/lib/oeqa/selftest/cases/minidebuginfo.py
@@ -0,0 +1,49 @@
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+import os
+import subprocess
+import tempfile
+import shutil
+
+from oeqa.selftest.case import OESelftestTestCase
+from oeqa.utils.commands import bitbake, get_bb_var, runCmd
+
+
+class Minidebuginfo(OESelftestTestCase):
+ def test_minidebuginfo(self):
+ target_sys = get_bb_var("TARGET_SYS")
+ binutils = "binutils-cross-{}".format(get_bb_var("TARGET_ARCH"))
+
+ self.write_config("""
+PACKAGE_MINIDEBUGINFO = "1"
+IMAGE_FSTYPES = "tar.bz2"
+""")
+ bitbake("core-image-minimal {}:do_addto_recipe_sysroot".format(binutils))
+
+ deploy_dir = get_bb_var("DEPLOY_DIR_IMAGE")
+ native_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", binutils)
+ readelf = get_bb_var("READELF", "core-image-minimal")
+
+ # add usr/bin/${TARGET_SYS} to PATH
+ env = os.environ.copy()
+ paths = [os.path.join(native_sysroot, "usr", "bin", target_sys)]
+ paths += env["PATH"].split(":")
+ env["PATH"] = ":".join(paths)
+
+ # confirm that executables and shared libraries contain an ELF section
+ # ".gnu_debugdata" which stores minidebuginfo.
+ with tempfile.TemporaryDirectory(prefix = "unpackfs-") as unpackedfs:
+ filename = os.path.join(deploy_dir, "core-image-minimal-{}.tar.bz2".format(self.td["MACHINE"]))
+ shutil.unpack_archive(filename, unpackedfs)
+
+ r = runCmd([readelf, "-W", "-S", os.path.join(unpackedfs, "bin", "busybox")],
+ native_sysroot = native_sysroot, env = env)
+ self.assertIn(".gnu_debugdata", r.output)
+
+ r = runCmd([readelf, "-W", "-S", os.path.join(unpackedfs, "lib", "libc.so.6")],
+ native_sysroot = native_sysroot, env = env)
+ self.assertIn(".gnu_debugdata", r.output)
+
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 16/35] glibc-locale: Do not INHIBIT_DEFAULT_DEPS
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (14 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 15/35] oeqa/selftest/minidebuginfo: Create selftest for minidebuginfo Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 17/35] package: Fix handling of minidebuginfo with newer binutils Steve Sakoman
` (18 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Nathan Rossi <nathan.rossi@digi.com>
The glibc-locale recipe already partially depends on the base depends in
order to satisfy the do_package dependency on binutils. However since
commit d6ffd683bf6 NM has defaulted to gcc-nm, meaning do_package
depends on gcc (for minidebuginfo).
Whilst the do_package task could handle having the dependencies
explicitly defined (either in glibc-locale or in package.bbclass),
setting these would require some amount of conditional dependency
configuration (cross/crosssdk/etc.). Since both binutils and gcc are
already dependencies of virtual/libc (although compilerlibs is not),
having glibc-locale not inhibit the default depends simplifies the
handling of this situation for both glibc-locale and package.bbclass.
Signed-off-by: Nathan Rossi <nathan.rossi@digi.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 8a40d0a6039e87a5b4b26a0e84dd797fe5c75cba)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/glibc/glibc-locale.inc | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc
index 7c14abfe99..7f70b3ca4f 100644
--- a/meta/recipes-core/glibc/glibc-locale.inc
+++ b/meta/recipes-core/glibc/glibc-locale.inc
@@ -5,14 +5,9 @@ SUMMARY = "Locale data from glibc"
BPN = "glibc"
LOCALEBASEPN = "${MLPREFIX}glibc"
-# glibc-collateral.inc inhibits all default deps, but do_package needs objcopy
-# ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so')
-# ERROR: Function failed: split_and_strip_files
-BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
-BINUTILSDEP:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
-do_package[depends] += "${BINUTILSDEP}"
-
-DEPENDS += "virtual/libc"
+# Do not inhibit default deps, do_package requires binutils/gcc for
+# objcopy/gcc-nm and glibc-locale depends on virtual/libc directly.
+INHIBIT_DEFAULT_DEPS = ""
# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
# is set. The idea is to avoid running localedef on the target (at first boot)
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 17/35] package: Fix handling of minidebuginfo with newer binutils
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (15 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 16/35] glibc-locale: Do not INHIBIT_DEFAULT_DEPS Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 18/35] archiver: avoid using machine variable as it breaks multiconfig Steve Sakoman
` (17 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Nathan Rossi <nathan.rossi@digi.com>
Newer versions of binutils (2.38+) have changed how the
"--only-keep-debug" of objcopy behaves when stripping non-debug sections
from an ELF.
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=68f543154e92ab0f5d6c569e0fa143f5e8bd2d80
This change causes associated sections to be correctly marked as NOBITS
with the section contents removed from the output. The side effect is
that this causes issues with objcopy's ability to perform symbol and
relocation stripping (-S/--strip-all) on the debug split ELF, such that
with some object files (e.g. kernel modules) objcopy fails to strip
symbols/relocations with an error like the following:
.../.debug/nls_cp950.ko[.rodata]: file truncated
Because of this it is now problematic to generate minidebuginfo for
these types of ELF objects. However it is not typically useful to inject
minidebuginfo into these types of ELFs, and other distributions (e.g.
Fedora, referring to find-debuginfo.sh of debugedit) only insert
minidebuginfo into executables and shared libraries.
This change causes the minidebuginfo injection to only apply to EXEC/DYN
type ELFs, which limits the injection to executables and shared
libraires.
Additionally this change fixes the parsing of the sections from the
"readelf -W -S" output which was not accounting for the section index
column having leading spaces for single digit index values e.g. "[ 1]".
Signed-off-by: Nathan Rossi <nathan.rossi@digi.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 2084cfcb3d15db3e02637f1cd63ab9c997f38a65)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/package.bbclass | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 97e97d2703..8b11fdd155 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -484,16 +484,31 @@ def inject_minidebuginfo(file, dvar, dv, d):
bb.debug(1, 'ELF file {} has no debuginfo, skipping minidebuginfo injection'.format(file))
return
+ # minidebuginfo does not make sense to apply to ELF objects other than
+ # executables and shared libraries, skip applying the minidebuginfo
+ # generation for objects like kernel modules.
+ for line in subprocess.check_output([readelf, '-h', debugfile], universal_newlines=True).splitlines():
+ if not line.strip().startswith("Type:"):
+ continue
+ elftype = line.split(":")[1].strip()
+ if not any(elftype.startswith(i) for i in ["EXEC", "DYN"]):
+ bb.debug(1, 'ELF file {} is not executable/shared, skipping minidebuginfo injection'.format(file))
+ return
+ break
+
# Find non-allocated PROGBITS, NOTE, and NOBITS sections in the debuginfo.
# We will exclude all of these from minidebuginfo to save space.
remove_section_names = []
for line in subprocess.check_output([readelf, '-W', '-S', debugfile], universal_newlines=True).splitlines():
- fields = line.split()
- if len(fields) < 8:
+ # strip the leading " [ 1]" section index to allow splitting on space
+ if ']' not in line:
+ continue
+ fields = line[line.index(']') + 1:].split()
+ if len(fields) < 7:
continue
name = fields[0]
type = fields[1]
- flags = fields[7]
+ flags = fields[6]
# .debug_ sections will be removed by objcopy -S so no need to explicitly remove them
if name.startswith('.debug_'):
continue
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 18/35] archiver: avoid using machine variable as it breaks multiconfig
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (16 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 17/35] package: Fix handling of minidebuginfo with newer binutils Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 19/35] cargo_common.bbclass: Fix typos Steve Sakoman
` (16 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Jose Quaresma <quaresma.jose@gmail.com>
STAGING_KERNEL_DIR uses the MACHINE name so it breaks the multiconfig
and in this cases it will run the shared recipes twice, one for each
machine.
STAGING_KERNEL_DIR it's been introduced in commit 5487dee2e1
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6050d1f74c02495490d982ead2993b6b3c9cc04a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/archiver.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index dca4271a69..4a5865d7b5 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -461,7 +461,7 @@ def is_work_shared(d):
pn = d.getVar('PN')
return pn.startswith('gcc-source') or \
bb.data.inherits_class('kernel', d) or \
- (bb.data.inherits_class('kernelsrc', d) and d.getVar('S') == d.getVar('STAGING_KERNEL_DIR'))
+ (bb.data.inherits_class('kernelsrc', d) and d.expand("${TMPDIR}/work-shared") in d.getVar('S'))
# Run do_unpack and do_patch
python do_unpack_and_patch() {
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 19/35] cargo_common.bbclass: Fix typos
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (17 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 18/35] archiver: avoid using machine variable as it breaks multiconfig Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 20/35] groff: submit patches upstream Steve Sakoman
` (15 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c7a92180b21e75a84f632e4c16e63dc1f4861a00)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/cargo_common.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/cargo_common.bbclass b/meta/classes/cargo_common.bbclass
index 39f32829fd..1e9d284b5d 100644
--- a/meta/classes/cargo_common.bbclass
+++ b/meta/classes/cargo_common.bbclass
@@ -50,7 +50,7 @@ cargo_common_do_configure () {
[source.crates-io]
replace-with = "bitbake"
- local-registry = "/nonexistant"
+ local-registry = "/nonexistent"
EOF
fi
@@ -88,7 +88,7 @@ cargo_common_do_configure () {
cat <<- EOF >> ${CARGO_HOME}/config
[build]
- # Use out of tree build destination to avoid poluting the source tree
+ # Use out of tree build destination to avoid polluting the source tree
target-dir = "${B}/target"
EOF
fi
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 20/35] groff: submit patches upstream
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (18 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 19/35] cargo_common.bbclass: Fix typos Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 21/35] tcl: correct patch status Steve Sakoman
` (14 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4269cfcd6c29be05964010d0406584b80822d1d1)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../groff/files/0001-Make-manpages-mulitlib-identical.patch | 2 +-
.../groff/files/0001-replace-perl-w-with-use-warnings.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
index 9105da6457..c3cfc7cea8 100644
--- a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
+++ b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
@@ -3,7 +3,7 @@ From: Jeremy Puhlman <jpuhlman@mvista.com>
Date: Sat, 7 Mar 2020 00:59:13 +0000
Subject: [PATCH] Make manpages mulitlib identical
-Upstream-Status: Pending
+Upstream-Status: Submitted [by email to g.branden.robinson@gmail.com]
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
Makefile.am | 2 +-
diff --git a/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
index eda6a40f51..b028fa20aa 100644
--- a/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
+++ b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
@@ -15,7 +15,7 @@ doesn't work:
So replace "perl -w" with "use warnings" to make it work.
-Upstream-Status: Pending
+Upstream-Status: Submitted [by email to g.branden.robinson@gmail.com]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 21/35] tcl: correct patch status
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (19 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 20/35] groff: submit patches upstream Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 22/35] kea: submit patch upstream Steve Sakoman
` (13 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9f37e5b83db662bba92605c8741516108aad3c5e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
index 44b2ce0a30..5a10c93a31 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [upstream does not support installed tests]
Index: unix/Makefile.in
===================================================================
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 22/35] kea: submit patch upstream
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (20 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 21/35] tcl: correct patch status Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 23/35] ovmf: correct patches status Steve Sakoman
` (12 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e8f0e3a01262ecb83185ec5e84e6f359d7d64d1d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
index 78f475a495..451b409c88 100644
--- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
+++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
Because they are all commented out, replace the expanded libdir path with
'$libdir' in the config files to avoid conflict.
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 23/35] ovmf: correct patches status
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (21 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 22/35] kea: submit patch upstream Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 24/35] libffi: submit patch upstream Steve Sakoman
` (11 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0f758719ad26fd7b23bbf21a37375f8de7068f0e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../ovmf/0001-ovmf-update-path-to-native-BaseTools.patch | 2 +-
...seTools-makefile-adjust-to-build-in-under-bitbake.patch | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
index 89d9ffab5e..0c3df4fc44 100644
--- a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
+++ b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
@@ -10,7 +10,7 @@ tools. The BBAKE_EDK_TOOLS_PATH string is used as a pattern to be replaced
with the appropriate location before building.
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [oe-core cross compile specific]
---
OvmfPkg/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
index f6141c8af5..2293d7e938 100644
--- a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
+++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
@@ -6,8 +6,13 @@ Subject: [PATCH 2/6] BaseTools: makefile: adjust to build in under bitbake
Prepend the build flags with those of bitbake. This is to build
using the bitbake native sysroot include and library directories.
+Note from Alex: this is not appropriate for upstream submission as
+the recipe already does lots of similar in-place fixups elsewhere, so
+this patch shold be converted to follow that pattern. We're not going
+to fight against how upstream wants to configure the build.
+
Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com>
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups]
---
BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 24/35] libffi: submit patch upstream
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (22 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 23/35] ovmf: correct patches status Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 25/35] bluez5: Point hciattach bcm43xx firmware search path to /lib/firmware Steve Sakoman
` (10 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9555a7dc768c32a009333232e25cef041054b7f7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch b/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch
index 5e529d1ce7..4233799501 100644
--- a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch
+++ b/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch
@@ -11,7 +11,7 @@ https://github.com/libffi/libffi/issues/607. Now that
clang supports the LDC and SDC instructions, this mitigation
has been reverted.
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/747]
Signed-off-by: Brett Warren <brett.warren@arm.com>
---
src/arm/sysv.S | 33 ---------------------------------
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 25/35] bluez5: Point hciattach bcm43xx firmware search path to /lib/firmware
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (23 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 24/35] libffi: submit patch upstream Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 26/35] get_module_deps3.py: Check attribute '__file__' Steve Sakoman
` (9 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Marek Vasut <marex@denx.de>
Currently the hciattach bcm43xx firmware loader looks up the firmware
blob in /etc/firmware . Change this to /lib/firmware instead, so that
the path is consistent with Linux kernel which also looks up firmware
for the WiFi part in /lib/firmware .
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 72b3b79ad8b980e8dd9470d16b72c2c70072bbc0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index f07e318897..a8eaba1dd6 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -68,6 +68,8 @@ EXTRA_OECONF = "\
--without-zsh-completion-dir \
"
+CFLAGS += "-DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\""
+
# bluez5 builds a large number of useful utilities but does not
# install them. Specify which ones we want put into ${PN}-noinst-tools.
NOINST_TOOLS_READLINE ??= ""
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 26/35] get_module_deps3.py: Check attribute '__file__'
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (24 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 25/35] bluez5: Point hciattach bcm43xx firmware search path to /lib/firmware Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 27/35] bitbake.conf: Drop export of SOURCE_DATE_EPOCH_FALLBACK Steve Sakoman
` (8 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Leon Anavi <leon.anavi@konsulko.com>
Check if the module object has attribute '__file__' to fix and
avoid errors like:
AttributeError: module '_abc' has no attribute '__file__'. Did you mean: '__name__'?
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 8acce12c1a4cf37ac312c92d62a6ae93a349dddf)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/python/python3/get_module_deps3.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python3/get_module_deps3.py b/meta/recipes-devtools/python/python3/get_module_deps3.py
index 1f4c982aed..0ca687d2eb 100644
--- a/meta/recipes-devtools/python/python3/get_module_deps3.py
+++ b/meta/recipes-devtools/python/python3/get_module_deps3.py
@@ -56,7 +56,7 @@ if debug == True:
try:
m = importlib.import_module(current_module)
# handle python packages which may not include all modules in the __init__
- if os.path.basename(m.__file__) == "__init__.py":
+ if hasattr(m, '__file__') and os.path.basename(m.__file__) == "__init__.py":
modulepath = os.path.dirname(m.__file__)
for i in os.listdir(modulepath):
if i.startswith("_") or not(i.endswith(".py")):
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 27/35] bitbake.conf: Drop export of SOURCE_DATE_EPOCH_FALLBACK
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (25 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 26/35] get_module_deps3.py: Check attribute '__file__' Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 28/35] libuv: fixup SRC_URI Steve Sakoman
` (7 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Whilst SDE definitely needs to be exported, the fallback does not as
it is only used in our python code via the datastore.
It was introduced as an export in 9a1dde74e794362399193dc3f81c9685a83d0776
but even then it doesn't look like it needed to be, likely just a copy and
paste mistake.
Drop the export.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 74fb6539dd06acb0dd6a9af4809152975e8473e6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/conf/bitbake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 516a30c963..82b115e3a2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -671,7 +671,7 @@ export PYTHONHASHSEED = "0"
export PERL_HASH_SEED = "0"
export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}"
# A SOURCE_DATE_EPOCH of '0' might be misinterpreted as no SDE
-export SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400"
+SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400"
REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896"
##################################################################
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 28/35] libuv: fixup SRC_URI
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (26 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 27/35] bitbake.conf: Drop export of SOURCE_DATE_EPOCH_FALLBACK Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 29/35] systemd: Consider PACKAGECONFIG in RRECOMMENDS Steve Sakoman
` (6 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Add the trailing '.git' to git repo uri in SRC_URI then it could share
source code repo on premirror with grpc which uses libuv as a git
submodule with fixed revision.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit cecdf616e7cf192cdc723a446be1d14c197c980d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-connectivity/libuv/libuv_1.44.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/libuv/libuv_1.44.2.bb b/meta/recipes-connectivity/libuv/libuv_1.44.2.bb
index 4c1b8eed56..27e79276b5 100644
--- a/meta/recipes-connectivity/libuv/libuv_1.44.2.bb
+++ b/meta/recipes-connectivity/libuv/libuv_1.44.2.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d"
SRCREV = "0c1fa696aa502eb749c2c4735005f41ba00a27b8"
-SRC_URI = "git://github.com/libuv/libuv;branch=v1.x;protocol=https"
+SRC_URI = "git://github.com/libuv/libuv.git;branch=v1.x;protocol=https"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 29/35] systemd: Consider PACKAGECONFIG in RRECOMMENDS
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (27 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 28/35] libuv: fixup SRC_URI Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 30/35] kernel.bbclass: Include randstruct seed assets in STAGING_KERNEL_BUILDDIR Steve Sakoman
` (5 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Niko Mauno <niko.mauno@vaisala.com>
Since RRECOMMENDS declaration implictly induces building the recipes
that provide the runtime recommended packages, conditionalize adding
such values according to associated PACKAGECONFIG settings in order
to avoid redundant building.
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit a1989add927f7805378fe4d5afbde780b747ba77)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/systemd/systemd_250.5.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb
index 8b6d0e8580..93cdd6fa16 100644
--- a/meta/recipes-core/systemd/systemd_250.5.bb
+++ b/meta/recipes-core/systemd/systemd_250.5.bb
@@ -431,9 +431,9 @@ FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
${rootlibexecdir}/systemd/systemd-binfmt \
${systemd_system_unitdir}/proc-sys-fs-binfmt_misc.* \
${systemd_system_unitdir}/systemd-binfmt.service"
-RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc"
+RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'kernel-module-binfmt-misc', '', d)}"
-RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
+RRECOMMENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}"
FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 30/35] kernel.bbclass: Include randstruct seed assets in STAGING_KERNEL_BUILDDIR
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (28 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 29/35] systemd: Consider PACKAGECONFIG in RRECOMMENDS Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 31/35] gcc-shared-source: Fix source date epoch handling Steve Sakoman
` (4 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Diego Sueiro <diego.sueiro@arm.com>
When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need
to copy the build assets generated for the randstrutc seed to
STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will
generate those assets which will result in a different
RANDSTRUCT_HASHED_SEED.
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit b36303158b2e0273ff415bdedefb379f680b30fc)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/kernel.bbclass | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index d878d4e167..ad2b296c2d 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -585,6 +585,22 @@ do_shared_workdir () {
cp tools/objtool/objtool ${kerneldir}/tools/objtool/
fi
fi
+
+ # When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need
+ # to copy the build assets generated for the randstruct seed to
+ # STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will
+ # generate those assets which will result in a different
+ # RANDSTRUCT_HASHED_SEED
+ if [ -d scripts/basic ]; then
+ mkdir -p ${kerneldir}/scripts
+ cp -r scripts/basic ${kerneldir}/scripts
+ fi
+
+ if [ -d scripts/gcc-plugins ]; then
+ mkdir -p ${kerneldir}/scripts
+ cp -r scripts/gcc-plugins ${kerneldir}/scripts
+ fi
+
}
# We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 31/35] gcc-shared-source: Fix source date epoch handling
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (29 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 30/35] kernel.bbclass: Include randstruct seed assets in STAGING_KERNEL_BUILDDIR Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 32/35] gcc-source: Fix gengtypes race Steve Sakoman
` (3 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
The source date epoch for gcc isn't being transferred from the shared
workdir to the current WORKDIR for the specific recipe. This results in
the clamping code within sstate.bbclass using a value from 2011 which
changes the timestamps of many files. Since this happens part way
through the build, if pieces of gcc haven't built, or build/rebuild
later, we see things rebuilding when they should not and for generated
files, races are possible.
Fix this by copying the SDE from the shared workdir into the recipe
workdir.
[YOCTO #14953]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit b996293b4c8ab7ff3ed852045d17290df29205df)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/gcc/gcc-shared-source.inc | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/meta/recipes-devtools/gcc/gcc-shared-source.inc
index aac4b49313..cd2e341099 100644
--- a/meta/recipes-devtools/gcc/gcc-shared-source.inc
+++ b/meta/recipes-devtools/gcc/gcc-shared-source.inc
@@ -9,3 +9,13 @@ SRC_URI = ""
do_configure[depends] += "gcc-source-${PV}:do_preconfigure"
do_populate_lic[depends] += "gcc-source-${PV}:do_unpack"
+do_deploy_source_date_epoch[depends] += "gcc-source-${PV}:do_deploy_source_date_epoch"
+
+# Copy the SDE from the shared workdir to the recipe workdir
+do_deploy_source_date_epoch () {
+ sde_file=${SDE_FILE}
+ sde_file=${sde_file#${WORKDIR}/}
+ mkdir -p ${SDE_DEPLOYDIR} $(dirname ${SDE_FILE})
+ cp -p ${S}/../$sde_file ${SDE_DEPLOYDIR}
+ cp -p ${S}/../$sde_file ${SDE_FILE}
+}
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 32/35] gcc-source: Fix gengtypes race
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (30 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 31/35] gcc-shared-source: Fix source date epoch handling Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 33/35] gcc-source: Drop gengtype manipulation Steve Sakoman
` (2 subsequent siblings)
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
gcc renamed .c files to .cc files:
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=5c69acb32329d49e58c26fa41ae74229a52b9106
but we didn't fix this reference which meant we re-introduced a race around
gengtypes-lex.c. This lead to the race reappearing on the autobuilder. Fix
the naming to avoid the problem again.
[YOCTO #14953]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit dbca40ed399405b663dbc3894e35596a2615f47d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/gcc/gcc-source.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc
index 224b7778ef..03837f4381 100644
--- a/meta/recipes-devtools/gcc/gcc-source.inc
+++ b/meta/recipes-devtools/gcc/gcc-source.inc
@@ -26,7 +26,7 @@ python do_preconfigure () {
cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
# See 0044-gengtypes.patch, we need to regenerate this file
- bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c"))
+ bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc"))
cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 33/35] gcc-source: Drop gengtype manipulation
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (31 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 32/35] gcc-source: Fix gengtypes race Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 34/35] gcc-source: Ensure deploy_source_date_epoch sstate hash doesn't change Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 35/35] wic: make ext2/3/4 images reproducible Steve Sakoman
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Whilst we patch gengtype.cc, we don't patch gengtype-lex.cc which would
be the file which would trigger regeneration of files.
The real bug that was likely the cause for this fix is probably SDE issues
with gcc shared workdir so this code can now be dropped.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 7ab82b5db2a737c2a0266280b15d343a27c0e1d5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/gcc/gcc-source.inc | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc
index 03837f4381..bf33a4b31f 100644
--- a/meta/recipes-devtools/gcc/gcc-source.inc
+++ b/meta/recipes-devtools/gcc/gcc-source.inc
@@ -25,8 +25,6 @@ python do_preconfigure () {
import subprocess
cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
- # See 0044-gengtypes.patch, we need to regenerate this file
- bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc"))
cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 34/35] gcc-source: Ensure deploy_source_date_epoch sstate hash doesn't change
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (32 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 33/35] gcc-source: Drop gengtype manipulation Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
2022-11-20 14:15 ` [OE-core][kirkstone 35/35] wic: make ext2/3/4 images reproducible Steve Sakoman
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently if you switch machines, gcc-source do_deploy_source_date_epoch
would re-run as the stamps are tune specific. This hasn't caused much
of an issue until now, however if we fix the gcc recipes to reuse the
timestamp from this task, it does then create problems.
Copy code from allarch to ensure this task hash doesn't change between
machines/tunes.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 7e052d03464ba5e880a6c5a0e45ff2f467ef97e8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/gcc/gcc-source.inc | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc
index bf33a4b31f..265bcf4bef 100644
--- a/meta/recipes-devtools/gcc/gcc-source.inc
+++ b/meta/recipes-devtools/gcc/gcc-source.inc
@@ -17,6 +17,13 @@ STAMPCLEAN = "${STAMPS_DIR}/work-shared/gcc-${PV}-*"
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS = ""
PACKAGES = ""
+TARGET_ARCH = "allarch"
+TARGET_AS_ARCH = "none"
+TARGET_CC_ARCH = "none"
+TARGET_LD_ARCH = "none"
+TARGET_OS = "linux"
+baselib = "lib"
+PACKAGE_ARCH = "all"
B = "${WORKDIR}/build"
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [OE-core][kirkstone 35/35] wic: make ext2/3/4 images reproducible
2022-11-20 14:14 [OE-core][kirkstone 00/35] Patch review Steve Sakoman
` (33 preceding siblings ...)
2022-11-20 14:15 ` [OE-core][kirkstone 34/35] gcc-source: Ensure deploy_source_date_epoch sstate hash doesn't change Steve Sakoman
@ 2022-11-20 14:15 ` Steve Sakoman
34 siblings, 0 replies; 37+ messages in thread
From: Steve Sakoman @ 2022-11-20 14:15 UTC (permalink / raw)
To: openembedded-core
From: Sergei Zhmylev <s.zhmylev@yadro.com>
Ext2/3/4 FS contains not only mtime, but also ctime, atime and crtime.
Currently, all the files are being added into the rootfs image using
mkfs -d functionality which affects all the timestamps excluding mtime.
This patch ensures these timestamps inside the FS image equal to
the SOURCE_DATE_EPOCH if it is set.
Signed-off-by: Sergei Zhmylev <s.zhmylev@yadro.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 75d2dd0ea7790db2e8ee921784ca373abff2df65)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
scripts/lib/wic/partition.py | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 7c288d2958..5563f4448a 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -293,17 +293,36 @@ class Partition():
f.write("cd etc\n")
f.write("rm fstab\n")
f.write("write %s fstab\n" % (self.updated_fstab_path))
- if os.getenv('SOURCE_DATE_EPOCH'):
- fstab_time = int(os.getenv('SOURCE_DATE_EPOCH'))
- for time in ["atime", "mtime", "ctime"]:
- f.write("set_inode_field fstab %s %s\n" % (time, hex(fstab_time)))
- f.write("set_inode_field fstab %s_extra 0\n" % (time))
debugfs_cmd = "debugfs -w -f %s %s" % (debugfs_script_path, rootfs)
exec_native_cmd(debugfs_cmd, native_sysroot)
mkfs_cmd = "fsck.%s -pvfD %s" % (self.fstype, rootfs)
exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo)
+ if os.getenv('SOURCE_DATE_EPOCH'):
+ sde_time = hex(int(os.getenv('SOURCE_DATE_EPOCH')))
+ debugfs_script_path = os.path.join(cr_workdir, "debugfs_script")
+ files = []
+ for root, dirs, others in os.walk(rootfs_dir):
+ base = root.replace(rootfs_dir, "").rstrip(os.sep)
+ files += [ "/" if base == "" else base ]
+ files += [ base + "/" + n for n in dirs + others ]
+ with open(debugfs_script_path, "w") as f:
+ f.write("set_current_time %s\n" % (sde_time))
+ if self.updated_fstab_path and self.has_fstab and not self.no_fstab_update:
+ f.write("set_inode_field /etc/fstab mtime %s\n" % (sde_time))
+ f.write("set_inode_field /etc/fstab mtime_extra 0\n")
+ for file in set(files):
+ for time in ["atime", "ctime", "crtime"]:
+ f.write("set_inode_field \"%s\" %s %s\n" % (file, time, sde_time))
+ f.write("set_inode_field \"%s\" %s_extra 0\n" % (file, time))
+ for time in ["wtime", "mkfs_time", "lastcheck"]:
+ f.write("set_super_value %s %s\n" % (time, sde_time))
+ for time in ["mtime", "first_error_time", "last_error_time"]:
+ f.write("set_super_value %s 0\n" % (time))
+ debugfs_cmd = "debugfs -w -f %s %s" % (debugfs_script_path, rootfs)
+ exec_native_cmd(debugfs_cmd, native_sysroot)
+
self.check_for_Y2038_problem(rootfs, native_sysroot)
def prepare_rootfs_btrfs(self, rootfs, cr_workdir, oe_builddir, rootfs_dir,
--
2.25.1
^ permalink raw reply related [flat|nested] 37+ messages in thread