python3: drop unneeded multiprocessing module patch
Subsystems (2)
PATCH 1/14 python3: drop unneeded multiprocessing module patch
I ran the reproducing sequence on qemux86, qemux86_64 and same targets with musl, and it went fine:
root@qemux86:~# python3 Python 3.10.0 (default, Oct 4 2021, 17:55:55) [GCC 11.2.0] on linux Type "help", "copyright", "credits" or "license" for more information.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
import multiprocessing
pool_sema=multiprocessing.BoundedSemaphore(value=1)pool_sema.acquire()
True
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
pool_sema.release()
Additionally AB testing revealed no issues, and the description isn't entirely clear about where and how the problem occurs, so I can't submit it upsream without having that understanding and how to demonstrate the problem.
--- ...ssing-libraries-to-Extension-for-mul.patch | 70 ------------------- .../recipes-devtools/python/python3_3.10.1.bb | 1 - 2 files changed, 71 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch deleted +0 -70
@@ -1,70 +0,0 @@ -From bad7e6a625436402a01d03021fb9ccd58bc9930f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Thu, 9 Jan 2020 17:44:05 +0100 -Subject: [PATCH] setup.py: pass missing libraries to Extension for - multiprocessing module - -In the following commit: -... -commit e711cafab13efc9c1fe6c5cd75826401445eb585 -Author: Benjamin Peterson <[email protected]> -Date: Wed Jun 11 16:44:04 2008 +0000 - - Merged revisions 64104,64117 via svnmerge from - svn+ssh://[email protected]/python/trunk -... -(see diff in setup.py) -It assigned libraries for multiprocessing module according -the host_platform, but not pass it to Extension. - -In glibc, the following commit caused two definition of -sem_getvalue are different. -https://sourceware.org/git/?p=glibc.git;a=commit;h=042e1521c794a945edc43b5bfa7e69ad70420524 -(see diff in nptl/sem_getvalue.c for detail) -`__new_sem_getvalue' is the latest sem_getvalue@@GLIBC_2.1 -and `__old_sem_getvalue' is to compat the old version -sem_getvalue@GLIBC_2.0. - -To build python for embedded Linux systems: -http://www.yoctoproject.org/docs/2.3.1/yocto-project-qs/yocto-project-qs.html -If not explicitly link to library pthread (-lpthread), it will -load glibc's sem_getvalue randomly at runtime. - -Such as build python on linux x86_64 host and run the python -on linux x86_32 target. If not link library pthread, it caused -multiprocessing bounded semaphore could not work correctly. -... ->>> import multiprocessing ->>> pool_sema = multiprocessing.BoundedSemaphore(value=1) ->>> pool_sema.acquire() -True ->>> pool_sema.release() -Traceback (most recent call last): - File "<stdin>", line 1, in <module> -ValueError: semaphore or lock released too many times -... - -And the semaphore issue also caused multiprocessing.Queue().put() hung. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <[email protected]> -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index d92face..f42bcbb 100644 ---- a/setup.py -+++ b/setup.py -@@ -1836,7 +1836,7 @@ class PyBuildExt(build_ext): - if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not - sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')): - multiprocessing_srcs.append('_multiprocessing/semaphore.c') -- self.add(Extension('_multiprocessing', multiprocessing_srcs, -+ self.add(Extension('_multiprocessing', multiprocessing_srcs, libraries=['pthread'], - include_dirs=["Modules/_multiprocessing"])) - - if (not MS_WINDOWS and
meta/recipes-devtools/python/python3_3.10.1.bb +0 -1
@@ -25,7 +25,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ file://0001-test_locale.py-correct-the-test-output-format.patch \ file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ - file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \
Signature · 1 line
2.20.1
PATCH 2/14 ruby: disable rdoc due to non-reproducibility
The issue is reported upstream:
https://bugs.ruby-lang.org/issues/18456
Otherwise I do not feel that further investigation of rdoc's parser to find out the source of non-determinism is worth the time.
--- meta/lib/oeqa/selftest/cases/reproducible.py | 3 --- meta/recipes-devtools/ruby/ruby_3.0.3.bb | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
meta/lib/oeqa/selftest/cases/reproducible.py +0 -3
@@ -17,12 +17,9 @@ import stat import os import datetime -# ruby-ri-docs, meson: -#https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210215-0_td9la2/packages/diff-html/ # rust-llvm: #https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210825-kaihham6/ exclude_packages = [ - 'ruby-ri-docs', 'rust-llvm-liblto', 'rust-llvm-staticdev' ]
meta/recipes-devtools/ruby/ruby_3.0.3.bb +3 -0
@@ -21,6 +21,9 @@ PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind" PACKAGECONFIG[gmp] = "--with-gmp=yes, --with-gmp=no, gmp" PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," +# rdoc is off by default due to non-reproducibility reported in +# https://bugs.ruby-lang.org/issues/18456 +PACKAGECONFIG[rdoc] = "--enable-install-rdoc,--disable-install-rdoc," EXTRA_OECONF = "\ --disable-versioned-paths \
Signature · 1 line
2.20.1
PATCH 3/14 rust-llvm: apply the same reproducibility patch as for llvm proper
In reply to Alexander Kanavin--- meta/lib/oeqa/selftest/cases/reproducible.py | 4 --- meta/recipes-devtools/rust/rust-llvm.inc | 3 +- ...r-sort-ClassInfo-lists-by-name-as-we.patch | 31 +++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/rust/rust-llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch
meta/lib/oeqa/selftest/cases/reproducible.py +0 -4
@@ -17,11 +17,7 @@ import stat import os import datetime -# rust-llvm: -#https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210825-kaihham6/ exclude_packages = [ - 'rust-llvm-liblto', - 'rust-llvm-staticdev' ] def is_excluded(package):
meta/recipes-devtools/rust/rust-llvm.inc +2 -1
@@ -2,7 +2,8 @@ SUMMARY = "LLVM compiler framework (packaged with rust)" LICENSE ?= "Apache-2.0-with-LLVM-exception" HOMEPAGE = "http://www.rust-lang.org" -SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch;striplevel=2" +SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ + file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2" S = "${RUSTSRC}/src/llvm-project/llvm"
meta/recipes-devtools/rust/rust-llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 86940d87026432683fb6741cd8a34d3b9b18e40d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 27 Nov 2020 10:11:08 +0000 +Subject: [PATCH] AsmMatcherEmitter: sort ClassInfo lists by name as well + +Otherwise, there are instances which are identical in +every other field and therefore sort non-reproducibly +(which breaks binary and source reproducibiliy). + +Upstream-Status: Submitted [https://reviews.llvm.org/D97477] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + llvm/utils/TableGen/AsmMatcherEmitter.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp +index ccf0959389b..1f801e83b7d 100644 +--- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp ++++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp +@@ -359,7 +359,10 @@ public: + // name of a class shouldn't be significant. However, some of the backends + // accidentally rely on this behaviour, so it will have to stay like this + // until they are fixed. +- return ValueName < RHS.ValueName; ++ if (ValueName != RHS.ValueName) ++ return ValueName < RHS.ValueName; ++ // All else being equal, we should sort by name, for source and binary reproducibility ++ return Name < RHS.Name; + } + }; +
Signature · 1 line
2.20.1
PATCH 4/14 busybox: update 1.34.1 -> 1.35.0
In reply to Alexander KanavinDrop upstreamed patch.
---
.../0001-mktemp-add-tmpdir-option.patch | 81 -------------------
.../busybox/busybox/fail_on_no_media.patch | 28 ++++---
.../{busybox_1.34.1.bb => busybox_1.35.0.bb} | 3 +-
3 files changed, 19 insertions(+), 93 deletions(-)
delete mode 100644 meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch
rename meta/recipes-core/busybox/{busybox_1.34.1.bb => busybox_1.35.0.bb} (93%)meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch deleted +0 -81
@@ -1,81 +0,0 @@ -From ceb378209f953ea745ed93a8645567196380ce3c Mon Sep 17 00:00:00 2001 -From: Andrej Valek <[email protected]> -Date: Thu, 24 Jun 2021 19:13:22 +0200 -Subject: [PATCH] mktemp: add tmpdir option - -Make mktemp more compatible with coreutils. -- add "--tmpdir" option -- add long variants for "d,q,u" options - -Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2021-June/088932.html] - -Signed-off-by: Andrej Valek <[email protected]> -Signed-off-by: Peter Marko <[email protected]> ---- - coreutils/mktemp.c | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c -index 5393320a5..05c6d98c6 100644 ---- a/coreutils/mktemp.c -+++ b/coreutils/mktemp.c -@@ -39,16 +39,17 @@ - //kbuild:lib-$(CONFIG_MKTEMP) += mktemp.o - - //usage:#define mktemp_trivial_usage --//usage: "[-dt] [-p DIR] [TEMPLATE]" -+//usage: "[-dt] [-p DIR, --tmpdir[=DIR]] [TEMPLATE]" - //usage:#define mktemp_full_usage "\n\n" - //usage: "Create a temporary file with name based on TEMPLATE and print its name.\n" - //usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" - //usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n" --//usage: "\n -d Make directory, not file" --//usage: "\n -q Fail silently on errors" --//usage: "\n -t Prepend base directory name to TEMPLATE" --//usage: "\n -p DIR Use DIR as a base directory (implies -t)" --//usage: "\n -u Do not create anything; print a name" -+//usage: "\n -d Make directory, not file" -+//usage: "\n -q Fail silently on errors" -+//usage: "\n -t Prepend base directory name to TEMPLATE" -+//usage: "\n -p DIR, --tmpdir[=DIR] Use DIR as a base directory (implies -t)" -+//usage: "\n For --tmpdir is a optional one." -+//usage: "\n -u Do not create anything; print a name" - //usage: "\n" - //usage: "\nBase directory is: -p DIR, else $TMPDIR, else /tmp" - //usage: -@@ -72,13 +73,22 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) - OPT_t = 1 << 2, - OPT_p = 1 << 3, - OPT_u = 1 << 4, -+ OPT_td = 1 << 5, - }; - - path = getenv("TMPDIR"); - if (!path || path[0] == '\0') - path = "/tmp"; - -- opts = getopt32(argv, "^" "dqtp:u" "\0" "?1"/*1 arg max*/, &path); -+ opts = getopt32long(argv, "^" -+ "dqtp:u\0" -+ "?1" /* 1 arg max */, -+ "directory\0" No_argument "d" -+ "quiet\0" No_argument "q" -+ "dry-run\0" No_argument "u" -+ "tmpdir\0" Optional_argument "\xff" -+ , &path, &path -+ ); - - chp = argv[optind]; - if (!chp) { -@@ -95,7 +105,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) - goto error; - } - #endif -- if (opts & (OPT_t|OPT_p)) -+ if (opts & (OPT_t|OPT_p|OPT_td)) - chp = concat_path_file(path, chp); - - if (opts & OPT_u) { --- -2.11.0 -
meta/recipes-core/busybox/busybox/fail_on_no_media.patch +18 -10
@@ -1,3 +1,8 @@ +From a35e79002d36cca3c272ba5625aec86d6b7a38a8 Mon Sep 17 00:00:00 2001 +From: Saul Wold <[email protected]> +Date: Tue, 9 Apr 2013 23:25:54 -0700 +Subject: [PATCH] busybox: fail on no media + Upstream-Status: Denied [https://www.mail-archive.com/[email protected]/msg22354.html]
@@ -10,16 +15,18 @@ removed, but that would be harder to accomplish. Signed-off-by: Saul Wold <[email protected]> +--- + util-linux/mount.c | 8 ++++++++ + 1 file changed, 8 insertions(+) -Index: busybox-1.20.2/util-linux/mount.c -=================================================================== ---- busybox-1.20.2.orig/util-linux/mount.c -+++ busybox-1.20.2/util-linux/mount.c -@@ -598,7 +598,13 @@ static int mount_it_now(struct mntent *m - break; +diff --git a/util-linux/mount.c b/util-linux/mount.c +index 4e65b6b..9d7a566 100644 +--- a/util-linux/mount.c ++++ b/util-linux/mount.c +@@ -746,6 +746,14 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero errno = errno_save; } -- + + /* + * Break if there is no media, no point retrying for all + * fs types since there is no media available
@@ -27,6 +34,7 @@ Index: busybox-1.20.2/util-linux/mount.c + if (rc == -1 && errno == ENOMEDIUM) { + bb_perror_msg_and_die("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir); + } - if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS)) - break; - if (!(vfsflags & MS_SILENT)) ++ + // Should we retry read-only mount? + if (vfsflags & MS_RDONLY) + break; // no, already was tried
meta/recipes-core/busybox/busybox_1.35.0.bb renamed from meta/recipes-core/busybox/busybox_1.34.1.bb +1 -2
@@ -46,8 +46,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ - file://0001-mktemp-add-tmpdir-option.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " -SRC_URI[tarball.sha256sum] = "415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549" +SRC_URI[tarball.sha256sum] = "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694"
Signature · 1 line
2.20.1
Re: [OE-core] [PATCH 04/14] busybox: update 1.34.1 -> 1.35.0
Quoted 17 lines · Alexander Kanavin
Drop upstreamed patch.
Signed-off-by Alexander Kanavin <[email protected]>--- .../0001-mktemp-add-tmpdir-option.patch | 81 ------------------- .../busybox/busybox/fail_on_no_media.patch | 28 ++++--- .../{busybox_1.34.1.bb => busybox_1.35.0.bb} | 3 +- 3 files changed, 19 insertions(+), 93 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch rename meta/recipes-core/busybox/{busybox_1.34.1.bb => busybox_1.35.0.bb} (93%)meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch deleted +0
-0
meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch line 8
Quoted 8 lines
meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch deleted +0
-8@@ -1,81 +0,0 @@ -From ceb378209f953ea745ed93a8645567196380ce3c Mon Sep 17 00:00:00 2001 -From: Andrej Valek <[email protected]> -Date: Thu, 24 Jun 2021 19:13:22 +0200 -Subject: [PATCH] mktemp: add tmpdir option - -Make mktemp more compatible with coreutils. -- add "--tmpdir" option -- add long variants for "d,q,u" options
Is adding new feature in the scope of Yocto/OE LTS?
-armin
Quoted 149 lines
meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch deleted +0
-73- -Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2021-June/088932.html] - -Signed-off-by: Andrej Valek <[email protected]> -Signed-off-by: Peter Marko <[email protected]> ---- - coreutils/mktemp.c | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c -index 5393320a5..05c6d98c6 100644 ---- a/coreutils/mktemp.c -+++ b/coreutils/mktemp.c -@@ -39,16 +39,17 @@ - //kbuild:lib-$(CONFIG_MKTEMP) += mktemp.o - - //usage:#define mktemp_trivial_usage --//usage: "[-dt] [-p DIR] [TEMPLATE]" -+//usage: "[-dt] [-p DIR, --tmpdir[=DIR]] [TEMPLATE]" - //usage:#define mktemp_full_usage "\n\n" - //usage: "Create a temporary file with name based on TEMPLATE and print its name.\n" - //usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" - //usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n" --//usage: "\n -d Make directory, not file" --//usage: "\n -q Fail silently on errors" --//usage: "\n -t Prepend base directory name to TEMPLATE" --//usage: "\n -p DIR Use DIR as a base directory (implies -t)" --//usage: "\n -u Do not create anything; print a name" -+//usage: "\n -d Make directory, not file" -+//usage: "\n -q Fail silently on errors" -+//usage: "\n -t Prepend base directory name to TEMPLATE" -+//usage: "\n -p DIR, --tmpdir[=DIR] Use DIR as a base directory (implies -t)" -+//usage: "\n For --tmpdir is a optional one." -+//usage: "\n -u Do not create anything; print a name" - //usage: "\n" - //usage: "\nBase directory is: -p DIR, else $TMPDIR, else /tmp" - //usage: -@@ -72,13 +73,22 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) - OPT_t = 1 << 2, - OPT_p = 1 << 3, - OPT_u = 1 << 4, -+ OPT_td = 1 << 5, - }; - - path = getenv("TMPDIR"); - if (!path || path[0] == '\0') - path = "/tmp"; - -- opts = getopt32(argv, "^" "dqtp:u" "\0" "?1"/*1 arg max*/, &path); -+ opts = getopt32long(argv, "^" -+ "dqtp:u\0" -+ "?1" /* 1 arg max */, -+ "directory\0" No_argument "d" -+ "quiet\0" No_argument "q" -+ "dry-run\0" No_argument "u" -+ "tmpdir\0" Optional_argument "\xff" -+ , &path, &path -+ ); - - chp = argv[optind]; - if (!chp) { -@@ -95,7 +105,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) - goto error; - } - #endif -- if (opts & (OPT_t|OPT_p)) -+ if (opts & (OPT_t|OPT_p|OPT_td)) - chp = concat_path_file(path, chp); - - if (opts & OPT_u) { --- -2.11.0 -meta/recipes-core/busybox/busybox/fail_on_no_media.patch +18
-10@@ -1,3 +1,8 @@ +From a35e79002d36cca3c272ba5625aec86d6b7a38a8 Mon Sep 17 00:00:00 2001 +From: Saul Wold <[email protected]> +Date: Tue, 9 Apr 2013 23:25:54 -0700 +Subject: [PATCH] busybox: fail on no media + Upstream-Status: Denied [https://www.mail-archive.com/[email protected]/msg22354.html]@@ -10,16 +15,18 @@ removed, but that would be harder to accomplish. Signed-off-by: Saul Wold <[email protected]> +--- + util-linux/mount.c | 8 ++++++++ + 1 file changed, 8 insertions(+) -Index: busybox-1.20.2/util-linux/mount.c -=================================================================== ---- busybox-1.20.2.orig/util-linux/mount.c -+++ busybox-1.20.2/util-linux/mount.c -@@ -598,7 +598,13 @@ static int mount_it_now(struct mntent *m - break; +diff --git a/util-linux/mount.c b/util-linux/mount.c +index 4e65b6b..9d7a566 100644 +--- a/util-linux/mount.c ++++ b/util-linux/mount.c +@@ -746,6 +746,14 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero errno = errno_save; } -- + + /* + * Break if there is no media, no point retrying for all + * fs types since there is no media available@@ -27,6 +34,7 @@ Index: busybox-1.20.2/util-linux/mount.c + if (rc == -1 && errno == ENOMEDIUM) { + bb_perror_msg_and_die("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir); + } - if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS)) - break; - if (!(vfsflags & MS_SILENT)) ++ + // Should we retry read-only mount? + if (vfsflags & MS_RDONLY) + break; // no, already was triedmeta/recipes-core/busybox/busybox_1.35.0.bb renamed from meta/recipes-core/busybox/busybox_1.34.1.bb +1
-3@@ -46,8 +46,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ - file://0001-mktemp-add-tmpdir-option.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " -SRC_URI[tarball.sha256sum] = "415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549" +SRC_URI[tarball.sha256sum] = "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694" -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#160307): https://lists.openembedded.org/g/openembedded-core/message/160307
Mute This Topic: https://lists.openembedded.org/mt/88311436/3616698
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core] [PATCH 04/14] busybox: update 1.34.1 -> 1.35.0
Ignore my comment. too early
-armin
Quoted 176 lines · Armin Kuster via lists.openembedded.org
Quoted 17 lines · Alexander Kanavin
Drop upstreamed patch.
Signed-off-by Alexander Kanavin <[email protected]>--- .../0001-mktemp-add-tmpdir-option.patch | 81 ------------------- .../busybox/busybox/fail_on_no_media.patch | 28 ++++--- .../{busybox_1.34.1.bb => busybox_1.35.0.bb} | 3 +- 3 files changed, 19 insertions(+), 93 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch rename meta/recipes-core/busybox/{busybox_1.34.1.bb => busybox_1.35.0.bb} (93%)meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch deleted +0
-0meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch line 8
Quoted 8 lines
meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch deleted +0
-8@@ -1,81 +0,0 @@ -From ceb378209f953ea745ed93a8645567196380ce3c Mon Sep 17 00:00:00 2001 -From: Andrej Valek <[email protected]> -Date: Thu, 24 Jun 2021 19:13:22 +0200 -Subject: [PATCH] mktemp: add tmpdir option - -Make mktemp more compatible with coreutils. -- add "--tmpdir" option -- add long variants for "d,q,u" optionsIs adding new feature in the scope of Yocto/OE LTS?
-armin
Quoted 143 lines
meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch deleted +0
-73- -Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2021-June/088932.html] - -Signed-off-by: Andrej Valek <[email protected]> -Signed-off-by: Peter Marko <[email protected]> ---- - coreutils/mktemp.c | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c -index 5393320a5..05c6d98c6 100644 ---- a/coreutils/mktemp.c -+++ b/coreutils/mktemp.c -@@ -39,16 +39,17 @@ - //kbuild:lib-$(CONFIG_MKTEMP) += mktemp.o - - //usage:#define mktemp_trivial_usage --//usage: "[-dt] [-p DIR] [TEMPLATE]" -+//usage: "[-dt] [-p DIR, --tmpdir[=DIR]] [TEMPLATE]" - //usage:#define mktemp_full_usage "\n\n" - //usage: "Create a temporary file with name based on TEMPLATE and print its name.\n" - //usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" - //usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n" --//usage: "\n -d Make directory, not file" --//usage: "\n -q Fail silently on errors" --//usage: "\n -t Prepend base directory name to TEMPLATE" --//usage: "\n -p DIR Use DIR as a base directory (implies -t)" --//usage: "\n -u Do not create anything; print a name" -+//usage: "\n -d Make directory, not file" -+//usage: "\n -q Fail silently on errors" -+//usage: "\n -t Prepend base directory name to TEMPLATE" -+//usage: "\n -p DIR, --tmpdir[=DIR] Use DIR as a base directory (implies -t)" -+//usage: "\n For --tmpdir is a optional one." -+//usage: "\n -u Do not create anything; print a name" - //usage: "\n" - //usage: "\nBase directory is: -p DIR, else $TMPDIR, else /tmp" - //usage: -@@ -72,13 +73,22 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) - OPT_t = 1 << 2, - OPT_p = 1 << 3, - OPT_u = 1 << 4, -+ OPT_td = 1 << 5, - }; - - path = getenv("TMPDIR"); - if (!path || path[0] == '\0') - path = "/tmp"; - -- opts = getopt32(argv, "^" "dqtp:u" "\0" "?1"/*1 arg max*/, &path); -+ opts = getopt32long(argv, "^" -+ "dqtp:u\0" -+ "?1" /* 1 arg max */, -+ "directory\0" No_argument "d" -+ "quiet\0" No_argument "q" -+ "dry-run\0" No_argument "u" -+ "tmpdir\0" Optional_argument "\xff" -+ , &path, &path -+ ); - - chp = argv[optind]; - if (!chp) { -@@ -95,7 +105,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) - goto error; - } - #endif -- if (opts & (OPT_t|OPT_p)) -+ if (opts & (OPT_t|OPT_p|OPT_td)) - chp = concat_path_file(path, chp); - - if (opts & OPT_u) { --- -2.11.0 -meta/recipes-core/busybox/busybox/fail_on_no_media.patch +18
-10@@ -1,3 +1,8 @@ +From a35e79002d36cca3c272ba5625aec86d6b7a38a8 Mon Sep 17 00:00:00 2001 +From: Saul Wold <[email protected]> +Date: Tue, 9 Apr 2013 23:25:54 -0700 +Subject: [PATCH] busybox: fail on no media + Upstream-Status: Denied [https://www.mail-archive.com/[email protected]/msg22354.html]@@ -10,16 +15,18 @@ removed, but that would be harder to accomplish. Signed-off-by: Saul Wold <[email protected]> +--- + util-linux/mount.c | 8 ++++++++ + 1 file changed, 8 insertions(+) -Index: busybox-1.20.2/util-linux/mount.c -=================================================================== ---- busybox-1.20.2.orig/util-linux/mount.c -+++ busybox-1.20.2/util-linux/mount.c -@@ -598,7 +598,13 @@ static int mount_it_now(struct mntent *m - break; +diff --git a/util-linux/mount.c b/util-linux/mount.c +index 4e65b6b..9d7a566 100644 +--- a/util-linux/mount.c ++++ b/util-linux/mount.c +@@ -746,6 +746,14 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero errno = errno_save; } -- + + /* + * Break if there is no media, no point retrying for all + * fs types since there is no media available@@ -27,6 +34,7 @@ Index: busybox-1.20.2/util-linux/mount.c + if (rc == -1 && errno == ENOMEDIUM) { + bb_perror_msg_and_die("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir); + } - if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS)) - break; - if (!(vfsflags & MS_SILENT)) ++ + // Should we retry read-only mount? + if (vfsflags & MS_RDONLY) + break; // no, already was triedmeta/recipes-core/busybox/busybox_1.35.0.bb renamed from meta/recipes-core/busybox/busybox_1.34.1.bb +1
-2@@ -46,8 +46,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ - file://0001-mktemp-add-tmpdir-option.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " -SRC_URI[tarball.sha256sum] = "415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549" +SRC_URI[tarball.sha256sum] = "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694"
PATCH 5/14 systemd: update 249.7 -> 250.1
In reply to Alexander Kanavin---
...stemd-boot_249.7.bb => systemd-boot_250.1.bb} | 2 +-
meta/recipes-core/systemd/systemd.inc | 4 ++--
...install-dependency-links-at-install-tim.patch | 16 ++++++++--------
...01-test-parse-argument-Include-signal.h.patch | 14 ++++++--------
.../{systemd_249.7.bb => systemd_250.1.bb} | 1 +
5 files changed, 18 insertions(+), 19 deletions(-)
rename meta/recipes-core/systemd/{systemd-boot_249.7.bb => systemd-boot_250.1.bb} (98%)
rename meta/recipes-core/systemd/{systemd_249.7.bb => systemd_250.1.bb} (99%)meta/recipes-core/systemd/systemd-boot_250.1.bb renamed from meta/recipes-core/systemd/systemd-boot_249.7.bb +1 -1
@@ -20,7 +20,7 @@ EOF } # need to use ${HOST_PREFIX} here, otherwise ld.bfd could be used from HOSTTOOLS_NONFATAL -EFI_LD = "${HOST_PREFIX}ld.bfd" +EFI_LD = "bfd" EXTRA_OEMESON += "-Defi=true \ -Dgnu-efi=true \
meta/recipes-core/systemd/systemd.inc +2 -2
@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "d4406e94a32d423d8a73deb7757fb09890afe2c4" -SRCBRANCH = "v249-stable" +SRCREV = "402280118fe082122437638f53a0019c4aea81aa" +SRCBRANCH = "v250-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ "
meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +8 -8
@@ -1,4 +1,4 @@ -From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 +From f9974d7dc289551bfbf823b716fd32b43c54e465 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 21 Feb 2019 16:23:24 +0800 Subject: [PATCH] binfmt: Don't install dependency links at install time for
@@ -26,10 +26,10 @@ Signed-off-by: Scott Murray <[email protected]> 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/units/meson.build b/units/meson.build -index 17e9ead9c1..e5502be620 100644 +index a9bf28f6d9..11d3644168 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -59,8 +59,7 @@ units = [ +@@ -63,8 +63,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''],
@@ -39,14 +39,14 @@ index 17e9ead9c1..e5502be620 100644 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], -@@ -178,8 +177,7 @@ in_units = [ +@@ -184,8 +183,7 @@ in_units = [ ['rescue.service', ''], ['[email protected]', ''], ['[email protected]', 'ENABLE_BACKLIGHT'], - ['systemd-binfmt.service', 'ENABLE_BINFMT', - 'sysinit.target.wants/'], + ['systemd-binfmt.service', 'ENABLE_BINFMT'], - ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], + ['systemd-bless-boot.service', 'HAVE_GNU_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['[email protected]', 'ENABLE_COREDUMP'], diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
@@ -61,7 +61,7 @@ index 172c8757ab..f65d8930c6 100644 +[Install] +WantedBy=sysinit.target diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index fdafce7ff7..4efc05e495 100644 +index 96f595ad72..7c010bb224 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
@@ -71,8 +71,8 @@ index fdafce7ff7..4efc05e495 100644 +Wants=proc-sys-fs-binfmt_misc.automount After=proc-sys-fs-binfmt_misc.automount After=proc-sys-fs-binfmt_misc.mount - Before=sysinit.target shutdown.target -@@ -30,3 +31,6 @@ RemainAfterExit=yes + After=local-fs.target +@@ -31,3 +32,6 @@ RemainAfterExit=yes ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister TimeoutSec=90s
meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch +6 -8
@@ -1,4 +1,4 @@ -From 1adde6721ead386ccee6efe48038d6944b96319a Mon Sep 17 00:00:00 2001 +From 93c7e482d39cf7765974b3c729d29c1b120a60e3 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 24 May 2021 18:26:27 -0700 Subject: [PATCH] test-parse-argument: Include signal.h
@@ -8,22 +8,20 @@ src/test/test-parse-argument.c:49:29: error: use of undeclared identifier 'SIGAB Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19718] Signed-off-by: Khem Raj <[email protected]> + --- src/test/test-parse-argument.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test-parse-argument.c b/src/test/test-parse-argument.c -index 4081a9f25a..820d69f092 100644 +index cf3d54288a..15104e5282 100644 --- a/src/test/test-parse-argument.c +++ b/src/test/test-parse-argument.c -@@ -3,6 +3,7 @@ +@@ -5,6 +5,7 @@ #include "parse-argument.h" #include "stdio-util.h" #include "tests.h" +#include <signal.h> - static void test_parse_json_argument(void) { - log_info("/* %s */", __func__); --- -2.31.1 - + TEST(parse_json_argument) { + JsonFormatFlags flags = JSON_FORMAT_PRETTY;
meta/recipes-core/systemd/systemd_250.1.bb renamed from meta/recipes-core/systemd/systemd_249.7.bb +1 -0
@@ -688,6 +688,7 @@ FILES:udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/rules.d/60-serial.rules \ ${rootlibexecdir}/udev/rules.d/61-autosuspend-manual.rules \ ${rootlibexecdir}/udev/rules.d/64-btrfs.rules \ + ${rootlibexecdir}/udev/rules.d/70-camera.rules \ ${rootlibexecdir}/udev/rules.d/70-joystick.rules \ ${rootlibexecdir}/udev/rules.d/70-memory.rules \ ${rootlibexecdir}/udev/rules.d/70-mouse.rules \
Signature · 1 line
2.20.1
PATCH 6/14 python3-numpy: update 1.21.4 -> 1.22.0
In reply to Alexander Kanavin---
...1-numpy-core-Define-RISCV-32-support.patch | 40 ++++++++-----------
...y-core-setup.py-disable-svml-for-now.patch | 29 ++++++++++++++
...umpy_1.21.5.bb => python3-numpy_1.22.0.bb} | 5 ++-
3 files changed, 49 insertions(+), 25 deletions(-)
create mode 100644 meta/recipes-devtools/python/python3-numpy/0001-numpy-core-setup.py-disable-svml-for-now.patch
rename meta/recipes-devtools/python/{python3-numpy_1.21.5.bb => python3-numpy_1.22.0.bb} (92%)meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch +17 -23
@@ -1,4 +1,4 @@ -From dbcf296f84e5cef6a3ff0f1c469a4508f1e0fb15 Mon Sep 17 00:00:00 2001 +From eb6d6579150bf4684603ce377c51e90ad3bb8109 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sun, 15 Nov 2020 15:32:39 -0800 Subject: [PATCH] numpy/core: Define RISCV-32 support
@@ -8,39 +8,33 @@ Helps compile on riscv32 Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/17780] Signed-off-by: Khem Raj <[email protected]> --- - numpy/core/include/numpy/npy_cpu.h | 9 +++++++-- + numpy/core/include/numpy/npy_cpu.h | 3 +++ numpy/core/include/numpy/npy_endian.h | 1 + - 2 files changed, 8 insertions(+), 2 deletions(-) + 2 files changed, 4 insertions(+) diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h -index 4dbf9d84e..bc41a7eda 100644 +index 78d229e..04be511 100644 --- a/numpy/core/include/numpy/npy_cpu.h +++ b/numpy/core/include/numpy/npy_cpu.h -@@ -18,6 +18,7 @@ - * NPY_CPU_ARCEL +@@ -19,6 +19,7 @@ * NPY_CPU_ARCEB * NPY_CPU_RISCV64 + * NPY_CPU_LOONGARCH + * NPY_CPU_RISCV32 * NPY_CPU_WASM */ - #ifndef _NPY_CPUARCH_H_ -@@ -100,8 +101,12 @@ - #define NPY_CPU_ARCEL - #elif defined(__arc__) && defined(__BIG_ENDIAN__) + #ifndef NUMPY_CORE_INCLUDE_NUMPY_NPY_CPU_H_ +@@ -104,6 +105,8 @@ #define NPY_CPU_ARCEB --#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 -- #define NPY_CPU_RISCV64 -+#elif defined(__riscv) -+ #if __riscv_xlen == 64 -+ #define NPY_CPU_RISCV64 -+ #elif __riscv_xlen == 32 -+ #define NPY_CPU_RISCV32 -+ #endif + #elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 + #define NPY_CPU_RISCV64 ++#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 32 ++ #define NPY_CPU_RISCV32 + #elif defined(__loongarch__) + #define NPY_CPU_LOONGARCH #elif defined(__EMSCRIPTEN__) - /* __EMSCRIPTEN__ is defined by emscripten: an LLVM-to-Web compiler */ - #define NPY_CPU_WASM diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h -index aa367a002..d59484573 100644 +index 5e58a7f..0926212 100644 --- a/numpy/core/include/numpy/npy_endian.h +++ b/numpy/core/include/numpy/npy_endian.h @@ -49,6 +49,7 @@
@@ -48,9 +42,9 @@ index aa367a002..d59484573 100644 || defined(NPY_CPU_ARCEL) \ || defined(NPY_CPU_RISCV64) \ + || defined(NPY_CPU_RISCV32) \ + || defined(NPY_CPU_LOONGARCH) \ || defined(NPY_CPU_WASM) #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN - #elif defined(NPY_CPU_PPC) \ -- -2.29.2 +2.20.1
meta/recipes-devtools/python/python3-numpy/0001-numpy-core-setup.py-disable-svml-for-now.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 0f0601e79f9ce7614d157284523e6cd8af2259d5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 5 Jan 2022 12:12:47 +0100 +Subject: [PATCH] numpy/core/setup.py: disable svml for now + +The check really doesn't work in cross compiling, +as it is using host python to see what arch we're +building on. Issue reported upstream: +https://github.com/numpy/numpy/issues/20736 + +Upstream-Status: Inappropriate [needs upstream fix] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + numpy/core/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/core/setup.py b/numpy/core/setup.py +index a5f423d..945f2dd 100644 +--- a/numpy/core/setup.py ++++ b/numpy/core/setup.py +@@ -70,7 +70,7 @@ def can_link_svml(): + """ + machine = platform.machine() + system = platform.system() +- return "x86_64" in machine and system == "Linux" ++ return False + + def check_svml_submodule(svmlpath): + if not os.path.exists(svmlpath + "/README.md"):
meta/recipes-devtools/python/python3-numpy_1.22.0.bb renamed from meta/recipes-devtools/python/python3-numpy_1.21.5.bb +3 -2
@@ -11,8 +11,9 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://0001-numpy-core-Define-RISCV-32-support.patch \ file://run-ptest \ -" -SRC_URI[sha256sum] = "1a7ee0ffb35dc7489aebe5185a483f4c43b0d2cf784c3c9940f975a7dde56506" + file://0001-numpy-core-setup.py-disable-svml-for-now.patch \ + " +SRC_URI[sha256sum] = "f2be14ba396780a6f662b8ba1a24466c9cf18a6a386174f614668e58387a13d7" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.20.1
PATCH 7/14 mdadm: update 4.1 -> 4.2
In reply to Alexander KanavinDrop 0001-Compute-abs-diff-in-a-standard-compliant-way.patch (upstream refactored code) mdadm-fix-ptest-build-errors.patch
(upstream fixed the issue)
---
.../recipes-test/images/oe-selftest-image.bb | 3 +-
...abs-diff-in-a-standard-compliant-way.patch | 31 -------------
.../mdadm/files/debian-no-Werror.patch | 19 +++++---
.../files/mdadm-fix-ptest-build-errors.patch | 43 -------------------
.../mdadm/{mdadm_4.1.bb => mdadm_4.2.bb} | 7 ++-
5 files changed, 17 insertions(+), 86 deletions(-)
delete mode 100644 meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch
delete mode 100644 meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch
rename meta/recipes-extended/mdadm/{mdadm_4.1.bb => mdadm_4.2.bb} (93%)meta-selftest/recipes-test/images/oe-selftest-image.bb +2 -1
@@ -1,6 +1,7 @@ SUMMARY = "An image used during oe-selftest tests" -IMAGE_INSTALL = "packagegroup-core-boot dropbear" +# libudev is needed for deploy mdadm via devtool +IMAGE_INSTALL = "packagegroup-core-boot dropbear libudev" IMAGE_FEATURES = "debug-tweaks" IMAGE_LINGUAS = " "
meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From b273e892bd6aaafe448f84356abb78a6d463e784 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 7 Dec 2018 17:22:39 -0800 -Subject: [PATCH] Compute abs diff in a standard compliant way - -This make it a bit less implementation defined and silences clang -warning -Wabsolute-value - -| super-intel.c:2822:20: error: taking the absolute value of unsigned type 'unsi -gned long long' has no effect [-Werror,-Wabsolute-value] - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - super-intel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/super-intel.c b/super-intel.c -index 6438987..10d7218 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -2819,7 +2819,7 @@ static unsigned long long calc_component_size(struct imsm_map *map, - * 2048 blocks per each device. If the difference is higher it means - * that array size was expanded and num_data_stripes was not updated. - */ -- if ((unsigned int)abs(calc_dev_size - dev_size) > -+ if ((unsigned int)abs((int)calc_dev_size - (int)dev_size) > - (1 << SECT_PER_MB_SHIFT) * member_disks) { - component_size = dev_size / member_disks; - dprintf("Invalid num_data_stripes in metadata; expected=%llu, found=%llu\n",
meta/recipes-extended/mdadm/files/debian-no-Werror.patch +12 -7
@@ -1,5 +1,7 @@ -From: martin f. krafft <[email protected]> -Subject: Remove -Werror from compiler flags +From adb75f0bdec97dbe4aa15cc988d349775f7995ff Mon Sep 17 00:00:00 2001 +From: "martin f. krafft" <[email protected]> +Date: Mon, 3 Jan 2022 19:14:12 +0000 +Subject: [PATCH] Remove -Werror from compiler flags -Werror seems like a bad idea on released/packaged code because a toolchain update (introducing new warnings) could break the build. We'll let upstream
@@ -8,15 +10,18 @@ use it to beautify the code, but remove it for out builds. Signed-off-by: martin f. krafft <[email protected]> Upstream-Status: Pending + --- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/Makefile b/Makefile +index 716c97c..40354ea 100644 --- a/Makefile +++ b/Makefile -@@ -48,7 +48,7 @@ endif - - CC ?= $(CROSS_COMPILE)gcc +@@ -50,7 +50,7 @@ ifeq ($(origin CC),default) + CC := $(CROSS_COMPILE)gcc + endif CXFLAGS ?= -ggdb -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-extended/mdadm/mdadm_4.2.bb renamed from meta/recipes-extended/mdadm/mdadm_4.1.bb +3 -4
@@ -12,11 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://mdadm-3.3.2_x32_abi_time_t.patch \ - file://mdadm-fix-ptest-build-errors.patch \ file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \ file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ - file://0001-Compute-abs-diff-in-a-standard-compliant-way.patch \ file://0001-fix-gcc-8-format-truncation-warning.patch \ file://debian-no-Werror.patch \ file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \
@@ -26,11 +24,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-mdadm-skip-test-11spare-migration.patch \ " -SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" -SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a" +SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" inherit autotools-brokensep ptest systemd +DEPENDS = "udev" + SYSTEMD_SERVICE:${PN} = "mdmonitor.service" SYSTEMD_AUTO_ENABLE = "disable"
Signature · 1 line
2.20.1
PATCH 8/14 librsvg: update 2.52.4 -> 2.52.5
In reply to Alexander KanavinRemove upstreamed patches.
---
...hecksums-for-modified-files-for-libc.patch | 24 -
...lib.rs-do-not-probe-into-harcoded-li.patch | 12 +-
...ps-sort-dependencies-before-using-th.patch | 50 -
...nitions-for-riscv64-musl-libc-0.2.93.patch | 898 ------------------
...-mod.rs-add-riscv64-to-b64-set-libc-.patch | 27 -
...efinitions-to-match-musl-libc-0.2.93.patch | 737 --------------
.../{librsvg_2.52.4.bb => librsvg_2.52.5.bb} | 7 +-
7 files changed, 7 insertions(+), 1748 deletions(-)
delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-Update-checksums-for-modified-files-for-libc.patch
delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-vendor-system-deps-sort-dependencies-before-using-th.patch
delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch
delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch
delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch
rename meta/recipes-gnome/librsvg/{librsvg_2.52.4.bb => librsvg_2.52.5.bb} (85%)meta/recipes-gnome/librsvg/librsvg/0001-Update-checksums-for-modified-files-for-libc.patch deleted +0 -24
@@ -1,24 +0,0 @@ -From 35cc5ce53a7c00d03dab9d58d37c2ec948082878 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Sun, 31 Oct 2021 20:28:21 +0100 -Subject: [PATCH] Update checksums for modified files for libc - -Upstream-Status: Inappropriate [previous patches need to be upstreamed] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - vendor/libc/.cargo-checksum.json | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/vendor/libc/.cargo-checksum.json b/vendor/libc/.cargo-checksum.json -index 8cf4eba..ac7cc51 100644 ---- a/vendor/libc/.cargo-checksum.json -+++ b/vendor/libc/.cargo-checksum.json -@@ -1 +1,5 @@ --{"files":{"CONTRIBUTING.md":"752eea5a703d11b485c6b5f195f51bd2c79aa5159b619ce09555c779e1fb586b","Cargo.toml":"d6f6253f05d207b6c676e5647b31ad0ca3f05da3ac05db47f81d4ebd901ba22f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"8228847944f1332882fbb00275b6f30e4a8aad08a13569c25d52cac012cc2a47","build.rs":"a71b92db5077b33af4ee6f1de33574ac33c2b292840eddbe3f7cce37f1fb16b9","rustfmt.toml":"eaa2ea84fc1ba0359b77680804903e07bb38d257ab11986b95b158e460f787b2","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"520300ff260d377930f2f456135ec9a3ac7740a949ce7bf5269c0dc60d56c0df","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"e92c56b42f1bd1b9e66be2a9b73aca6ba29024b9bd17c16f327dfbe8831e3f86","src/macros.rs":"c1a299d5327ba033f079388f8ac8a44848f9aeff6a72e9be6dfa70f4769cc619","src/psp.rs":"dd31aabd46171d474ec5828372e28588935120e7355c90c105360d8fa9264c1c","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/solid/aarch64.rs":"8cdae0cc37c43dabd4253a534e700bec6b6a57293c0c8e36c9ce16675d16799a","src/solid/arm.rs":"852b58a0837fde089cb9b5af131bf653daeb8c726f7540032756db8b7d4f8149","src/solid/mod.rs":"98dc29c3e5773318ba258a4a2b7407f25aa52d40885a0024fbe43676fe54d14b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"2546ad3eb6aecb95f916648bc63264117c92b4b4859532b34cb011e4c75a5a72","src/unix/bsd/apple/b64/aarch64/align.rs":"f0c321265dd7671f16106b84951ac7dd77ed2e65c6623cbf2d29e76531984770","src/unix/bsd/apple/b64/aarch64/mod.rs":"44c217a4f263afe7a97435de9323d20a96c37836f899ca0925306d4b7e073c27","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"f5e278a1af7fb358891d1c9be4eb7e815aaca0c5cb738d0c3604ba2208a856f7","src/unix/bsd/apple/b64/x86_64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/x86_64/mod.rs":"8c87c5855038aae5d433c8f5eb3b29b0a175879a0245342b3bfd83bdf4cfd936","src/unix/bsd/apple/mod.rs":"96f101bdab46a9f0a5249a8143d4a9def055284a0c2bd62bce15532a5bed428c","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"8295b8bb0dfd38d2cdb4d9192cdeeb534cc6c3b208170e64615fa3e0edb3e578","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"6ea4129eb5d6da5c09f8cf3692b5e7716f058b48d1e8c61115691709eda7ce51","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"2a215bd6136b8617aacedf9be738ccee94da9d29b418e9a78101d6291c182352","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"bf0a994e2079b8aad9da5efd3a3b9a7194a53ae60887a25c57964fb68499e847","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"295b3e3b67394f731d4e88d169e3d3d1d80026b99898745cd0d1d163f085ff61","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs":"98f6af2021b434f9c3197094312b457774381220f31a22c3b15b1fe8a60cb365","src/unix/bsd/freebsdlike/freebsd/freebsd13/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/mod.rs":"6b825079ffe3f9aec6e78ea6b50acedcb91a4e1312d721105b7f8b1555f254df","src/unix/bsd/freebsdlike/freebsd/powerpc.rs":"9ca3f82f88974e6db5569f2d76a5a3749b248a31747a6c0da5820492bdfeca42","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/unix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"c3a0111252e201c172b99e7d9cbee4cf088d3dd47995110e819f04276bccd198","src/unix/bsd/freebsdlike/mod.rs":"98d322b22050a80636841287d9ed12549a2004a9dbe151763e5b1270f5e73ea3","src/unix/bsd/mod.rs":"2fed08973739d7f6a7412b204724af64b1a915c712689c250cf9a08263ba05ff","src/unix/bsd/netbsdlike/mod.rs":"4e9da54e541773c7ad4cca9dade1df00f28f2fdac3f8df5957f4c74b7e082344","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"65dcb58d11e8d8028401a9d07ca3eb4cb4f053e04249cc877353449d84ccc4cb","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"f6de6981382af87518e4a5b6d26c2ea551ed74640dd7166107a824af30ced243","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"1afe5ef46b14397cdd68664b5b232e4f5b035b6db1d4cf411c899d51ebca9f30","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"dd91931d373b7ecaf6e2de25adadee10d16fa9b12c2cbacdff3eb291e1ba36af","src/unix/bsd/netbsdlike/openbsd/mod.rs":"47aaab2bd8238e937112ff17e8262945c8e5865d5e696f218b11c1da59830808","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"d31db31630289c85af3339dbe357998a21ca584cbae31607448fe2cf7675a4e1","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"80a6cfb58acbbc471dbd412dd76a41f372befc8f217fb1671ed4ce8d391dced0","src/unix/haiku/native.rs":"44855f52906f607de137fc4baa8c6b1b9a26baaa666f25d5f7a7ec5e017c8be6","src/unix/haiku/x86_64.rs":"3ec3aeeb7ed208b8916f3e32d42bfd085ff5e16936a1a35d9a52789f043b7237","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"859814f5df89e28fd4b345db399d181e11e7ed413841b6ff703a1fcbdbf013ae","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"433c1530f602cc5ed26610c58055dde0c4ceea5e00150063b24ddc60768332a4","src/unix/linux_like/android/b32/mod.rs":"d971b98530a96f5892f98e1edc3133cf278d1b3939d77ab0a27a6323e0961715","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"8388bd3a0fcb5636bf965eee6dc95ae6860b85a2b555b387c868aa4d4e01ec89","src/unix/linux_like/android/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"8fe667d2b14abc5ac8aad32e16c3da24350471d8156eaea9ab4989f73dd9f9fc","src/unix/linux_like/android/b64/mod.rs":"d7bbbadafdb2cb2ff8e9cde3d89a03b9facaabb6b2d45705225d3ece1c5cce37","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"06b22dc184e85a988ab969c75cadc52b9878faeab0eb9d21215878c95fe07c19","src/unix/linux_like/android/mod.rs":"07cebaa8d953446b8df5cb7c5de3932ae85b04d9e9993e3a3a126ff8f15111a4","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"b71d37106750f57bc2dae4e9bcb473ff098ef48235827e41a1687a39825f0aa4","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"213e70ebed2703e14a9cf17666b21ecbf180b7bff7fa22fdbb36dbbd52df326d","src/unix/linux_like/linux/arch/generic/mod.rs":"1618634d37348032f5ce1dc9df1aaa1f1681bca4a275f23d41f42098c4d3b423","src/unix/linux_like/linux/arch/mips/mod.rs":"dac02cd01dbd3b222286887c64d398c031afc08d38850c2b3ce2fe7158d888e0","src/unix/linux_like/linux/arch/mod.rs":"466a29622e47c6c7f1500682b2eb17f5566dd81b322cd6348f0fdd355cec593a","src/unix/linux_like/linux/arch/powerpc/mod.rs":"1789eb5b41f75c29239795124a4a7cdcf7c8d213b88cf581b2f5bda08d7cf15b","src/unix/linux_like/linux/arch/sparc/mod.rs":"e7139d3bfb291a283c767e6201eac8bbb58c91839a36fa56bfe500fcb3aa754a","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"5e40c273b767c369a46c3315c7cfde97379944ed63c74735e98d4dae2c49d414","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"20b4c897fb3f63e31a04849b348ec8e6e6405ce9463048d411114f8c9dbabd8a","src/unix/linux_like/linux/gnu/b32/mod.rs":"794dbcbae7dae8fd6b0b814573243197ceb532b56ef0772ad86b4b401478fcd9","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"0cd7348badb9c4f8a0db31a2503b30c456a2bfcc7a0e5919762b1e12f912c5ad","src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs":"ee5145a383386b716605a8d1ff3df212d418aae1aa1f37d2307d4f9cd1a08e99","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/linux/gnu/b32/sparc/mod.rs":"a2c4ae8f31a74e4843b8ff4b6507419f403b52713169fcee9b1b24eb2324162a","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"525ee4917b54790cefc1298ec1015cea6332d818d9c7475434e94d06afdd59c0","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs":"21a21503ef2e095f4371044915d4bfb07a8578011cb5c713cd9f45947b0b5730","src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs":"e78c3cd197f44832338b414d1a9bc0d194f44c74db77bd7bf830c1fff62b2690","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"d179cbb462c451ff8805029b2b922c4bf90e35f667e80d716d5064f563aebc52","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"7d456da436017cb388b65b2c4b626c83b489cbb19a591673b9c627a608d53cfc","src/unix/linux_like/linux/gnu/b64/mod.rs":"6336065423c26b59681fd2ce77f1117ea36af13e163fdadaefd108bd8191e8c8","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"dbb8905e363ed4a2dfb984554ad9b6389d27f6a2d599ec2d80e38a6c7551a019","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"5b982c41097f4f91adcb0968290afeccb27dce1695a261c964d34ef85df87cf4","src/unix/linux_like/linux/gnu/b64/s390x.rs":"fce37140468f8914411eed0b25a882e60e1b54bcffcd33d6263a91b57d04f6c1","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"518ef78da0d81fe74cec30be411145d763fdfd249de4d108602fd0995781f590","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"76cba0a3f9456a968d2ae6ea587162b2ff04278dc5250cb176395c936579771b","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"f775ac2b754f90b63053fe22afe1d19d306b5404995568d6805baa9249fb617f","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"4ba1b58468f55254717366f50fdfd3e4114fde6dc442a56681926c4d7e5b6b0d","src/unix/linux_like/linux/gnu/mod.rs":"af3590c392bd06394cb307ccb993e66f53de7e2a0211c689dbb1845220475445","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"88ce2c4105c07c1262495e0ff1bd53f3ceec99adba9c20c612439838b4dbfdd6","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"6255abe2ee04986832d12b7b2190589580f2a43e9bfb285b32b5747227f62727","src/unix/linux_like/linux/musl/b32/hexagon.rs":"10067cde5706e1173aa8e0a3a364cf44fe5b7a9f8b71cb086c653be71af00564","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"b9e9ff42363ebbb884ddf6445129ec4164471df45846874fc08f5f458e659254","src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"4592dc5f1f2fe888dfef85fa862d42d168e73a2c6f4fc052b58287d0f4d4ffcd","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"a19a8decfab185af3cebd34aae4b15082e7552be573904b8c1a3f0c0e493ef34","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"798a9229d70ce235394f2dd625f6c4c1e10519a94382dc5b091952b638ae2928","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"a73035c6d9b776f13b839008e15c04c2c53455571efd06664affcb047e457112","src/unix/linux_like/linux/musl/b64/mips64.rs":"2744895451f3a777fbe54f7f2695be53310b965fd62084c9b7e9121c7fe28346","src/unix/linux_like/linux/musl/b64/mod.rs":"d18abc0aeba2e26342bf3416a4dba0836db2bb0ee013b0a39629475cf8640289","src/unix/linux_like/linux/musl/b64/powerpc64.rs":"e5a55525b42493923956d668f978fb45e22d51deea00ce5edbfddf76ff19c741","src/unix/linux_like/linux/musl/b64/s390x.rs":"03dfec6794d93cb31a7c52b2d53a0973755168f91f8fa437cc5dbd54882c8ee7","src/unix/linux_like/linux/musl/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/musl/b64/x86_64/mod.rs":"0dd168f5a6881f32e5239fb312b23cf137b800d0ff323286a92c8a2c382b5456","src/unix/linux_like/linux/musl/mod.rs":"55ccd71342276ccb4c441a4bc2772aebfd163af299669b658c6c8c6add331ec3","src/unix/linux_like/linux/no_align.rs":"5ed04c53bf9d27da9b4d65ba7625c6ac53330162683d1b3df98950caafa3507b","src/unix/linux_like/linux/uclibc/align.rs":"9ed16138d8e439bd90930845a65eafa7ebd67366e6bf633936d44014f6e4c959","src/unix/linux_like/linux/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/arm/mod.rs":"1e3bf809508b5872949136859bf48ddf58b7d24ae9f0b663e79f0efd1aaeb6a6","src/unix/linux_like/linux/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs":"fa4102d9a596d90de604ce2962b0e64f184dfbf10552a4c3ecf28f12d4704379","src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/linux_like/linux/uclibc/mips/mod.rs":"a2877679fef0f14f54a89ccbc41fb02f0c25bf6e536f9eb2cb2fa437e1d3f739","src/unix/linux_like/linux/uclibc/mod.rs":"82d504d3aa12cb0f7933980f81c4708fa6e070d4c57efdf407f2de05b71bc06d","src/unix/linux_like/linux/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/linux_like/linux/uclibc/x86_64/l4re.rs":"024eba5753e852dbdd212427351affe7e83f9916c1864bce414d7aa2618f192e","src/unix/linux_like/linux/uclibc/x86_64/mod.rs":"66e8f5b7509a6e638b8b904906f89badbab0da8fb5b602d07ebd88649c4b961a","src/unix/linux_like/linux/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/unix/linux_like/mod.rs":"ffce98bdd208fd9d335c65feafbf0d9742bea67c7eec1ee48657f292132ec3f0","src/unix/mod.rs":"b72f18e053cca0ade0f0606f1848a773fcf1885c72cbb31889275e8195f060bd","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/espidf/mod.rs":"c198cb4beccdab483be61c102da74dc51ac80f766797e33021f3110394ed5a3d","src/unix/newlib/mod.rs":"d7271c13748be08305d36f9af6f41f6950a7a1d6d4382149194a35d5fe2090de","src/unix/newlib/no_align.rs":"e0743b2179495a9514bc3a4d1781e492878c4ec834ee0085d0891dd1712e82fb","src/unix/newlib/powerpc/mod.rs":"2d0f7af28b47f7a2a6c210ebd1c1f33ed8eac62e56b5af2b856de2ad3fdc5187","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"cc4794afa4fbed9d6612894ea476228f9d8533950162d6416fc4d16073e1dac4","src/unix/solarish/compat.rs":"b07a5bfac925eb012003a459ba6bddbd3bfa9c44b3394da2ac5a602e54beae9c","src/unix/solarish/illumos.rs":"7d8f47fd37880715b449723688aaee568785325a46f1c360a05bdca13252278e","src/unix/solarish/mod.rs":"ea9dd1c1d68927408342762ee8998a9628838974c91089f620c867910c29adba","src/unix/solarish/solaris.rs":"65b005453aefa9b9d4fc860fe77cfec80d8c97a51342b15daf55fc3e808bb384","src/unix/solarish/x86_64.rs":"9d761573bdccbdd1ac61da571f7e96b5374df70241d9b72d45a069611f495085","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"aea3da66f2140f2a82dfc9c58f6e6531d2dd9c15ea696e0f95a0d4a2a187b5b6","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"44ce56183380d18aedea9b7bec2edc5819e8529302c913bfe5d01f760155b82a","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"3c8c7edb7cdf5d0c44af936db2a94869585c69dfabeef30571b4f4e38375767a","src/windows/mod.rs":"1cd9223293255b994814487e28d9979fb8ebef4538a236c1aa47fdc166a149cc","src/windows/msvc/mod.rs":"c068271e00fca6b62bc4bf44bcf142cfc38caeded9b6c4e01d1ceef3ccf986f4","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4"},"package":"fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"} -\ No newline at end of file -+{"files":{"CONTRIBUTING.md":"752eea5a703d11b485c6b5f195f51bd2c79aa5159b619ce09555c779e1fb586b","Cargo.toml":"d6f6253f05d207b6c676e5647b31ad0ca3f05da3ac05db47f81d4ebd901ba22f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"8228847944f1332882fbb00275b6f30e4a8aad08a13569c25d52cac012cc2a47","build.rs":"a71b92db5077b33af4ee6f1de33574ac33c2b292840eddbe3f7cce37f1fb16b9","rustfmt.toml":"eaa2ea84fc1ba0359b77680804903e07bb38d257ab11986b95b158e460f787b2","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"520300ff260d377930f2f456135ec9a3ac7740a949ce7bf5269c0dc60d56c0df","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"e92c56b42f1bd1b9e66be2a9b73aca6ba29024b9bd17c16f327dfbe8831e3f86","src/macros.rs":"c1a299d5327ba033f079388f8ac8a44848f9aeff6a72e9be6dfa70f4769cc619","src/psp.rs":"dd31aabd46171d474ec5828372e28588935120e7355c90c105360d8fa9264c1c","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/solid/aarch64.rs":"8cdae0cc37c43dabd4253a534e700bec6b6a57293c0c8e36c9ce16675d16799a","src/solid/arm.rs":"852b58a0837fde089cb9b5af131bf653daeb8c726f7540032756db8b7d4f8149","src/solid/mod.rs":"98dc29c3e5773318ba258a4a2b7407f25aa52d40885a0024fbe43676fe54d14b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"2546ad3eb6aecb95f916648bc63264117c92b4b4859532b34cb011e4c75a5a72","src/unix/bsd/apple/b64/aarch64/align.rs":"f0c321265dd7671f16106b84951ac7dd77ed2e65c6623cbf2d29e76531984770","src/unix/bsd/apple/b64/aarch64/mod.rs":"44c217a4f263afe7a97435de9323d20a96c37836f899ca0925306d4b7e073c27","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"f5e278a1af7fb358891d1c9be4eb7e815aaca0c5cb738d0c3604ba2208a856f7","src/unix/bsd/apple/b64/x86_64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/x86_64/mod.rs":"8c87c5855038aae5d433c8f5eb3b29b0a175879a0245342b3bfd83bdf4cfd936","src/unix/bsd/apple/mod.rs":"96f101bdab46a9f0a5249a8143d4a9def055284a0c2bd62bce15532a5bed428c","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"8295b8bb0dfd38d2cdb4d9192cdeeb534cc6c3b208170e64615fa3e0edb3e578","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"6ea4129eb5d6da5c09f8cf3692b5e7716f058b48d1e8c61115691709eda7ce51","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"2a215bd6136b8617aacedf9be738ccee94da9d29b418e9a78101d6291c182352","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"bf0a994e2079b8aad9da5efd3a3b9a7194a53ae60887a25c57964fb68499e847","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"295b3e3b67394f731d4e88d169e3d3d1d80026b99898745cd0d1d163f085ff61","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs":"98f6af2021b434f9c3197094312b457774381220f31a22c3b15b1fe8a60cb365","src/unix/bsd/freebsdlike/freebsd/freebsd13/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/mod.rs":"6b825079ffe3f9aec6e78ea6b50acedcb91a4e1312d721105b7f8b1555f254df","src/unix/bsd/freebsdlike/freebsd/powerpc.rs":"9ca3f82f88974e6db5569f2d76a5a3749b248a31747a6c0da5820492bdfeca42","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/unix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"c3a0111252e201c172b99e7d9cbee4cf088d3dd47995110e819f04276bccd198","src/unix/bsd/freebsdlike/mod.rs":"98d322b22050a80636841287d9ed12549a2004a9dbe151763e5b1270f5e73ea3","src/unix/bsd/mod.rs":"2fed08973739d7f6a7412b204724af64b1a915c712689c250cf9a08263ba05ff","src/unix/bsd/netbsdlike/mod.rs":"4e9da54e541773c7ad4cca9dade1df00f28f2fdac3f8df5957f4c74b7e082344","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"65dcb58d11e8d8028401a9d07ca3eb4cb4f053e04249cc877353449d84ccc4cb","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"f6de6981382af87518e4a5b6d26c2ea551ed74640dd7166107a824af30ced243","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"1afe5ef46b14397cdd68664b5b232e4f5b035b6db1d4cf411c899d51ebca9f30","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"dd91931d373b7ecaf6e2de25adadee10d16fa9b12c2cbacdff3eb291e1ba36af","src/unix/bsd/netbsdlike/openbsd/mod.rs":"47aaab2bd8238e937112ff17e8262945c8e5865d5e696f218b11c1da59830808","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"d31db31630289c85af3339dbe357998a21ca584cbae31607448fe2cf7675a4e1","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"80a6cfb58acbbc471dbd412dd76a41f372befc8f217fb1671ed4ce8d391dced0","src/unix/haiku/native.rs":"44855f52906f607de137fc4baa8c6b1b9a26baaa666f25d5f7a7ec5e017c8be6","src/unix/haiku/x86_64.rs":"3ec3aeeb7ed208b8916f3e32d42bfd085ff5e16936a1a35d9a52789f043b7237","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"859814f5df89e28fd4b345db399d181e11e7ed413841b6ff703a1fcbdbf013ae","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"433c1530f602cc5ed26610c58055dde0c4ceea5e00150063b24ddc60768332a4","src/unix/linux_like/android/b32/mod.rs":"d971b98530a96f5892f98e1edc3133cf278d1b3939d77ab0a27a6323e0961715","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"8388bd3a0fcb5636bf965eee6dc95ae6860b85a2b555b387c868aa4d4e01ec89","src/unix/linux_like/android/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"8fe667d2b14abc5ac8aad32e16c3da24350471d8156eaea9ab4989f73dd9f9fc","src/unix/linux_like/android/b64/mod.rs":"d7bbbadafdb2cb2ff8e9cde3d89a03b9facaabb6b2d45705225d3ece1c5cce37","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"06b22dc184e85a988ab969c75cadc52b9878faeab0eb9d21215878c95fe07c19","src/unix/linux_like/android/mod.rs":"07cebaa8d953446b8df5cb7c5de3932ae85b04d9e9993e3a3a126ff8f15111a4","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"b71d37106750f57bc2dae4e9bcb473ff098ef48235827e41a1687a39825f0aa4","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"213e70ebed2703e14a9cf17666b21ecbf180b7bff7fa22fdbb36dbbd52df326d","src/unix/linux_like/linux/arch/generic/mod.rs":"1618634d37348032f5ce1dc9df1aaa1f1681bca4a275f23d41f42098c4d3b423","src/unix/linux_like/linux/arch/mips/mod.rs":"dac02cd01dbd3b222286887c64d398c031afc08d38850c2b3ce2fe7158d888e0","src/unix/linux_like/linux/arch/mod.rs":"466a29622e47c6c7f1500682b2eb17f5566dd81b322cd6348f0fdd355cec593a","src/unix/linux_like/linux/arch/powerpc/mod.rs":"1789eb5b41f75c29239795124a4a7cdcf7c8d213b88cf581b2f5bda08d7cf15b","src/unix/linux_like/linux/arch/sparc/mod.rs":"e7139d3bfb291a283c767e6201eac8bbb58c91839a36fa56bfe500fcb3aa754a","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"5e40c273b767c369a46c3315c7cfde97379944ed63c74735e98d4dae2c49d414","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"20b4c897fb3f63e31a04849b348ec8e6e6405ce9463048d411114f8c9dbabd8a","src/unix/linux_like/linux/gnu/b32/mod.rs":"794dbcbae7dae8fd6b0b814573243197ceb532b56ef0772ad86b4b401478fcd9","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"0cd7348badb9c4f8a0db31a2503b30c456a2bfcc7a0e5919762b1e12f912c5ad","src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs":"ee5145a383386b716605a8d1ff3df212d418aae1aa1f37d2307d4f9cd1a08e99","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/linux/gnu/b32/sparc/mod.rs":"a2c4ae8f31a74e4843b8ff4b6507419f403b52713169fcee9b1b24eb2324162a","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"525ee4917b54790cefc1298ec1015cea6332d818d9c7475434e94d06afdd59c0","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs":"21a21503ef2e095f4371044915d4bfb07a8578011cb5c713cd9f45947b0b5730","src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs":"e78c3cd197f44832338b414d1a9bc0d194f44c74db77bd7bf830c1fff62b2690","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"d179cbb462c451ff8805029b2b922c4bf90e35f667e80d716d5064f563aebc52","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"7d456da436017cb388b65b2c4b626c83b489cbb19a591673b9c627a608d53cfc","src/unix/linux_like/linux/gnu/b64/mod.rs":"6336065423c26b59681fd2ce77f1117ea36af13e163fdadaefd108bd8191e8c8","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"dbb8905e363ed4a2dfb984554ad9b6389d27f6a2d599ec2d80e38a6c7551a019","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"5b982c41097f4f91adcb0968290afeccb27dce1695a261c964d34ef85df87cf4","src/unix/linux_like/linux/gnu/b64/s390x.rs":"fce37140468f8914411eed0b25a882e60e1b54bcffcd33d6263a91b57d04f6c1","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"518ef78da0d81fe74cec30be411145d763fdfd249de4d108602fd0995781f590","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"76cba0a3f9456a968d2ae6ea587162b2ff04278dc5250cb176395c936579771b","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"f775ac2b754f90b63053fe22afe1d19d306b5404995568d6805baa9249fb617f","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"4ba1b58468f55254717366f50fdfd3e4114fde6dc442a56681926c4d7e5b6b0d","src/unix/linux_like/linux/gnu/mod.rs":"af3590c392bd06394cb307ccb993e66f53de7e2a0211c689dbb1845220475445","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"88ce2c4105c07c1262495e0ff1bd53f3ceec99adba9c20c612439838b4dbfdd6","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"6255abe2ee04986832d12b7b2190589580f2a43e9bfb285b32b5747227f62727","src/unix/linux_like/linux/musl/b32/hexagon.rs":"10067cde5706e1173aa8e0a3a364cf44fe5b7a9f8b71cb086c653be71af00564","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"b9e9ff42363ebbb884ddf6445129ec4164471df45846874fc08f5f458e659254","src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"4592dc5f1f2fe888dfef85fa862d42d168e73a2c6f4fc052b58287d0f4d4ffcd","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"a19a8decfab185af3cebd34aae4b15082e7552be573904b8c1a3f0c0e493ef34","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"798a9229d70ce235394f2dd625f6c4c1e10519a94382dc5b091952b638ae2928","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"a73035c6d9b776f13b839008e15c04c2c53455571efd06664affcb047e457112","src/unix/linux_like/linux/musl/b64/mips64.rs":"2744895451f3a777fbe54f7f2695be53310b965fd62084c9b7e9121c7fe28346", -+"src/unix/linux_like/linux/musl/b64/mod.rs":"d847206d9f2d594c8febe780a938cdccf40d985dafc11e90f235947735a09bac", -+"src/unix/linux_like/linux/musl/b64/powerpc64.rs":"e5a55525b42493923956d668f978fb45e22d51deea00ce5edbfddf76ff19c741","src/unix/linux_like/linux/musl/b64/s390x.rs":"03dfec6794d93cb31a7c52b2d53a0973755168f91f8fa437cc5dbd54882c8ee7","src/unix/linux_like/linux/musl/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/musl/b64/x86_64/mod.rs":"0dd168f5a6881f32e5239fb312b23cf137b800d0ff323286a92c8a2c382b5456", -+"src/unix/linux_like/linux/musl/mod.rs":"ac08dd0891304a0e6f478a38bffa4fe8e6b27ad79094b2f7139c7a95082c3a18", -+"src/unix/linux_like/linux/no_align.rs":"5ed04c53bf9d27da9b4d65ba7625c6ac53330162683d1b3df98950caafa3507b","src/unix/linux_like/linux/uclibc/align.rs":"9ed16138d8e439bd90930845a65eafa7ebd67366e6bf633936d44014f6e4c959","src/unix/linux_like/linux/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/arm/mod.rs":"1e3bf809508b5872949136859bf48ddf58b7d24ae9f0b663e79f0efd1aaeb6a6","src/unix/linux_like/linux/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs":"fa4102d9a596d90de604ce2962b0e64f184dfbf10552a4c3ecf28f12d4704379","src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/linux_like/linux/uclibc/mips/mod.rs":"a2877679fef0f14f54a89ccbc41fb02f0c25bf6e536f9eb2cb2fa437e1d3f739","src/unix/linux_like/linux/uclibc/mod.rs":"82d504d3aa12cb0f7933980f81c4708fa6e070d4c57efdf407f2de05b71bc06d","src/unix/linux_like/linux/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/linux_like/linux/uclibc/x86_64/l4re.rs":"024eba5753e852dbdd212427351affe7e83f9916c1864bce414d7aa2618f192e","src/unix/linux_like/linux/uclibc/x86_64/mod.rs":"66e8f5b7509a6e638b8b904906f89badbab0da8fb5b602d07ebd88649c4b961a","src/unix/linux_like/linux/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/unix/linux_like/mod.rs":"ffce98bdd208fd9d335c65feafbf0d9742bea67c7eec1ee48657f292132ec3f0","src/unix/mod.rs":"b72f18e053cca0ade0f0606f1848a773fcf1885c72cbb31889275e8195f060bd","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/espidf/mod.rs":"c198cb4beccdab483be61c102da74dc51ac80f766797e33021f3110394ed5a3d","src/unix/newlib/mod.rs":"d7271c13748be08305d36f9af6f41f6950a7a1d6d4382149194a35d5fe2090de","src/unix/newlib/no_align.rs":"e0743b2179495a9514bc3a4d1781e492878c4ec834ee0085d0891dd1712e82fb","src/unix/newlib/powerpc/mod.rs":"2d0f7af28b47f7a2a6c210ebd1c1f33ed8eac62e56b5af2b856de2ad3fdc5187","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"cc4794afa4fbed9d6612894ea476228f9d8533950162d6416fc4d16073e1dac4","src/unix/solarish/compat.rs":"b07a5bfac925eb012003a459ba6bddbd3bfa9c44b3394da2ac5a602e54beae9c","src/unix/solarish/illumos.rs":"7d8f47fd37880715b449723688aaee568785325a46f1c360a05bdca13252278e","src/unix/solarish/mod.rs":"ea9dd1c1d68927408342762ee8998a9628838974c91089f620c867910c29adba","src/unix/solarish/solaris.rs":"65b005453aefa9b9d4fc860fe77cfec80d8c97a51342b15daf55fc3e808bb384","src/unix/solarish/x86_64.rs":"9d761573bdccbdd1ac61da571f7e96b5374df70241d9b72d45a069611f495085","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"aea3da66f2140f2a82dfc9c58f6e6531d2dd9c15ea696e0f95a0d4a2a187b5b6","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"44ce56183380d18aedea9b7bec2edc5819e8529302c913bfe5d01f760155b82a","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"3c8c7edb7cdf5d0c44af936db2a94869585c69dfabeef30571b4f4e38375767a","src/windows/mod.rs":"1cd9223293255b994814487e28d9979fb8ebef4538a236c1aa47fdc166a149cc","src/windows/msvc/mod.rs":"c068271e00fca6b62bc4bf44bcf142cfc38caeded9b6c4e01d1ceef3ccf986f4","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4"},"package":"fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"}
meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch +6 -6
@@ -1,4 +1,4 @@ -From 6d1f0740b111e86e99dcaf0222f3d1d67d3bf1e6 Mon Sep 17 00:00:00 2001 +From c6d52d37c546ebaa5d794fd5bcfa1ca1fc249dc2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 21 Sep 2021 16:54:23 +0200 Subject: [PATCH] system-deps/src/lib.rs: do not probe into harcoded list of
@@ -14,18 +14,18 @@ Signed-off-by: Alexander Kanavin <[email protected]> 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/vendor/system-deps/.cargo-checksum.json b/vendor/system-deps/.cargo-checksum.json -index ecebb94..30d594e 100644 +index 725ee53..c3b8fe5 100644 --- a/vendor/system-deps/.cargo-checksum.json +++ b/vendor/system-deps/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"56ab5070dc9019b039c5e9904bb466b0879c33a7f69dd030b97abab321b7cc04","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"3fe7396637bf9233908f41c6001cfcb00a379225e06e36e508c8b3d7264a8aae","src/lib.rs":"015518f4337d80249d12c7e6c55e9063705a0b8805ebf46a445c89253edc5de0","src/metadata.rs":"4c8d6ac2c88646a5b97ecb50ed44b65e5b2865cce6897add85b29ca2ae08c2bb","src/test.rs":"1ec48d1e443a0a4ac8035a2b60ff0321543aa2fa998fee72cf7762a936bf5f8c","src/tests/testanotherlib.pc":"bb4fd942324e6d49ce3becd827aa5c948d1924ca6681904a3695c19b1424eb3c","src/tests/testdata.pc":"43f481e989c03674fed5ef78c6420b3f8d36a2ce001928d86c418d1844acd5e7","src/tests/testlib-2.0.pc":"152eb0c70c14c3d948118408f3d1fd3bb7531b02aa792db85bd957f7db90b45b","src/tests/testlib-3.0.pc":"cd39c2ef88f6828c9291150cc4b624e769abef484674eaebaa4f67979501315f","src/tests/testlib.pc":"75c0d8a5345f65794f583c83e1cf0dbf3385af6e6abea1d61bb86eef707a52db","src/tests/toml-missing-file/no-cargo-toml-here":"6ab4da4b56f15315df6538610cfcd2ba3d0f9a7a8414678ff00ab5a78f7d41fa"},"package":"480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"} +-{"files":{"Cargo.toml":"3923d630403610a69f9943621bd13c1033944124acc96642e194064dc8b0554a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"3fe7396637bf9233908f41c6001cfcb00a379225e06e36e508c8b3d7264a8aae","src/lib.rs":"d5c73ae844b7b45704591676bc53699006bfbc51ca8e36f1ca346f40721469d4","src/metadata.rs":"657bc1b77e949e4800f9dd808790ffa535820e1658d412121a1da548e0cdd02c","src/test.rs":"d0684718d09789d6f74a21dd1ffaa169ddec7cd2d007ebb559cd1aba50d9301a","src/tests/lib/libteststatic.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/tests/testanotherlib.pc":"bb4fd942324e6d49ce3becd827aa5c948d1924ca6681904a3695c19b1424eb3c","src/tests/testdata.pc":"43f481e989c03674fed5ef78c6420b3f8d36a2ce001928d86c418d1844acd5e7","src/tests/testlib-2.0.pc":"152eb0c70c14c3d948118408f3d1fd3bb7531b02aa792db85bd957f7db90b45b","src/tests/testlib-3.0.pc":"cd39c2ef88f6828c9291150cc4b624e769abef484674eaebaa4f67979501315f","src/tests/testlib.pc":"75c0d8a5345f65794f583c83e1cf0dbf3385af6e6abea1d61bb86eef707a52db","src/tests/teststaticlib.pc":"77df23f6c7c1d47aff18453b47c87e53ec8a96017546e0a55c8c4d1e13b70134","src/tests/toml-missing-file/no-cargo-toml-here":"6ab4da4b56f15315df6538610cfcd2ba3d0f9a7a8414678ff00ab5a78f7d41fa"},"package":"7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4"} \ No newline at end of file -+{"files":{"Cargo.toml":"56ab5070dc9019b039c5e9904bb466b0879c33a7f69dd030b97abab321b7cc04","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"3fe7396637bf9233908f41c6001cfcb00a379225e06e36e508c8b3d7264a8aae","src/lib.rs":"594e5f14180590adc9ea0a8ba1cc35f9a8a260322d08de3037efac3ce1dc729b","src/metadata.rs":"4c8d6ac2c88646a5b97ecb50ed44b65e5b2865cce6897add85b29ca2ae08c2bb","src/test.rs":"1ec48d1e443a0a4ac8035a2b60ff0321543aa2fa998fee72cf7762a936bf5f8c","src/tests/testanotherlib.pc":"bb4fd942324e6d49ce3becd827aa5c948d1924ca6681904a3695c19b1424eb3c","src/tests/testdata.pc":"43f481e989c03674fed5ef78c6420b3f8d36a2ce001928d86c418d1844acd5e7","src/tests/testlib-2.0.pc":"152eb0c70c14c3d948118408f3d1fd3bb7531b02aa792db85bd957f7db90b45b","src/tests/testlib-3.0.pc":"cd39c2ef88f6828c9291150cc4b624e769abef484674eaebaa4f67979501315f","src/tests/testlib.pc":"75c0d8a5345f65794f583c83e1cf0dbf3385af6e6abea1d61bb86eef707a52db","src/tests/toml-missing-file/no-cargo-toml-here":"6ab4da4b56f15315df6538610cfcd2ba3d0f9a7a8414678ff00ab5a78f7d41fa"},"package":"480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"} ++{"files":{"Cargo.toml":"3923d630403610a69f9943621bd13c1033944124acc96642e194064dc8b0554a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"3fe7396637bf9233908f41c6001cfcb00a379225e06e36e508c8b3d7264a8aae","src/lib.rs":"b822a9360e8f10930d48a27ce3ddb7e0ba3cbc5fb2054131ea9bdf55b1a45204","src/metadata.rs":"657bc1b77e949e4800f9dd808790ffa535820e1658d412121a1da548e0cdd02c","src/test.rs":"d0684718d09789d6f74a21dd1ffaa169ddec7cd2d007ebb559cd1aba50d9301a","src/tests/lib/libteststatic.a":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/tests/testanotherlib.pc":"bb4fd942324e6d49ce3becd827aa5c948d1924ca6681904a3695c19b1424eb3c","src/tests/testdata.pc":"43f481e989c03674fed5ef78c6420b3f8d36a2ce001928d86c418d1844acd5e7","src/tests/testlib-2.0.pc":"152eb0c70c14c3d948118408f3d1fd3bb7531b02aa792db85bd957f7db90b45b","src/tests/testlib-3.0.pc":"cd39c2ef88f6828c9291150cc4b624e769abef484674eaebaa4f67979501315f","src/tests/testlib.pc":"75c0d8a5345f65794f583c83e1cf0dbf3385af6e6abea1d61bb86eef707a52db","src/tests/teststaticlib.pc":"77df23f6c7c1d47aff18453b47c87e53ec8a96017546e0a55c8c4d1e13b70134","src/tests/toml-missing-file/no-cargo-toml-here":"6ab4da4b56f15315df6538610cfcd2ba3d0f9a7a8414678ff00ab5a78f7d41fa"},"package":"7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4"} diff --git a/vendor/system-deps/src/lib.rs b/vendor/system-deps/src/lib.rs -index a0d4f00..a666817 100644 +index be919e2..97536a3 100644 --- a/vendor/system-deps/src/lib.rs +++ b/vendor/system-deps/src/lib.rs -@@ -725,21 +725,7 @@ impl Config { +@@ -805,21 +805,7 @@ impl Config { } fn check_cfg(&self, cfg: &cfg_expr::Expression) -> Result<bool, Error> {
meta/recipes-gnome/librsvg/librsvg/0001-vendor-system-deps-sort-dependencies-before-using-th.patch deleted +0 -50
50 lines not on this page · raw message
meta/recipes-gnome/librsvg/librsvg/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch deleted +0 -898
898 lines not on this page · raw message
meta/recipes-gnome/librsvg/librsvg/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 4319893ebb7fca8bbd2bffc4bddb8d3ecdc08cc2 Mon Sep 17 00:00:00 2001 -From: Ralf Anton Beier <[email protected]> -Date: Sun, 8 Aug 2021 11:07:21 +0200 -Subject: [PATCH 6/8] FIXUP: linux/musl/mod.rs: add riscv64 to b64 set - - libc-0.2.93 - -https://github.com/rust-lang/libc/pull/1994/commits/30070c822be2ef399b2ba38cdc1d72ac694d65a3 - -Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2537] -Signed-off-by: Khem Raj <[email protected]> -Signed-off-by: Ralf Anton Beier <[email protected]> ---- - vendor/libc-0.2.93/src/unix/linux_like/linux/musl/mod.rs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/vendor/libc/src/unix/linux_like/linux/musl/mod.rs -+++ b/vendor/libc/src/unix/linux_like/linux/musl/mod.rs -@@ -800,7 +800,8 @@ cfg_if! { - target_arch = "aarch64", - target_arch = "mips64", - target_arch = "powerpc64", -- target_arch = "s390x"))] { -+ target_arch = "s390x", -+ target_arch = "riscv64"))] { - mod b64; - pub use self::b64::*; - } else if #[cfg(any(target_arch = "x86",
meta/recipes-gnome/librsvg/librsvg/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch deleted +0 -737
737 lines not on this page · raw message
meta/recipes-gnome/librsvg/librsvg_2.52.5.bb renamed from meta/recipes-gnome/librsvg/librsvg_2.52.4.bb +1 -6
@@ -18,14 +18,9 @@ inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspec SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ - file://0001-vendor-system-deps-sort-dependencies-before-using-th.patch \ - file://0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch \ - file://0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch \ - file://0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch \ - file://0001-Update-checksums-for-modified-files-for-libc.patch \ " -SRC_URI[archive.sha256sum] = "660ec8836a3a91587bc9384920132d4c38d1d1718c67fe160c5213fe4dec2928" +SRC_URI[archive.sha256sum] = "407cbbab518137ea18a3f3220bea180fbee75f3e5bd6ba10a7a862c1a6f74d82" # librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles # so we cannot use cargo class directly, but still need bits and pieces from it
Signature · 1 line
2.20.1
PATCH 9/14 libportal: update 0.4 -> 0.5
In reply to Alexander Kanavin---
.../libportal/{libportal_0.4.bb => libportal_0.5.bb} | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-gnome/libportal/{libportal_0.4.bb => libportal_0.5.bb} (60%)meta/recipes-gnome/libportal/libportal_0.5.bb renamed from meta/recipes-gnome/libportal/libportal_0.4.bb +6 -6
@@ -3,15 +3,15 @@ DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals with a familiar GObject API along side the D-Bus API" HOMEPAGE = "https://github.com/flatpak/libportal" BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" -SRCREV = "f68764e288ede516d902b131cc4fadded3804059" +SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" S = "${WORKDIR}/git" -GTKDOC_MESON_OPTION = 'gtk_doc' +inherit meson gtk-doc gobject-introspection -inherit meson gtk-doc +DEPENDS += "glib-2.0 glib-2.0-native gtk+3" -DEPENDS += "glib-2.0 glib-2.0-native" +EXTRA_OEMESON = "-Dbackends=gtk3 -Dvapi=false"
Signature · 1 line
2.20.1
PATCH 10/14 epiphany: make libportal optional, and move it to meta-oe
In reply to Alexander Kanavin--- meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-gnome/epiphany/epiphany_41.0.bb | 2 +- meta/recipes-gnome/libportal/libportal_0.5.bb | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-gnome/libportal/libportal_0.5.bb
meta/conf/distro/include/maintainers.inc +0 -1
@@ -369,7 +369,6 @@ RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-libpcre2 = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libpipeline = "Wang Mingyu <[email protected]>" RECIPE_MAINTAINER:pn-libpng = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-libportal = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libproxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libpthread-stubs = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libptytty = "Alexander Kanavin <[email protected]>"
meta/recipes-gnome/epiphany/epiphany_41.0.bb +1 -1
@@ -15,7 +15,6 @@ DEPENDS = " \ libarchive \ libdazzle \ libhandy \ - libportal \ glib-2.0-native \ "
@@ -37,6 +36,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal" FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0 -17
@@ -1,17 +0,0 @@ -SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals." -DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals \ -with a familiar GObject API along side the D-Bus API" -HOMEPAGE = "https://github.com/flatpak/libportal" -BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" - -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" -SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" -S = "${WORKDIR}/git" - -inherit meson gtk-doc gobject-introspection - -DEPENDS += "glib-2.0 glib-2.0-native gtk+3" - -EXTRA_OEMESON = "-Dbackends=gtk3 -Dvapi=false"
Signature · 1 line
2.20.1
Re: [OE-core] [PATCH 10/14] epiphany: make libportal optional, and move it to meta-oe
seeing this error
https://errors.yoctoproject.org/Errors/Details/621908/
Quoted 76 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-gnome/epiphany/epiphany_41.0.bb | 2 +- meta/recipes-gnome/libportal/libportal_0.5.bb | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-gnome/libportal/libportal_0.5.bbmeta/conf/distro/include/maintainers.inc +0
-1@@ -369,7 +369,6 @@ RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-libpcre2 = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libpipeline = "Wang Mingyu <[email protected]>" RECIPE_MAINTAINER:pn-libpng = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-libportal = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libproxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libpthread-stubs = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libptytty = "Alexander Kanavin <[email protected]>"meta/recipes-gnome/epiphany/epiphany_41.0.bb +1
-1@@ -15,7 +15,6 @@ DEPENDS = " \ libarchive \ libdazzle \ libhandy \ - libportal \ glib-2.0-native \ "@@ -37,6 +36,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal" FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-18@@ -1,17 +0,0 @@ -SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals." -DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals \ -with a familiar GObject API along side the D-Bus API" -HOMEPAGE = "https://github.com/flatpak/libportal" -BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" - -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" -SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" -S = "${WORKDIR}/git" - -inherit meson gtk-doc gobject-introspection - -DEPENDS += "glib-2.0 glib-2.0-native gtk+3" - -EXTRA_OEMESON = "-Dbackends=gtk3 -Dvapi=false" --2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160313): https://lists.openembedded.org/g/openembedded-core/message/160313
Mute This Topic: https://lists.openembedded.org/mt/88311445/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/14] epiphany: make libportal optional, and move it to meta-oe
Was this patch included in the build?
Alex
Quoted 102 lines · Khem Raj
seeing this error
https://errors.yoctoproject.org/Errors/Details/621908/
Review
Quoted 10 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-gnome/epiphany/epiphany_41.0.bb | 2 +- meta/recipes-gnome/libportal/libportal_0.5.bb | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-gnome/libportal/libportal_0.5.bb(quoted diff) +0
-0b/meta/conf/distro/include/maintainers.inc
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <
Quoted 4 lines
index
0af6974a3d..ab7915482a100644meta/conf/distro/include/maintainers.inc +0
-0@@ -369,7 +369,6 @@ RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao < · line 369
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER:pn-libpcre2 = "Unassigned <meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <[email protected]>"
Quoted 3 lines
meta/conf/distro/include/maintainers.inc +0
-1RECIPE_MAINTAINER:pn-libpipeline = "Wang Mingyu <[email protected]>" RECIPE_MAINTAINER:pn-libpng = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-libportal = "Alexander Kanavin <meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao < · line 373
Quoted 2 lines
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER:pn-libproxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libpthread-stubs = "Alexander Kanavin <meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao < · line 374
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER:pn-libptytty = "Alexander Kanavin <Review
Quoted 1 line
(quoted diff) +0
-0b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 36
Quoted 13 lines
index
8f3bd87340..a64cdefd86100644meta/recipes-gnome/epiphany/epiphany_41.0.bb +0
-1@@ -15,7 +15,6 @@ DEPENDS = " \ libarchive \ libdazzle \ libhandy \ - libportal \ glib-2.0-native \ "@@ -37,6 +36,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" PACKAGECONFIG[developer-mode] ="-Ddeveloper_mode=true,-Ddeveloper_mode=false"
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 37
Quoted 1 line
meta/recipes-gnome/epiphany/epiphany_41.0.bb +0
-0PACKAGECONFIG[soup2] ="-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3"
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 39
Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_41.0.bb +1
-0PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[libportal] ="-Dlibportal=enabled,-Dlibportal=disabled,libportal"
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 40
Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_41.0.bb +0
-0FILES:${PN} += "${datadir}/dbus-1${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 41
Quoted 1 line
meta/recipes-gnome/epiphany/epiphany_41.0.bb +0
-0RDEPENDS:${PN} = "iso-codes adwaita-icon-themegsettings-desktop-schemas"
Review
Quoted 1 line
(quoted diff) +0
-0b/meta/recipes-gnome/libportal/libportal_0.5.bb
meta/recipes-gnome/libportal/libportal_0.5.bb line 1
Quoted 6 lines
deleted file mode 100644
index 67f63fea68..0000000000meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-1@@ -1,17 +0,0 @@ -SUMMARY = "libportal provides GIO-style async APIs for most Flatpakportals."
meta/recipes-gnome/libportal/libportal_0.5.bb line 2
Quoted 1 line
meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-1-DESCRIPTION = "It provides simple asynchronous wrappers for mostFlatpak portals \
meta/recipes-gnome/libportal/libportal_0.5.bb
Quoted 7 lines
meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-7-with a familiar GObject API along side the D-Bus API" -HOMEPAGE = "https://github.com/flatpak/libportal" -BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" - -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master
<http://github.com/flatpak/$%7BBPN%7D.git;protocol=https;branch=master>"Quoted 12 lines
meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-9-SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" -S = "${WORKDIR}/git" - -inherit meson gtk-doc gobject-introspection - -DEPENDS += "glib-2.0 glib-2.0-native gtk+3" - -EXTRA_OEMESON = "-Dbackends=gtk3 -Dvapi=false" --2.20.1
Quoted 3 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#160313):https://lists.openembedded.org/g/openembedded-core/message/160313
Quoted 3 lines
Mute This Topic: https://lists.openembedded.org/mt/88311445/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [Quoted 2 lines
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/14] epiphany: make libportal optional, and move it to meta-oe
Quoted 2 lines · Alexander Kanavin
Was this patch included in the build?
I had included the meta-oe patch that you posted for sure. I am also seeing failing build with similar errors for nautilus see
https://errors.yoctoproject.org/Errors/Details/621931/
Quoted 86 lines
Alex
Quoted 82 lines · Khem Raj
seeing this error
https://errors.yoctoproject.org/Errors/Details/621908/
Quoted 76 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-gnome/epiphany/epiphany_41.0.bb | 2 +- meta/recipes-gnome/libportal/libportal_0.5.bb | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-gnome/libportal/libportal_0.5.bbmeta/conf/distro/include/maintainers.inc +0
-1@@ -369,7 +369,6 @@ RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-libpcre2 = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libpipeline = "Wang Mingyu <[email protected]>" RECIPE_MAINTAINER:pn-libpng = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-libportal = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libproxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libpthread-stubs = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libptytty = "Alexander Kanavin <[email protected]>"meta/recipes-gnome/epiphany/epiphany_41.0.bb +1
-1@@ -15,7 +15,6 @@ DEPENDS = " \ libarchive \ libdazzle \ libhandy \ - libportal \ glib-2.0-native \ "@@ -37,6 +36,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal" FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-18@@ -1,17 +0,0 @@ -SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals." -DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals \ -with a familiar GObject API along side the D-Bus API" -HOMEPAGE = "https://github.com/flatpak/libportal" -BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" - -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" -SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" -S = "${WORKDIR}/git" - -inherit meson gtk-doc gobject-introspection - -DEPENDS += "glib-2.0 glib-2.0-native gtk+3" - -EXTRA_OEMESON = "-Dbackends=gtk3 -Dvapi=false" --2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160313): https://lists.openembedded.org/g/openembedded-core/message/160313
Mute This Topic: https://lists.openembedded.org/mt/88311445/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/14] epiphany: make libportal optional, and move it to meta-oe
For epiphany you also need the oe-core patch. Nautilus should switch to an optional dependency via PACKAGECONFIG, similar to epiphany.
Alex
Quoted 119 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
Was this patch included in the build?
I had included the meta-oe patch that you posted for sure. I am also seeing failing build with similar errors for nautilus see
https://errors.yoctoproject.org/Errors/Details/621931/Quoted 10 lines
Alex
Quoted 6 lines · Khem Raj
seeing this error
https://errors.yoctoproject.org/Errors/Details/621908/
On Sun, Jan 9, 2022 at 2:28 PM Alexander Kanavin <
Quoted 10 lines · [email protected]> wrote:
Quoted 10 lines
Review
Quoted 10 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-gnome/epiphany/epiphany_41.0.bb | 2 +- meta/recipes-gnome/libportal/libportal_0.5.bb | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-gnome/libportal/libportal_0.5.bb(quoted diff) +0
-0b/meta/conf/distro/include/maintainers.inc
Quoted 4 lines
Quoted 4 lines
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <
Quoted 4 lines
index
0af6974a3d..ab7915482a100644meta/conf/distro/include/maintainers.inc +0
-0@@ -369,7 +369,6 @@ RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <Quoted 1 line
Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao < · line 369
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER:pn-libpcre2 = "Unassigned <Quoted 4 lines
Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao < · line 370
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER:pn-libpipeline = "Wang Mingyu <[email protected]"
Quoted 2 lines
Quoted 2 lines
meta/conf/distro/include/maintainers.inc +0
-1RECIPE_MAINTAINER:pn-libpng = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-libportal = "Alexander Kanavin <Quoted 3 lines
Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao < · line 372
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER:pn-libproxy = "Anuj Mittal <[email protected]"
Quoted 1 line
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER:pn-libpthread-stubs = "Alexander Kanavin <Quoted 1 line
Quoted 1 line
meta/conf/distro/include/maintainers.inc RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao < · line 374
Quoted 1 line
meta/conf/distro/include/maintainers.inc +0
-0RECIPE_MAINTAINER:pn-libptytty = "Alexander Kanavin <Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
index
8f3bd87340..a64cdefd86100644meta/recipes-gnome/epiphany/epiphany_41.0.bb +0
-1@@ -15,7 +15,6 @@ DEPENDS = " \ libarchive \ libdazzle \ libhandy \ - libportal \ glib-2.0-native \ "Quoted 2 lines
Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 36
Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_41.0.bb +0
-0@@ -37,6 +36,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" PACKAGECONFIG[developer-mode] ="-Ddeveloper_mode=true,-Ddeveloper_mode=false"
Quoted 1 line
Quoted 1 line
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 37
Quoted 1 line
meta/recipes-gnome/epiphany/epiphany_41.0.bb +0
-0PACKAGECONFIG[soup2] ="-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3"
Quoted 2 lines
Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 39
Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_41.0.bb +1
-0PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[libportal] ="-Dlibportal=enabled,-Dlibportal=disabled,libportal"
Quoted 2 lines
Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 40
Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_41.0.bb +0
-0FILES:${PN} += "${datadir}/dbus-1${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
Quoted 1 line
Quoted 1 line
meta/recipes-gnome/epiphany/epiphany_41.0.bb PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" · line 41
Quoted 1 line
meta/recipes-gnome/epiphany/epiphany_41.0.bb +0
-0RDEPENDS:${PN} = "iso-codes adwaita-icon-themegsettings-desktop-schemas"
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0b/meta/recipes-gnome/libportal/libportal_0.5.bb
Quoted 6 lines
Quoted 6 lines
meta/recipes-gnome/libportal/libportal_0.5.bb line 1
Quoted 6 lines
deleted file mode 100644
index 67f63fea68..0000000000meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-1@@ -1,17 +0,0 @@ -SUMMARY = "libportal provides GIO-style async APIs for most Flatpakportals."
Quoted 1 line
Quoted 1 line
meta/recipes-gnome/libportal/libportal_0.5.bb line 2
Quoted 1 line
meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-1-DESCRIPTION = "It provides simple asynchronous wrappers for mostFlatpak portals \
Quoted 5 lines
Quoted 5 lines
meta/recipes-gnome/libportal/libportal_0.5.bb
Quoted 5 lines
meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-5-with a familiar GObject API along side the D-Bus API" -HOMEPAGE = "https://github.com/flatpak/libportal" -BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM ="file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
Quoted 2 lines
Quoted 2 lines
meta/recipes-gnome/libportal/libportal_0.5.bb line 9
Quoted 2 lines
meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-2- -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master
<http://github.com/flatpak/$%7BBPN%7D.git;protocol=https;branch=master>"Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-9-SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" -S = "${WORKDIR}/git" - -inherit meson gtk-doc gobject-introspection - -DEPENDS += "glib-2.0 glib-2.0-native gtk+3" - -EXTRA_OEMESON = "-Dbackends=gtk3 -Dvapi=false" --2.20.1
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#160313):https://lists.openembedded.org/g/openembedded-core/message/160313
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Mute This Topic: https://lists.openembedded.org/mt/88311445/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsubQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/14] epiphany: make libportal optional, and move it to meta-oe
Quoted 2 lines · Alexander Kanavin
For epiphany you also need the oe-core patch. Nautilus should switch to an optional dependency via PACKAGECONFIG, similar to epiphany.
I might have missed the OE-core patch perhaps, I will rebuild with latest master-next perhaps and see if that helps
Quoted 100 lines
Alex
Quoted 96 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
Was this patch included in the build?
I had included the meta-oe patch that you posted for sure. I am also seeing failing build with similar errors for nautilus see
https://errors.yoctoproject.org/Errors/Details/621931/Quoted 86 lines
Alex
Quoted 82 lines · Khem Raj
seeing this error
https://errors.yoctoproject.org/Errors/Details/621908/
Quoted 76 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-gnome/epiphany/epiphany_41.0.bb | 2 +- meta/recipes-gnome/libportal/libportal_0.5.bb | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-gnome/libportal/libportal_0.5.bbmeta/conf/distro/include/maintainers.inc +0
-1@@ -369,7 +369,6 @@ RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-libpcre2 = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libpipeline = "Wang Mingyu <[email protected]>" RECIPE_MAINTAINER:pn-libpng = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-libportal = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libproxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libpthread-stubs = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libptytty = "Alexander Kanavin <[email protected]>"meta/recipes-gnome/epiphany/epiphany_41.0.bb +1
-1@@ -15,7 +15,6 @@ DEPENDS = " \ libarchive \ libdazzle \ libhandy \ - libportal \ glib-2.0-native \ "@@ -37,6 +36,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal" FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-18@@ -1,17 +0,0 @@ -SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals." -DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals \ -with a familiar GObject API along side the D-Bus API" -HOMEPAGE = "https://github.com/flatpak/libportal" -BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" - -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" -SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" -S = "${WORKDIR}/git" - -inherit meson gtk-doc gobject-introspection - -DEPENDS += "glib-2.0 glib-2.0-native gtk+3" - -EXTRA_OEMESON = "-Dbackends=gtk3 -Dvapi=false" --2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160313): https://lists.openembedded.org/g/openembedded-core/message/160313
Mute This Topic: https://lists.openembedded.org/mt/88311445/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/14] epiphany: make libportal optional, and move it to meta-oe
Quoted 8 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
For epiphany you also need the oe-core patch. Nautilus should switch to an optional dependency via PACKAGECONFIG, similar to epiphany.
I might have missed the OE-core patch perhaps, I will rebuild with latest master-next perhaps and see if that helps
digging a bit deeper reveals this
../nautilus-41.1/src/nautilus-files-view.c:95:10: fatal error:
'libportal/portal-gtk3.h' file not found
#include <libportal/portal-gtk3.h>
^~~~~~~~~~~~~~~~~~~~~~~~~1 error generated.
but libportal is staging it in
% find ../ -name portal-gtk3.h ../recipe-sysroot/usr/include/libportal-gtk3/portal-gtk3.h
and this is happening with 0.5 upgrade of libportal. I guess nautilus needs to be patches perhaps.
Quoted 101 lines
Quoted 101 lines
Alex
Quoted 96 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
Was this patch included in the build?
I had included the meta-oe patch that you posted for sure. I am also seeing failing build with similar errors for nautilus see
https://errors.yoctoproject.org/Errors/Details/621931/Quoted 86 lines
Alex
Quoted 82 lines · Khem Raj
seeing this error
https://errors.yoctoproject.org/Errors/Details/621908/
Quoted 76 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-gnome/epiphany/epiphany_41.0.bb | 2 +- meta/recipes-gnome/libportal/libportal_0.5.bb | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-gnome/libportal/libportal_0.5.bbmeta/conf/distro/include/maintainers.inc +0
-1@@ -369,7 +369,6 @@ RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-libpcre2 = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libpipeline = "Wang Mingyu <[email protected]>" RECIPE_MAINTAINER:pn-libpng = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-libportal = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libproxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libpthread-stubs = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libptytty = "Alexander Kanavin <[email protected]>"meta/recipes-gnome/epiphany/epiphany_41.0.bb +1
-1@@ -15,7 +15,6 @@ DEPENDS = " \ libarchive \ libdazzle \ libhandy \ - libportal \ glib-2.0-native \ "@@ -37,6 +36,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal" FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"meta/recipes-gnome/libportal/libportal_0.5.bb deleted +0
-18@@ -1,17 +0,0 @@ -SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals." -DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals \ -with a familiar GObject API along side the D-Bus API" -HOMEPAGE = "https://github.com/flatpak/libportal" -BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" - -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" -SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" -S = "${WORKDIR}/git" - -inherit meson gtk-doc gobject-introspection - -DEPENDS += "glib-2.0 glib-2.0-native gtk+3" - -EXTRA_OEMESON = "-Dbackends=gtk3 -Dvapi=false" --2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160313): https://lists.openembedded.org/g/openembedded-core/message/160313
Mute This Topic: https://lists.openembedded.org/mt/88311445/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/14] epiphany: make libportal optional, and move it to meta-oe
Quoted 19 lines · Khem Raj
Quoted 5 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
For epiphany you also need the oe-core patch. Nautilus should switch
to an optional dependency via PACKAGECONFIG, similar to epiphany.
Quoted 3 lines
I might have missed the OE-core patch perhaps, I will rebuild with latest master-next perhaps and see if that helps
digging a bit deeper reveals this
../nautilus-41.1/src/nautilus-files-view.c:95:10: fatal error:
'libportal/portal-gtk3.h' file not found#include <libportal/portal-gtk3.h> ^~~~~~~~~~~~~~~~~~~~~~~~~1 error generated.
Quoted 8 lines
but libportal is staging it in
% find ../ -name
portal-gtk3.h../recipe-sysroot/usr/include/libportal-gtk3/portal-gtk3.hand this is happening with 0.5 upgrade of libportal. I guess nautilus needs to be patches perhaps.
It's a lot easier to just turn the dependency into a PACKAGECONFIG, and in due time upstream will address it. It's not an essential feature at all.
Alex
Re: [OE-core] [PATCH 10/14] epiphany: make libportal optional, and move it to meta-oe
Quoted 23 lines · Alexander Kanavin
Quoted 21 lines · Khem Raj
Quoted 8 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
For epiphany you also need the oe-core patch. Nautilus should switch to an optional dependency via PACKAGECONFIG, similar to epiphany.
I might have missed the OE-core patch perhaps, I will rebuild with latest master-next perhaps and see if that helps
digging a bit deeper reveals this
../nautilus-41.1/src/nautilus-files-view.c:95:10: fatal error:
'libportal/portal-gtk3.h' file not found#include <libportal/portal-gtk3.h> ^~~~~~~~~~~~~~~~~~~~~~~~~1 error generated.
but libportal is staging it in
Quoted 8 lines
Quoted 5 lines
% find ../ -name
portal-gtk3.h../recipe-sysroot/usr/include/libportal-gtk3/portal-gtk3.hand this is happening with 0.5 upgrade of libportal. I guess nautilus needs to be patches perhaps.
It's a lot easier to just turn the dependency into a PACKAGECONFIG, and in due time upstream will address it. It's not an essential feature at all.
I have sent a fix to contain the breakage. Generally, its good to keep the dependencies working when doing such incisive changes
Quoted 2 lines
Alex
PATCH 11/14 qemuboot/runqemu: fully form the ip= kernel parameter
In reply to Alexander KanavinNew systemd is actually parsing this in systemd-network-generator and fails if it is not fully formed. 'off' means 'static ip, do nothing':
https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt
--- meta/classes/qemuboot.bbclass | 2 +- meta/lib/oeqa/utils/qemurunner.py | 2 +- scripts/runqemu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/classes/qemuboot.bbclass +1 -1
@@ -93,7 +93,7 @@ QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-p QB_OPT_APPEND ?= "" QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" QB_CMDLINE_IP_SLIRP ?= "ip=dhcp" -QB_CMDLINE_IP_TAP ?= "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0" +QB_CMDLINE_IP_TAP ?= "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0::eth0:off:8.8.8.8" QB_ROOTFS_EXTRA_OPT ?= "" QB_GRAPHICS ?= ""
meta/lib/oeqa/utils/qemurunner.py +1 -1
@@ -407,7 +407,7 @@ class QemuRunner: self.logger.debug("qemu cmdline used:\n{}".format(cmdline)) except (IndexError, ValueError): # Try to get network configuration from runqemu output - match = re.match(r'.*Network configuration: (?:ip=)*([0-9.]+)::([0-9.]+):([0-9.]+)$.*', + match = re.match(r'.*Network configuration: (?:ip=)*([0-9.]+)::([0-9.]+):([0-9.]+).*', out, re.MULTILINE|re.DOTALL) if match: self.ip, self.server_ip, self.netmask = match.groups()
scripts/runqemu +1 -1
@@ -199,7 +199,7 @@ class BaseConfig(object): self.fsinfo = {} self.network_device = "-device e1000,netdev=net0,mac=@MAC@" self.cmdline_ip_slirp = "ip=dhcp" - self.cmdline_ip_tap = "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0" + self.cmdline_ip_tap = "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0::eth0:off:8.8.8.8" # Use different mac section for tap and slirp to avoid # conflicts, e.g., when one is running with tap, the other is # running with slirp.
Signature · 1 line
2.20.1
PATCH 12/14 parselogs: add a couple systemd false positives
In reply to Alexander KanavinNew systemd has changed the phrasing when skipping things, with unfortunate use of 'failed':
[ 1.623667] systemd[1]: Journal Audit Socket was skipped because of a failed condition check (ConditionSecurity=audit). [ 1.688258] systemd[1]: Load Kernel Modules was skipped because all trigger condition checks failed.
--- meta/lib/oeqa/runtime/cases/parselogs.py | 2 ++ 1 file changed, 2 insertions(+)
meta/lib/oeqa/runtime/cases/parselogs.py +2 -0
@@ -62,6 +62,8 @@ common_errors = [ "[rndr ]: Initialization Failed", "[pulseaudio] authkey.c: Failed to open cookie file", "[pulseaudio] authkey.c: Failed to load authentication key", + "was skipped because of a failed condition check", + "was skipped because all trigger condition checks failed", ] video_related = [
Signature · 1 line
2.20.1
PATCH 13/14 connman: do nothing in qemu, do not touch eth0
In reply to Alexander Kanavinqemu kernel itself is nowdays perfectly capable of setting up what was passed in via ip=:
[ 1.676847] IP-Config: Complete: [ 1.677768] device=eth0, hwaddr=52:54:00:12:34:02, ipaddr=192.168.7.2, mask=255.255.255.0, gw=192.168.7.1 [ 1.679933] host=192.168.7.2, domain=, nis-domain=(none) [ 1.681201] bootserver=255.255.255.255, rootserver=255.255.255.255, rootpath= [ 1.681203] nameserver0=8.8.8.8
connman-conf only does the same thing again by (badly and incompletely) parsing those parameters with sed.
--- meta/conf/distro/include/maintainers.inc | 1 - meta/conf/layer.conf | 1 - .../connman/connman-conf.bb | 36 ------------------- .../qemuall/wired-connection.service | 10 ------ .../connman/connman-conf/qemuall/wired-setup | 16 --------- .../connman/connman-conf/qemuall/wired.config | 9 ----- meta/recipes-connectivity/connman/connman.inc | 6 ++++ .../connman/connman/connman | 5 ++- .../connman/connman_1.40.bb | 1 - 9 files changed, 8 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman-conf.bb delete mode 100644 meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service delete mode 100644 meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup delete mode 100644 meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
meta/conf/distro/include/maintainers.inc +0 -1
@@ -97,7 +97,6 @@ RECIPE_MAINTAINER:pn-chrpath = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-cmake = "Pascal Bach <[email protected]>" RECIPE_MAINTAINER:pn-cmake-native = "Pascal Bach <[email protected]>" RECIPE_MAINTAINER:pn-connman = "Changhyeok Bae <[email protected]>" -RECIPE_MAINTAINER:pn-connman-conf = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-connman-gnome = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-consolekit = "Chen Qi <[email protected]>" RECIPE_MAINTAINER:pn-core-image-base = "Richard Purdie <[email protected]>"
meta/conf/layer.conf +0 -1
@@ -27,7 +27,6 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ opkg-arch-config \ netbase \ init-ifupdown \ - connman-conf \ formfactor \ xserver-xf86-config \ pointercal-xinput \
meta/recipes-connectivity/connman/connman-conf.bb deleted +0 -36
@@ -1,36 +0,0 @@ -SUMMARY = "Connman config to setup wired interface on qemu machines" -DESCRIPTION = "This is the ConnMan configuration to set up a Wired \ -network interface for a qemu machine." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" - -inherit systemd - -SRC_URI:append:qemuall = " file://wired.config \ - file://wired-setup \ - file://wired-connection.service \ -" -PR = "r2" - -S = "${WORKDIR}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -FILES:${PN} = "${localstatedir}/* ${datadir}/*" - -do_install() { - #Configure Wired network interface in case of qemu* machines - if test -e ${WORKDIR}/wired.config && - test -e ${WORKDIR}/wired-setup && - test -e ${WORKDIR}/wired-connection.service; then - install -d ${D}${localstatedir}/lib/connman - install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman - install -d ${D}${datadir}/connman - install -m 0755 ${WORKDIR}/wired-setup ${D}${datadir}/connman - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/wired-connection.service ${D}${systemd_system_unitdir} - sed -i -e 's|@SCRIPTDIR@|${datadir}/connman|g' ${D}${systemd_system_unitdir}/wired-connection.service - fi -} - -SYSTEMD_SERVICE:${PN}:qemuall = "wired-connection.service"
meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service deleted +0 -10
@@ -1,10 +0,0 @@ -[Unit] -Description=Setup a wired interface -Before=connman.service - -[Service] -Type=oneshot -ExecStart=@SCRIPTDIR@/wired-setup - -[Install] -WantedBy=network.target
meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup deleted +0 -16
@@ -1,16 +0,0 @@ -#!/bin/sh - -CONFIGF=/var/lib/connman/wired.config - -# Extract wired network config from /proc/cmdline -NET_CONF=`cat /proc/cmdline |sed -ne 's/^.*ip=\([^ ]*\):\([^ ]*\):\([^ ]*\):\([^ ]*\).*$/\1\/\4\/\3/p'` - -# Check if eth0 is already set via kernel cmdline -if [ "x$NET_CONF" = "x" ]; then - # Wired interface is not configured via kernel cmdline - # Remove connman config file template - rm -f ${CONFIGF} -else - # Setup a connman config accordingly - sed -i -e "s|^IPv4 =.*|IPv4 = ${NET_CONF}|" ${CONFIGF} -fi
meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config deleted +0 -9
@@ -1,9 +0,0 @@ -[global] -Name = Wired -Description = Wired network configuration - -[service_ethernet] -Type = ethernet -IPv4 = -MAC = 52:54:00:12:34:56 -Nameservers = 8.8.8.8
meta/recipes-connectivity/connman/connman.inc +6 -0
@@ -101,6 +101,12 @@ do_install:append() { fi } +# Kernel IP-Config is perfectly capable of setting up networking passed in via ip= +do_install:append:qemuall() { + mkdir -p ${D}${sysconfdir}/default + echo "export EXTRA_PARAM=\"-I eth0\"" > ${D}${sysconfdir}/default/connman +} + # These used to be plugins, but now they are core RPROVIDES:${PN} = "\ connman-plugin-loopback \
meta/recipes-connectivity/connman/connman/connman +2 -3
@@ -27,7 +27,6 @@ while read dev mtpt fstype rest; do done do_start() { - EXTRA_PARAM="" if test $nfsroot -eq 1 ; then NET_DEVS=`cat /proc/net/dev | sed -ne 's/^\([a-zA-Z0-9 ]*\):.*$/\1/p'` NET_ADDR=`cat /proc/cmdline | sed -ne 's/^.*ip=\([^ :]*\).*$/\1/p'`
@@ -36,13 +35,13 @@ do_start() { if [ "$NET_ADDR" = dhcp ]; then ethn=`ifconfig | grep "^eth" | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"` if [ ! -z "$ethn" ]; then - EXTRA_PARAM="-I $ethn" + EXTRA_PARAM="$EXTRA_PARAM -I $ethn" fi else for i in $NET_DEVS; do ADDR=`ifconfig $i | sed 's/addr://g' | sed -ne 's/^.*inet \([0-9.]*\) .*$/\1/p'` if [ "$NET_ADDR" = "$ADDR" ]; then - EXTRA_PARAM="-I $i" + EXTRA_PARAM="$EXTRA_PARAM -I $i" break fi done
meta/recipes-connectivity/connman/connman_1.40.bb +0 -1
@@ -11,5 +11,4 @@ SRC_URI:append:libc-musl = " file://0002-resolve-musl-does-not-implement-res_nin SRC_URI[sha256sum] = "1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12" -RRECOMMENDS:${PN} = "connman-conf" RCONFLICTS:${PN} = "networkmanager"
Signature · 1 line
2.20.1
Re: [OE-core] [PATCH 13/14] connman: do nothing in qemu, do not touch eth0
Quoted 14 lines · Alexander Kanavin
qemu kernel itself is nowdays perfectly capable of setting up what was passed in via ip=:
[ 1.676847] IP-Config: Complete: [ 1.677768] device=eth0, hwaddr=52:54:00:12:34:02, ipaddr=192.168.7.2, mask=255.255.255.0, gw=192.168.7.1 [ 1.679933] host=192.168.7.2, domain=, nis-domain=(none) [ 1.681201] bootserver=255.255.255.255, rootserver=255.255.255.255, rootpath= [ 1.681203] nameserver0=8.8.8.8connman-conf only does the same thing again by (badly and incompletely) parsing those parameters with sed.
Signed-off-by Alexander Kanavin <[email protected]>
[...]
Quoted 7 lines
meta/recipes-connectivity/connman/connman.inc +0
-0@@ -101,6 +101,12 @@ do_install:append() { fi }
meta/recipes-connectivity/connman/connman.inc do_install:append() { · line 112
Quoted 10 lines
meta/recipes-connectivity/connman/connman.inc +6
-0+# Kernel IP-Config is perfectly capable of setting up networking passed in via ip= +do_install:append:qemuall() { + mkdir -p ${D}${sysconfdir}/default + echo "export EXTRA_PARAM=\"-I eth0\"" > ${D}${sysconfdir}/default/connman +} + # These used to be plugins, but now they are core RPROVIDES:${PN} = "\ connman-plugin-loopback \
This means connman becomes machine specific, you can't do that. This would need to be done in the connman-conf recipe.
Cheers,
Richard
Re: [OE-core] [PATCH 13/14] connman: do nothing in qemu, do not touch eth0
Quoted 5 lines · Richard Purdie
Quoted 1 line
+# Kernel IP-Config is perfectly capable of setting up networking passed
in via ip=
meta/recipes-connectivity/connman/connman.inc do_install:append() {
Quoted 3 lines
meta/recipes-connectivity/connman/connman.inc +3
-0+do_install:append:qemuall() { + mkdir -p ${D}${sysconfdir}/default + echo "export EXTRA_PARAM=\"-I eth0\"" >
Quoted 7 lines
${D}${sysconfdir}/default/connman
Quoted 1 line
+}
This means connman becomes machine specific, you can't do that. This would need
to be done in the connman-conf recipe.
I'm not sure I follow - the above instructs connman to ignore eth0 inside qemu (and only inside qemu), why is that problematic?
Alex
Re: [OE-core] [PATCH 13/14] connman: do nothing in qemu, do not touch eth0
Quoted 9 lines · Alexander Kanavin
Quoted 7 lines · Richard Purdie
Quoted 2 lines
+# Kernel IP-Config is perfectly capable of setting up networking passed in
via ip=
Quoted 3 lines
+do_install:append:qemuall() {
+ mkdir -p ${D}${sysconfdir}/default
+ echo "export EXTRA_PARAM=\"-I eth0\"" >${D}${sysconfdir}/default/connman
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
+}
This means connman becomes machine specific, you can't do that. This would need
to be done in the connman-conf recipe.I'm not sure I follow - the above instructs connman to ignore eth0 inside qemu (and only inside qemu), why is that problematic?
The data above is inserted into /etc/default/connman in the connman package itself. That package is installed into deploy/XXX/<tunearch>/connman.YYY. That is not the machine specific package directory.
Or in different words, if I build connmand for a qemu machine, then build connman for a machine with the same tune that isn't qemu, command rebuilds but installs the package to the same location. This is not allowed.
Machine specific data (in this case qemu specific) shouldn't be in general packages. This goes against yocto-check-layer and YP-Compatibility.
Cheers,
Richard
Re: [OE-core] [PATCH 13/14] connman: do nothing in qemu, do not touch eth0
Quoted 5 lines · Richard Purdie
The data above is inserted into
/etc/default/connmanin the connman package itself. That package is installed into deploy/XXX/<tunearch>/connman.YYY. That
is not the machine specific package directory.
Quoted 8 lines
Or in different words, if I build connmand for a qemu machine, then build connman for a machine with the same tune that isn't qemu, command rebuilds but
installs the package to the same location. This is not allowed.Machine specific data (in this case qemu specific) shouldn't be in general packages. This goes against yocto-check-layer and YP-Compatibility.
Right, I can fix this, but is there a testing gap then? This prompted no warnings on either local builds or in a-full.
Alex
Re: [OE-core] [PATCH 13/14] connman: do nothing in qemu, do not touch eth0
Quoted 12 lines · Alexander Kanavin
Quoted 10 lines · Richard Purdie
The data above is inserted into
/etc/default/connmanin the connman package itself. That package is installed into deploy/XXX/<tunearch>/connman.YYY. That
is not the machine specific package directory.Or in different words, if I build connmand for a qemu machine, then build connman for a machine with the same tune that isn't qemu, command rebuilds but
installs the package to the same location. This is not allowed.
Quoted 7 lines
Quoted 3 lines
Machine specific data (in this case qemu specific) shouldn't be in general packages. This goes against yocto-check-layer and YP-Compatibility.
Right, I can fix this, but is there a testing gap then? This prompted no warnings on either local builds or in a-full.
The autobuilder is not definitive as it does not have 100% test coverage much as I wish it were.
Yes, there is clearly a gap in testing here :(
We don't really have a machine with an identical tune to a qemu target that isn't qemu which we run sstate sigs tests against.
Cheers,
Richard
PATCH 14/14 systemd-boot: restore reproducibility
In reply to Alexander Kanavin--- meta/recipes-core/systemd/systemd.inc | 3 +- ...list-fundamental_source_paths-using-.patch | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/systemd/systemd/0001-src-fundamental-list-fundamental_source_paths-using-.patch
meta/recipes-core/systemd/systemd.inc +2 -1
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ SRCREV = "402280118fe082122437638f53a0019c4aea81aa" SRCBRANCH = "v250-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ -" + file://0001-src-fundamental-list-fundamental_source_paths-using-.patch \ + " S = "${WORKDIR}/git"
meta/recipes-core/systemd/systemd/0001-src-fundamental-list-fundamental_source_paths-using-.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 8e882df78ede98c15a3f2567fabebfde1d774b02 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 7 Jan 2022 21:20:15 +0100 +Subject: [PATCH] src/fundamental: list fundamental_source_paths using relative + paths + +Otherwise, the compiler takes the full path to the source file +and writes it into the binary output, breaking reproducibility. + +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/22047] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/fundamental/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fundamental/meson.build b/src/fundamental/meson.build +index 287f0fe36a..954bdf150b 100644 +--- a/src/fundamental/meson.build ++++ b/src/fundamental/meson.build +@@ -20,7 +20,7 @@ sources = ''' + # for sd-boot + fundamental_source_paths = [] + foreach source : sources +- fundamental_source_paths += meson.current_source_dir() / source ++ fundamental_source_paths += '../../fundamental/' + source + endforeach + + # for libbasic
Signature · 1 line
2.20.1
Quoted 10 lines · Alexander Kanavin
I ran the reproducing sequence on qemux86,
qemux86_64and same targets with musl, and it went fine:root@qemux86:~# python3 Python 3.10.0 (default, Oct 4 2021, 17:55:55) [GCC 11.2.0] on linux Type "help", "copyright", "credits" or "license" for more information.Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
import multiprocessing
pool_sema=multiprocessing.BoundedSemaphore(value=1)pool_sema.acquire()True
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
pool_sema.release()Additionally AB testing revealed no issues, and the description isn't entirely clear about where and how the problem occurs, so I can't submit it upsream without having that understanding and how to demonstrate the problem.
Signed-off-by Alexander Kanavin <[email protected]>
Isn't this now working since pthread was merged into the main libc library and therefore separate linking for pthread is no longer needed?
Cheers,
Richard
Quoted 5 lines · Richard Purdie
Isn't this now working since pthread was merged into the main libc library and
therefore separate linking for pthread is no longer needed?
Yes, there was a previous discussion with the same point, so this needs a commit message adjustment?
Alex
Quoted 11 lines · Alexander Kanavin
Quoted 5 lines · Richard Purdie
Isn't this now working since pthread was merged into the main libc library and
therefore separate linking for pthread is no longer needed?Yes, there was a previous discussion with the same point, so this needs a commit message adjustment?
Please as I worry someone would try and backport it with the wrong reasoning.
Cheers,
Richard