Re: [OE-core] [PATCH 2/2] appstream: update 0.16.3 -> 1.0.1
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/5512/steps/12/logs/errors
On 22/12/2023 11:46:31+0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin
> ---
> ...-meson-do-not-rely-on-an-exe-wrapper.patch | 36 ---
> .../0001-remove-hardcoded-path.patch | 28 ---
> ...appstream_0.16.3.bb => appstream_1.0.1.bb} | 10 +++---
> 3 files changed, 19 insertions(+), 55 deletions(-)
> delete mode 100644
> meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
> rename meta/recipes-support/appstream/{appstream_0.16.3.bb =>
> appstream_1.0.1.bb} (78%)
>
> diff --git
> a/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
>
> b/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
> deleted file mode 100644
> index d4f2951e7a9..000
> ---
> a/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From 79bf322768990b28c29a9d907edcca52ff48e0b8 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=
> -Date: Wed, 26 Jul 2023 23:21:10 +0400
> -Subject: meson: do not rely on an exe wrapper
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Signed-off-by: Marc-André Lureau
> -
> -Upstream-Status: Backport
> [https://github.com/ximion/appstream/commit/79bf322768990b28c29a9d907edcca52ff48e0b8]
>
> - data/meson.build | 7 +++
> - 1 file changed, 7 insertions(+)
> -
> -diff --git a/data/meson.build b/data/meson.build
> -index aea0cb25..ec0e434f 100644
> a/data/meson.build
> -+++ b/data/meson.build
> -@@ -7,6 +7,13 @@ install_data('its/metainfo.its',
> - install_data('its/metainfo.loc',
> - install_dir: join_paths(get_option('datadir'), 'gettext',
> 'its'))
> -
> -+# Do not rely on an exe wrapper for rel-info, use the system one in that
> case
> -+if meson.is_cross_build()
> -+dependency('appstream', version: '>=' + as_version, native: true,
> -+ not_found_message: 'Native appstream required for
> cross-building')
> -+ascli_exe = find_program('appstreamcli')
> -+endif
> -+
> - # NOTE: We do not translate the release notes on purpose here.
> - # If you do want to give translators a chance to translate them,
> - # ascli news-to-metainfo needs to produce a temporary file to translate
> ---
> -2.41.0
> -
> diff --git
> a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
> b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
> index 9cbfaca82f1..8f4cf1b82a4 100644
> ---
> a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
> +++
> b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
> @@ -1,4 +1,4 @@
> -From 6ab00a4279823829a9b82dc9e4d055da4de88c6e Mon Sep 17 00:00:00 2001
> +From 93bc5c1b221e5a10c65d4a055181dc818dfe1aa8 Mon Sep 17 00:00:00 2001
> From: Markus Volk
> Date: Mon, 12 Dec 2022 15:42:42 +0100
> Subject: [PATCH] remove hardcoded path
> @@ -9,23 +9,25 @@ Dont include hardcoded path. This fixes:
> | cc1: error: include location "/usr/include" is unsafe for
> cross-compilation [-Werror=poison-system-directories]
>
> Upstream-Status: Inappropriate [oe-specific]
> +
> ---
> - meson.build | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> + meson.build | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> -index fd0e3373..2f273ada 100644
> +index 0556b1e..d66919f 100644
> --- a/meson.build
> +++ b/meson.build
> -@@ -124,7 +124,7 @@ if get_option ('gir')
> - dependency('gobject-introspection-1.0', version: '>=1.56')
> - endif
> -
> --stemmer_inc_dirs = include_directories(['/usr/include'])
> -+stemmer_inc_dirs = include_directories([''])
> +@@ -185,10 +185,10 @@ endif
> + stemmer_inc_dirs = include_directories()
> if get_option('stemming')
> stemmer_lib = cc.find_library('stemmer', required: true)
> +-stemmer_inc_dirs = include_directories(['/usr/include'])
> ++stemmer_inc_dirs = include_directories()
> if not cc.has_header('libstemmer.h')
> ---
> -2.34.1
> -
> + if cc.has_header('libstemmer/libstemmer.h')
> +-stemmer_inc_dirs =
> include_directories('/usr/include/libstemmer')
> ++stemmer_inc_dirs = include_directories()
> + else
> + error('Unable to find Snowball header "libstemmer.h". Please
> ensure libstemmer/Snowball is installed properly in order to continue.')
> + endif
> diff --git a/meta/recipes-support/appstream/appstream_0.16.3.bb
> b/meta/recipes-support/appstream/appstream_1.0.1.bb
> similarity index 78%
> rename from meta/recipes-support/appstream/appstream_0.16.3.bb
> rename to meta/recipes-support/appstream/appstream_1.0.1.bb
> index bde679e256a..7723800bab8 10064
[OE-core][PATCH] classes-global/sstate: Fix variable typo
The vardepsexclude was subtly wrong in that it referenced STATE_MANMACH
when the actual variable name is SSTATE_MANMACH.
Signed-off-by: Joshua Watt
---
meta/classes-global/sstate.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes-global/sstate.bbclass
b/meta/classes-global/sstate.bbclass
index 9330433bb2d..efe7f697752 100644
--- a/meta/classes-global/sstate.bbclass
+++ b/meta/classes-global/sstate.bbclass
@@ -336,7 +336,7 @@ def sstate_install(ss, d):
for lock in locks:
bb.utils.unlockfile(lock)
-sstate_install[vardepsexclude] += "SSTATE_ALLOW_OVERLAP_FILES STATE_MANMACH
SSTATE_MANFILEPREFIX"
+sstate_install[vardepsexclude] += "SSTATE_ALLOW_OVERLAP_FILES SSTATE_MANMACH
SSTATE_MANFILEPREFIX"
sstate_install[vardeps] += "${SSTATEPOSTINSTFUNCS}"
def sstate_installpkg(ss, d):
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192879):
https://lists.openembedded.org/g/openembedded-core/message/192879
Mute This Topic: https://lists.openembedded.org/mt/103326967/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [meta-oe][PATCH v2] uninative-tarball.xz - reproducibility fix
On 2023-06-30 9:14 a.m., Robert Berger via lists.openembedded.org wrote:
see:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=15148
Signed-off-by: Robert Berger
---
meta/classes-recipe/populate_sdk_base.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass
b/meta/classes-recipe/populate_sdk_base.bbclass
index b23ea26d40..24db703534 100644
--- a/meta/classes-recipe/populate_sdk_base.bbclass
+++ b/meta/classes-recipe/populate_sdk_base.bbclass
@@ -285,7 +285,7 @@ python check_sdk_sysroots() {
dir_walk(SCAN_ROOT)
}
-SDKTAROPTS = "--owner=root --group=root"
+SDKTAROPTS = "--owner=root --group=root --clamp-mtime
--mtime=@${SOURCE_DATE_EPOCH}"
fakeroot archive_sdk() {
# Package it up
Ping.
I think this patch was just missed back in late June.
../Randy
--
# Randy MacLeod
# Wind River Linux
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192878):
https://lists.openembedded.org/g/openembedded-core/message/192878
Mute This Topic: https://lists.openembedded.org/mt/99872409/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Patchtest results for [PATCH] glib-networking: Fix ptest failures with openssl backend
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/glib-networking-Fix-ptest-failures-with-openssl-backend.patch FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence) PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence) PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you! -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192877): https://lists.openembedded.org/g/openembedded-core/message/192877 Mute This Topic: https://lists.openembedded.org/mt/103322983/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] glib-networking: Fix ptest failures with openssl backend
Signed-off-by: Khem Raj
---
...Disable-test_unclean_close_by_server.patch | 42 +++
.../glib-networking/glib-networking_2.78.0.bb | 5 ++-
2 files changed, 45 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-core/glib-networking/glib-networking/0001-tests-Disable-test_unclean_close_by_server.patch
diff --git
a/meta/recipes-core/glib-networking/glib-networking/0001-tests-Disable-test_unclean_close_by_server.patch
b/meta/recipes-core/glib-networking/glib-networking/0001-tests-Disable-test_unclean_close_by_server.patch
new file mode 100644
index 000..44e92f52001
--- /dev/null
+++
b/meta/recipes-core/glib-networking/glib-networking/0001-tests-Disable-test_unclean_close_by_server.patch
@@ -0,0 +1,42 @@
+From 378bb3b0bf001e66a89d100ba12ac183e8375c36 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Fri, 22 Dec 2023 09:46:36 -0800
+Subject: [PATCH] tests: Disable test_unclean_close_by_server
+
+This test does not work reliably when openSSL support is enabled. This
+is not default in OE therefore the ptest failure is not seen on AB
+testing
+
+Fixes
+
+not ok /tls/openssl/connection/unclean-close-by-server -
GLib-Net:ERROR:../tls/tests/connection.c:2374:test_unclean_close_by_server:
assertion failed (test->read_error == (g-tls-error-quark, 6)): Error reading
data from TLS socket: error:0005:lib(0)::reason(5) (g-tls-error-quark, 1)
+Bail out!
+stderr:
+**
+GLib-Net:ERROR:../tls/tests/connection.c:2374:test_unclean_close_by_server:
assertion failed (test->read_error == (g-tls-error-quark, 6)): Error reading
data from TLS socket: error:0005:lib(0)::reason(5) (g-tls-error-quark, 1)
+
+Issue is already reported upstream [1]
+
+[1] https://gitlab.gnome.org/GNOME/glib-networking/-/issues/219
+Upstream-Status: Inappropriate [ Disabled test as a workaround until fixed ]
+Signed-off-by: Khem Raj
+---
+ tls/tests/connection.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tls/tests/connection.c b/tls/tests/connection.c
+index 62a7fbb..cc99645 100644
+--- a/tls/tests/connection.c
b/tls/tests/connection.c
+@@ -3462,8 +3462,6 @@ main (int argc,
+ setup_connection, test_simultaneous_sync_rehandshake,
teardown_connection);
+ g_test_add ("/tls/" BACKEND "/connection/close-immediately",
TestConnection, NULL,
+ setup_connection, test_close_immediately, teardown_connection);
+- g_test_add ("/tls/" BACKEND "/connection/unclean-close-by-server",
TestConnection, NULL,
+- setup_connection, test_unclean_close_by_server,
teardown_connection);
+ g_test_add ("/tls/" BACKEND "/connection/async-implicit-handshake",
TestConnection, NULL,
+ setup_connection, test_async_implicit_handshake,
teardown_connection);
+ g_test_add ("/tls/" BACKEND "/connection/output-stream-close",
TestConnection, NULL,
+--
+2.43.0
+
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb
b/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb
index 68f9a2ed783..e360e59b532 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb
@@ -30,8 +30,9 @@ PACKAGECONFIG[gnomeproxy] =
"-Dgnome_proxy=enabled,-Dgnome_proxy=disabled,gsetti
inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome
SRC_URI += "file://run-ptest"
-SRC_URI += "file://eagain.patch"
-
+SRC_URI += "file://eagain.patch \
+file://0001-tests-Disable-test_unclean_close_by_server.patch \
+"
FILES:${PN} += "\
${libdir}/gio/modules/libgio*.so \
${datadir}/dbus-1/services/ \
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192876):
https://lists.openembedded.org/g/openembedded-core/message/192876
Mute This Topic: https://lists.openembedded.org/mt/103322791/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH V3] rust-cross-canadian: Fix file conflicts for arm and aarch64
On 16 Dec 2023, at 08:56, Hemraj, Deepthi via lists.openembedded.org wrote: > The current patch modifies CARGO_ENV_SETUP_SH and RUST_ENV_SETUP_SH macros > that uses MLPREFIX based on the multilib architecture. > Hence, creates different file names for the environment setup scripts and > resolves the issue. This solves the file conflicts if you put a 32-bit and 64-bit rust cross-compiler into a SDK, but is that actually a usable setup if the environment scripts are both overwriting the same environment variables? Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192875): https://lists.openembedded.org/g/openembedded-core/message/192875 Mute This Topic: https://lists.openembedded.org/mt/103206453/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell][PATCH] openssh: backport Debian patch for CVE-2023-48795
From: Vijay Anusuri
import patches from ubuntu to fix
CVE-2023-48795
Upstream-Status: Backport [import from ubuntu
https://git.launchpad.net/ubuntu/+source/openssh/tree/debian/patches?h=ubuntu%2Ffocal-security
Upstream commit
https://github.com/openssh/openssh-portable/commit/1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5]
Reference: https://ubuntu.com/security/CVE-2023-48795
Signed-off-by: Vijay Anusuri
---
.../openssh/openssh/CVE-2023-48795.patch | 468 ++
.../openssh/openssh_8.2p1.bb | 1 +
2 files changed, 469 insertions(+)
create mode 100644
meta/recipes-connectivity/openssh/openssh/CVE-2023-48795.patch
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2023-48795.patch
b/meta/recipes-connectivity/openssh/openssh/CVE-2023-48795.patch
new file mode 100644
index 00..57c45e3d93
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2023-48795.patch
@@ -0,0 +1,468 @@
+(modified to not remove ssh_packet_read_expect(), to add to
+KexAlgorithms in sshd.c and sshconnect2.c as this version pre-dates
+kex_proposal_populate_entries(), replace debug*_f() with debug*(),
+error*_f() with error*(), and fatal_f() with fatal())
+
+Backport of:
+
+From 1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5 Mon Sep 17 00:00:00 2001
+From: "d...@openbsd.org"
+Date: Mon, 18 Dec 2023 14:45:17 +
+Subject: [PATCH] upstream: implement "strict key exchange" in ssh and sshd
+
+This adds a protocol extension to improve the integrity of the SSH
+transport protocol, particular in and around the initial key exchange
+(KEX) phase.
+
+Full details of the extension are in the PROTOCOL file.
+
+with markus@
+
+OpenBSD-Commit-ID: 2a66ac962f0a630d7945fee54004ed9e9c439f14
+
+Upstream-Status: Backport [import from ubuntu
https://git.launchpad.net/ubuntu/+source/openssh/tree/debian/patches/CVE-2023-48795.patch?h=ubuntu/focal-security
+Upstream commit
https://github.com/openssh/openssh-portable/commit/1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5]
+CVE: CVE-2023-48795
+Signed-off-by: Vijay Anusuri
+---
+ PROTOCOL | 26 +
+ kex.c | 68 +---
+ kex.h | 1 +
+ packet.c | 78 ++-
+ sshconnect2.c | 14 +++--
+ sshd.c| 7 +++--
+ 6 files changed, 146 insertions(+), 48 deletions(-)
+
+diff --git a/PROTOCOL b/PROTOCOL
+index f75c1c0..89bddfe 100644
+--- a/PROTOCOL
b/PROTOCOL
+@@ -102,6 +102,32 @@ OpenSSH supports the use of ECDH in Curve25519 for key
exchange as
+ described at:
+
http://git.libssh.org/users/aris/libssh.git/plain/doc/curve25519-sha...@libssh.org.txt?h=curve25519
+
++1.9 transport: strict key exchange extension
++
++OpenSSH supports a number of transport-layer hardening measures under
++a "strict KEX" feature. This feature is signalled similarly to the
++RFC8308 ext-info feature: by including a additional algorithm in the
++initiial SSH2_MSG_KEXINIT kex_algorithms field. The client may append
++"kex-strict-c-...@openssh.com" to its kex_algorithms and the server
++may append "kex-strict-s-...@openssh.com". These pseudo-algorithms
++are only valid in the initial SSH2_MSG_KEXINIT and MUST be ignored
++if they are present in subsequent SSH2_MSG_KEXINIT packets.
++
++When an endpoint that supports this extension observes this algorithm
++name in a peer's KEXINIT packet, it MUST make the following changes to
++the the protocol:
++
++a) During initial KEX, terminate the connection if any unexpected or
++ out-of-sequence packet is received. This includes terminating the
++ connection if the first packet received is not SSH2_MSG_KEXINIT.
++ Unexpected packets for the purpose of strict KEX include messages
++ that are otherwise valid at any time during the connection such as
++ SSH2_MSG_DEBUG and SSH2_MSG_IGNORE.
++b) After sending or receiving a SSH2_MSG_NEWKEYS message, reset the
++ packet sequence number to zero. This behaviour persists for the
++ duration of the connection (i.e. not just the first
++ SSH2_MSG_NEWKEYS).
++
+ 2. Connection protocol changes
+
+ 2.1. connection: Channel write close extension "e...@openssh.com"
+diff --git a/kex.c b/kex.c
+index ce85f04..3129a4e 100644
+--- a/kex.c
b/kex.c
+@@ -63,7 +63,7 @@
+ #include "digest.h"
+
+ /* prototype */
+-static int kex_choose_conf(struct ssh *);
++static int kex_choose_conf(struct ssh *, uint32_t seq);
+ static int kex_input_newkeys(int, u_int32_t, struct ssh *);
+
+ static const char *proposal_names[PROPOSAL_MAX] = {
+@@ -173,6 +173,18 @@ kex_names_valid(const char *names)
+ return 1;
+ }
+
++/* returns non-zero if proposal contains any algorithm from algs */
++static int
++has_any_alg(const char *proposal, const char *algs)
++{
++ char *cp;
++
++ if ((cp = match_list(proposal, algs, NULL)) == NULL)
++ return 0;
++ free(cp);
++ return 1;
++}
++
+ /*
+ * Concatenate algorithm names, avoiding duplicates in the pro
Re: [OE-core] [PATCH V4] rxvt-unicode: set correct outdir for tic
These patches were rejected by upstream:
http://lists.schmorp.de/pipermail/rxvt-unicode/2023q4/002673.html
Will you be sending a revised iteration?
Ross
> On 22 Dec 2023, at 08:38, Changqing Li via lists.openembedded.org
> wrote:
>
> From: Changqing Li
>
> * tic is from ncurses-native, and set TERMINFO as
> ${RECIPE_SYSROOT_NATIVE}/${datadir}/terminfo of ncurses-native, so the
> rxvt-unicode terminfo will be wrongly installed in there. set the
> outdir explicitly to install them to correct dir.
>
> * Add ncurses-native as DEPENDS to fix reproducible build issue
>
> Signed-off-by: Changqing Li
> ---
> .../rxvt-unicode/rxvt-unicode.inc | 9 ++--
> ...ile.in-set-outdir-for-TIC-explicitly.patch | 44 +++
> 2 files changed, 49 insertions(+), 4 deletions(-)
> create mode 100644
> meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch
>
> diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
> b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
> index e7d520ebef..b8ef0d75e5 100644
> --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
> +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
> @@ -6,13 +6,14 @@ terminal emulator rxvt, modified to store text in Unicode \
> output. It also supports mixing multiple fonts at the \
> same time, including Xft fonts."
> HOMEPAGE = "https://rxvt.org/";
> -DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty"
> +DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty
> ncurses-native"
>
> SRC_URI =
> "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
> file://xwc.patch \
> file://rxvt.desktop \
> - file://rxvt.png"
> -
> + file://rxvt.png \
> + file://0001-Makefile.in-set-outdir-for-TIC-explicitly.patch \
> +"
> inherit autotools pkgconfig update-alternatives
>
> PROVIDES = "virtual/x-terminal-emulator"
> @@ -55,4 +56,4 @@ do_install:append () {
> install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
> }
>
> -FILES:${PN} += "${datadir}/applications/rxvt.desktop
> ${datadir}/pixmaps/rxvt.png"
> +FILES:${PN} += "${datadir}/applications/rxvt.desktop
> ${datadir}/pixmaps/rxvt.png ${datadir}/terminfo"
> diff --git
> a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch
>
> b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch
> new file mode 100644
> index 00..50d8d2d9e0
> --- /dev/null
> +++
> b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch
> @@ -0,0 +1,44 @@
> +From c88c94e629b6aad1609d13f355c52e5a3acc8d2a Mon Sep 17 00:00:00 2001
> +From: Changqing Li
> +Date: Thu, 14 Dec 2023 17:33:15 +0800
> +Subject: [PATCH] Makefile.in: set outdir for TIC explicitly
> +
> +When doing cross-compile, native tic's TERMINFO usually
> +set as a native dir, which could not the target install dir,
> +which will cause rxvt-unicode terminfo will be wrongly installed.
> +set the outdir explicitly to install them to correct dir.
> +
> +Upstream-Status: Submitted [ https://github.com/exg/rxvt-unicode/pull/4 ]
> +
> +Signed-off-by: Changqing Li
> +---
> + doc/Makefile.in | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/doc/Makefile.in b/doc/Makefile.in
> +index e3d1fe8b..3477551a 100644
> +--- a/doc/Makefile.in
> b/doc/Makefile.in
> +@@ -69,7 +69,7 @@ all:
> + sed $(SEDREPLACE) <$< | podselect -section "RXVT-UNICODE\/URXVT FREQUENTLY
> ASKED QUESTIONS" | pod2text >$@
> +
> + $(srcdir)/etc/rxvt-unicode.termcap: $(srcdir)/etc/rxvt-unicode.terminfo
> +- tic -C $< >$@
> ++ @TIC@ -C $< >$@
> +
> + tags allbin:
> +
> +@@ -100,8 +100,8 @@ install: all
> + $(INSTALL_DATA) rxvtd.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)d.$(man1ext)
> + $(INSTALL_DATA) rxvt.7.man$(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext)
> + $(INSTALL_DATA) rclock.1.man $(DESTDIR)$(man1dir)/urclock.$(man1ext)
> +- @TIC@ -x $(srcdir)/etc/rxvt-unicode.terminfo || \
> +- @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo
> ++ @TIC@ -x $(srcdir)/etc/rxvt-unicode.terminfo -o
> $(DESTDIR)$(datadir)/terminfo || \
> ++ @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo -o
> $(DESTDIR)$(datadir)/terminfo
> +
> + distdepend: alldoc
> +
> +--
> +2.25.1
> +
> --
> 2.25.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192873):
https://lists.openembedded.org/g/openembedded-core/message/192873
Mute This Topic: https://lists.openembedded.org/mt/103315499/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libseccomp: remove redundant PV assignment
From: Ross Burton
Signed-off-by: Ross Burton
---
meta/recipes-support/libseccomp/libseccomp_2.5.5.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb
b/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb
index a9c617fe9eb..06ba5e9c98e 100644
--- a/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb
+++ b/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb
@@ -54,5 +54,3 @@ FILES:${PN} = "${bindir} ${libdir}/${BPN}.so*"
FILES:${PN}-dbg += "${libdir}/${PN}/tests/.debug/*
${libdir}/${PN}/tools/.debug"
RDEPENDS:${PN}-ptest = "coreutils bash"
-
-PV = "2.5.5"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192872):
https://lists.openembedded.org/g/openembedded-core/message/192872
Mute This Topic: https://lists.openembedded.org/mt/103318384/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Patchtest results for [PATCH 2/2] appstream: update 0.16.3 -> 1.0.1
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/2-2-appstream-update-0.16.3---1.0.1.patch FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence) PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you! -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192871): https://lists.openembedded.org/g/openembedded-core/message/192871 Mute This Topic: https://lists.openembedded.org/mt/103316597/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Patchtest results for [PATCH 1/2] libadwaita: update 1.4.0 -> 1.4.2
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/1-2-libadwaita-update-1.4.0---1.4.2.patch FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence) PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you! -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192870): https://lists.openembedded.org/g/openembedded-core/message/192870 Mute This Topic: https://lists.openembedded.org/mt/103316596/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] appstream: update 0.16.3 -> 1.0.1
Signed-off-by: Alexander Kanavin
---
...-meson-do-not-rely-on-an-exe-wrapper.patch | 36 ---
.../0001-remove-hardcoded-path.patch | 28 ---
...appstream_0.16.3.bb => appstream_1.0.1.bb} | 10 +++---
3 files changed, 19 insertions(+), 55 deletions(-)
delete mode 100644
meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
rename meta/recipes-support/appstream/{appstream_0.16.3.bb =>
appstream_1.0.1.bb} (78%)
diff --git
a/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
b/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
deleted file mode 100644
index d4f2951e7a9..000
---
a/meta/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 79bf322768990b28c29a9d907edcca52ff48e0b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=
-Date: Wed, 26 Jul 2023 23:21:10 +0400
-Subject: meson: do not rely on an exe wrapper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Marc-André Lureau
-
-Upstream-Status: Backport
[https://github.com/ximion/appstream/commit/79bf322768990b28c29a9d907edcca52ff48e0b8]
- data/meson.build | 7 +++
- 1 file changed, 7 insertions(+)
-
-diff --git a/data/meson.build b/data/meson.build
-index aea0cb25..ec0e434f 100644
a/data/meson.build
-+++ b/data/meson.build
-@@ -7,6 +7,13 @@ install_data('its/metainfo.its',
- install_data('its/metainfo.loc',
- install_dir: join_paths(get_option('datadir'), 'gettext',
'its'))
-
-+# Do not rely on an exe wrapper for rel-info, use the system one in that case
-+if meson.is_cross_build()
-+dependency('appstream', version: '>=' + as_version, native: true,
-+ not_found_message: 'Native appstream required for
cross-building')
-+ascli_exe = find_program('appstreamcli')
-+endif
-+
- # NOTE: We do not translate the release notes on purpose here.
- # If you do want to give translators a chance to translate them,
- # ascli news-to-metainfo needs to produce a temporary file to translate
---
-2.41.0
-
diff --git
a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
index 9cbfaca82f1..8f4cf1b82a4 100644
--- a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
+++ b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
@@ -1,4 +1,4 @@
-From 6ab00a4279823829a9b82dc9e4d055da4de88c6e Mon Sep 17 00:00:00 2001
+From 93bc5c1b221e5a10c65d4a055181dc818dfe1aa8 Mon Sep 17 00:00:00 2001
From: Markus Volk
Date: Mon, 12 Dec 2022 15:42:42 +0100
Subject: [PATCH] remove hardcoded path
@@ -9,23 +9,25 @@ Dont include hardcoded path. This fixes:
| cc1: error: include location "/usr/include" is unsafe for cross-compilation
[-Werror=poison-system-directories]
Upstream-Status: Inappropriate [oe-specific]
+
---
- meson.build | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index fd0e3373..2f273ada 100644
+index 0556b1e..d66919f 100644
--- a/meson.build
+++ b/meson.build
-@@ -124,7 +124,7 @@ if get_option ('gir')
- dependency('gobject-introspection-1.0', version: '>=1.56')
- endif
-
--stemmer_inc_dirs = include_directories(['/usr/include'])
-+stemmer_inc_dirs = include_directories([''])
+@@ -185,10 +185,10 @@ endif
+ stemmer_inc_dirs = include_directories()
if get_option('stemming')
stemmer_lib = cc.find_library('stemmer', required: true)
+-stemmer_inc_dirs = include_directories(['/usr/include'])
++stemmer_inc_dirs = include_directories()
if not cc.has_header('libstemmer.h')
---
-2.34.1
-
+ if cc.has_header('libstemmer/libstemmer.h')
+-stemmer_inc_dirs = include_directories('/usr/include/libstemmer')
++stemmer_inc_dirs = include_directories()
+ else
+ error('Unable to find Snowball header "libstemmer.h". Please
ensure libstemmer/Snowball is installed properly in order to continue.')
+ endif
diff --git a/meta/recipes-support/appstream/appstream_0.16.3.bb
b/meta/recipes-support/appstream/appstream_1.0.1.bb
similarity index 78%
rename from meta/recipes-support/appstream/appstream_0.16.3.bb
rename to meta/recipes-support/appstream/appstream_1.0.1.bb
index bde679e256a..7723800bab8 100644
--- a/meta/recipes-support/appstream/appstream_0.16.3.bb
+++ b/meta/recipes-support/appstream/appstream_1.0.1.bb
@@ -24,12 +24,10 @@ inherit meson gobject-introspection gettext gtk-doc
pkgconfig vala
GIR_MESON_OPTION = "gir"
GTKDOC_MESON_OPTION = "apidocs"
-SRC_URI = " \
-
https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz \
- file://0001-remove-h
[OE-core] [PATCH 1/2] libadwaita: update 1.4.0 -> 1.4.2
Signed-off-by: Alexander Kanavin
---
.../libadwaita/{libadwaita_1.4.0.bb => libadwaita_1.4.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-gnome/libadwaita/{libadwaita_1.4.0.bb =>
libadwaita_1.4.2.bb} (88%)
diff --git a/meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb
b/meta/recipes-gnome/libadwaita/libadwaita_1.4.2.bb
similarity index 88%
rename from meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb
rename to meta/recipes-gnome/libadwaita/libadwaita_1.4.2.bb
index cc057568052..edcfba54b63 100644
--- a/meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb
+++ b/meta/recipes-gnome/libadwaita/libadwaita_1.4.2.bb
@@ -11,7 +11,7 @@ DEPENDS = " \
inherit gnomebase gobject-introspection gi-docgen vala features_check
-SRC_URI[archive.sha256sum] =
"e51a098a54d43568218fc48fcf52e80e36f469b3ce912d8ce9c308a37e9f47c2"
+SRC_URI[archive.sha256sum] =
"33fa16754e7370c841767298b3ff5f23003ee1d2515cc2ff255e65ef3d4e8713"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
REQUIRED_DISTRO_FEATURES = "opengl"
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192868):
https://lists.openembedded.org/g/openembedded-core/message/192868
Mute This Topic: https://lists.openembedded.org/mt/103316473/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH v5] kernel.bbclass: make do_symlink_kernelsrc reentrant
From: Etienne Cordonnier
The function do_symlink_kernsrc is not reentrant in the case where S is defined
to a non-default value. This causes build-failures e.g. when building
linux-yocto, then updating
poky to a commit which modifies kernel.bbclass, and then building linux-yocto
again.
Bugzilla: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15325
Tested with a recipe "my-custom-linux" which unpacks sources to a custom ${S}
directory
and ran symlink_kernsrc several times:
$ bitbake -f -c symlink_kernsrc my-custom-linux
Signed-off-by: Etienne Cordonnier
---
meta/classes-recipe/kernel.bbclass | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/classes-recipe/kernel.bbclass
b/meta/classes-recipe/kernel.bbclass
index 9ff37f5c38..45b63f1fa1 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -189,11 +189,17 @@ python do_symlink_kernsrc () {
# drop trailing slash, so that os.symlink(kernsrc, s) doesn't use
s as
# directory name and fail
s = s[:-1]
-if d.getVar("EXTERNALSRC"):
+if d.getVar("EXTERNALSRC") and not os.path.islink(s):
# With EXTERNALSRC S will not be wiped so we can symlink to it
os.symlink(s, kernsrc)
else:
import shutil
+# perform idempotent/reentrant copy
+s_copy = s + ".orig"
+if not os.path.isdir(s_copy):
+shutil.copytree(s, s_copy, ignore_dangling_symlinks=True)
+bb.utils.remove(s, recurse=True)
+shutil.copytree(s_copy, s, ignore_dangling_symlinks=True)
shutil.move(s, kernsrc)
os.symlink(kernsrc, s)
}
--
2.36.1.vfs.0.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192867):
https://lists.openembedded.org/g/openembedded-core/message/192867
Mute This Topic: https://lists.openembedded.org/mt/103308574/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] sstate.bbclass: Only sign packages at the time of their creation
On Fri, 2023-12-22 at 07:09 +0100, Tobias Hagelborn wrote: > From: Tobias Hagelborn > > The purpose of the change is to never sign a package not created by > the build itself. > > sstate_create_package is refactored into Python and re-designed > to handle signing inside the function. Thus, the signing should never > apply to existing sstate packages. The function is therefore renamed > into sstate_create_and_sign_package. > The creation of the archive remains in a separate shellscript function. > > Co-authored-by: Peter Kjellerstedt > Signed-off-by: Tobias Hagelborn > --- > meta/classes-global/sstate.bbclass | 128 - > 1 file changed, 87 insertions(+), 41 deletions(-) This code is quite critical so review on any change here needs to be very careful and that is why I might seem to be a little hard on this patch. The fact this completely rewrites the critical section worries me a lot and means it isn't an easy to review change. We tried to keep this code simple deliberately due to the number of problems we've had with it in the past. You have to keep in mind it is one of the few shared directories we have where other builds can be reading/writing the files at the same time as us without locks. The fact that you have the force mode of operation is setting off alarm bells since we have seen build failures where an existing file is changed half way though a build. Another example of how this could re-introduce issues is that it looks like it will make it easy to break: https://git.yoctoproject.org/poky/commit/?id=47cc6288280bd38f42851d6423a5ffc95a46eea4 again. The code: +if not sstate_pkg.parent.is_dir(): +sstate_pkg.parent.mkdir(parents=True, exist_ok=True) will happen to work as the previous code should have already created the directories correctly so this line will do nothing. The fact it is there will make it all too easy for someone to break this in future though. When I added that I deliberately didn't rewrite other bits in python because I knew what the race issues were like. The directory creation and then moving files from the directory is also a concern as it is potentially going to be much slower. If you have something like the sstate on the autobuilder where the directory is NFS, creating temporary directories and moving files in/out of them is expensive compared to just renaming files. Another race that the force copy of the sig as written isn't as safe as you might think as it can still race with someone else copying the file at the same time. You probably need to move the file into place, then check that the resulting file is the one you placed there and if it is, only then move the sig in. I'm also not thrilled at the need for copies of the datastore. From a style standpoint, we haven't really used Path() in OE/bitbake so that is a bit out of place but I guess people are going to do this inevitably. The variable naming "verify_sig" isn't really true /clear when you're actually signing it either. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192866): https://lists.openembedded.org/g/openembedded-core/message/192866 Mute This Topic: https://lists.openembedded.org/mt/103314293/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH V4] rxvt-unicode: set correct outdir for tic
From: Changqing Li
* tic is from ncurses-native, and set TERMINFO as
${RECIPE_SYSROOT_NATIVE}/${datadir}/terminfo of ncurses-native, so the
rxvt-unicode terminfo will be wrongly installed in there. set the
outdir explicitly to install them to correct dir.
* Add ncurses-native as DEPENDS to fix reproducible build issue
Signed-off-by: Changqing Li
---
.../rxvt-unicode/rxvt-unicode.inc | 9 ++--
...ile.in-set-outdir-for-TIC-explicitly.patch | 44 +++
2 files changed, 49 insertions(+), 4 deletions(-)
create mode 100644
meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
index e7d520ebef..b8ef0d75e5 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
@@ -6,13 +6,14 @@ terminal emulator rxvt, modified to store text in Unicode \
output. It also supports mixing multiple fonts at the \
same time, including Xft fonts."
HOMEPAGE = "https://rxvt.org/";
-DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty"
+DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty
ncurses-native"
SRC_URI =
"http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
file://xwc.patch \
file://rxvt.desktop \
- file://rxvt.png"
-
+ file://rxvt.png \
+ file://0001-Makefile.in-set-outdir-for-TIC-explicitly.patch \
+"
inherit autotools pkgconfig update-alternatives
PROVIDES = "virtual/x-terminal-emulator"
@@ -55,4 +56,4 @@ do_install:append () {
install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
}
-FILES:${PN} += "${datadir}/applications/rxvt.desktop
${datadir}/pixmaps/rxvt.png"
+FILES:${PN} += "${datadir}/applications/rxvt.desktop
${datadir}/pixmaps/rxvt.png ${datadir}/terminfo"
diff --git
a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch
b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch
new file mode 100644
index 00..50d8d2d9e0
--- /dev/null
+++
b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch
@@ -0,0 +1,44 @@
+From c88c94e629b6aad1609d13f355c52e5a3acc8d2a Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 14 Dec 2023 17:33:15 +0800
+Subject: [PATCH] Makefile.in: set outdir for TIC explicitly
+
+When doing cross-compile, native tic's TERMINFO usually
+set as a native dir, which could not the target install dir,
+which will cause rxvt-unicode terminfo will be wrongly installed.
+set the outdir explicitly to install them to correct dir.
+
+Upstream-Status: Submitted [ https://github.com/exg/rxvt-unicode/pull/4 ]
+
+Signed-off-by: Changqing Li
+---
+ doc/Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index e3d1fe8b..3477551a 100644
+--- a/doc/Makefile.in
b/doc/Makefile.in
+@@ -69,7 +69,7 @@ all:
+ sed $(SEDREPLACE) <$< | podselect -section "RXVT-UNICODE\/URXVT
FREQUENTLY ASKED QUESTIONS" | pod2text >$@
+
+ $(srcdir)/etc/rxvt-unicode.termcap: $(srcdir)/etc/rxvt-unicode.terminfo
+- tic -C $< >$@
++ @TIC@ -C $< >$@
+
+ tags allbin:
+
+@@ -100,8 +100,8 @@ install: all
+ $(INSTALL_DATA) rxvtd.1.man
$(DESTDIR)$(man1dir)/$(RXVTNAME)d.$(man1ext)
+ $(INSTALL_DATA) rxvt.7.man
$(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext)
+ $(INSTALL_DATA) rclock.1.man $(DESTDIR)$(man1dir)/urclock.$(man1ext)
+- @TIC@ -x $(srcdir)/etc/rxvt-unicode.terminfo || \
+- @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo
++ @TIC@ -x $(srcdir)/etc/rxvt-unicode.terminfo -o
$(DESTDIR)$(datadir)/terminfo || \
++ @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo -o
$(DESTDIR)$(datadir)/terminfo
+
+ distdepend: alldoc
+
+--
+2.25.1
+
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192865):
https://lists.openembedded.org/g/openembedded-core/message/192865
Mute This Topic: https://lists.openembedded.org/mt/103315499/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
