python3-pyruvate: Update libc to 0.2.120

Drop upstreamed patches
Move riscv32/musl patches to meta-riscv

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: tgamblin <trevor.gamblin@windriver.com>

4 files changed, 2 insertions, 173 deletions

diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv32-Define-O_LARGEFILE.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv32-Define-O_LARGEFILE.patch
deleted file mode 100644
index 0ecb50478..000000000
--- a/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv32-Define-O_LARGEFILE.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8c1251b57827c7e757079d6e9304570643e8e80a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 5 Mar 2022 22:18:49 -0800
-Subject: [PATCH] riscv32: Define O_LARGEFILE
-
-Some applications (e.g. nix) use this define and expect it to come from libc
-
-Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2710]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs b/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs
-index 4d551eb..feaa00a 100644
---- a/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs
-+++ b/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs
-@@ -490,6 +490,8 @@ pub const FIONREAD: ::c_ulong = 21531;
- pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
- pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
- 
-+pub const O_LARGEFILE: ::c_int = 0;
-+
- pub const SYS_read: ::c_long = 63;
- pub const SYS_write: ::c_long = 64;
- pub const SYS_close: ::c_long = 57;
--- 
-2.35.1
-
diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch
deleted file mode 100644
index 614334217..000000000
--- a/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a6f5bb3e7fe51733144497a3b5962b300f922a2d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 7 Mar 2022 11:02:46 -0800
-Subject: [PATCH] riscv64/mod.rs: Add missing error codes
-
-These are flagged by apps e.g. python3-pyruvate
-
-Upstream-Status: Backport [https://github.com/rust-lang/libc/commit/c711fb215de54f960a35cdc48cd506b6b5db4918]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/unix/linux_like/linux/musl/b64/riscv64/mod.rs | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs
-index 48fee4e..7c88abe 100644
---- a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs
-+++ b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs
-@@ -551,6 +551,11 @@ pub const EHOSTUNREACH: ::c_int = 113;
- pub const EALREADY: ::c_int = 114;
- pub const EINPROGRESS: ::c_int = 115;
- pub const ESTALE: ::c_int = 116;
-+pub const EUCLEAN: ::c_int = 117;
-+pub const ENOTNAM: ::c_int = 118;
-+pub const ENAVAIL: ::c_int = 119;
-+pub const EISNAM: ::c_int = 120;
-+pub const EREMOTEIO: ::c_int = 121;
- pub const EDQUOT: ::c_int = 122;
- pub const ENOMEDIUM: ::c_int = 123;
- pub const EMEDIUMTYPE: ::c_int = 124;
--- 
-2.35.1
-
diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-statfs-Exclude-riscv32.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-statfs-Exclude-riscv32.patch
deleted file mode 100644
index b482d7c0d..000000000
--- a/meta-python/recipes-devtools/python/python3-pyruvate/0001-statfs-Exclude-riscv32.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From ccdc974dc10c83e29d551492fb2d17a2ff8c2b84 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 5 Mar 2022 22:30:15 -0800
-Subject: [PATCH] statfs: Exclude riscv32
-
-Upstream-Status: Submitted [https://github.com/nix-rust/nix/pull/1669]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/sys/statfs.rs | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/sys/statfs.rs b/src/sys/statfs.rs
-index 829be57..6b88dad 100644
---- a/src/sys/statfs.rs
-+++ b/src/sys/statfs.rs
-@@ -292,7 +292,7 @@ impl Statfs {
-     }
- 
-     /// Total data blocks in filesystem
--    #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-+    #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-     pub fn blocks(&self) -> u64 {
-         self.0.f_blocks
-     }
-@@ -305,7 +305,7 @@ impl Statfs {
-         target_os = "freebsd",
-         target_os = "openbsd",
-         target_os = "dragonfly",
--        all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32")))
-+        all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32")))
-     )))]
-     pub fn blocks(&self) -> libc::c_ulong {
-         self.0.f_blocks
-@@ -330,7 +330,7 @@ impl Statfs {
-     }
- 
-     /// Free blocks in filesystem
--    #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-+    #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-     pub fn blocks_free(&self) -> u64 {
-         self.0.f_bfree
-     }
-@@ -343,7 +343,7 @@ impl Statfs {
-         target_os = "freebsd",
-         target_os = "openbsd",
-         target_os = "dragonfly",
--        all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32")))
-+        all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32")))
-     )))]
-     pub fn blocks_free(&self) -> libc::c_ulong {
-         self.0.f_bfree
-@@ -368,7 +368,7 @@ impl Statfs {
-     }
- 
-     /// Free blocks available to unprivileged user
--    #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-+    #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-     pub fn blocks_available(&self) -> u64 {
-         self.0.f_bavail
-     }
-@@ -381,7 +381,7 @@ impl Statfs {
-         target_os = "freebsd",
-         target_os = "openbsd",
-         target_os = "dragonfly",
--        all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32")))
-+        all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32")))
-     )))]
-     pub fn blocks_available(&self) -> libc::c_ulong {
-         self.0.f_bavail
-@@ -406,7 +406,7 @@ impl Statfs {
-     }
- 
-     /// Total file nodes in filesystem
--    #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-+    #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-     pub fn files(&self) -> libc::fsfilcnt_t {
-         self.0.f_files
-     }
-@@ -419,7 +419,7 @@ impl Statfs {
-         target_os = "freebsd",
-         target_os = "openbsd",
-         target_os = "dragonfly",
--        all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32")))
-+        all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32")))
-     )))]
-     pub fn files(&self) -> libc::c_ulong {
-         self.0.f_files
-@@ -449,7 +449,7 @@ impl Statfs {
-     }
- 
-     /// Free file nodes in filesystem
--    #[cfg(all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-+    #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32"))))]
-     pub fn files_free(&self) -> libc::fsfilcnt_t {
-         self.0.f_ffree
-     }
-@@ -462,7 +462,7 @@ impl Statfs {
-         target_os = "freebsd",
-         target_os = "openbsd",
-         target_os = "dragonfly",
--        all(target_os = "linux", any(target_env = "musl", all(target_arch = "x86_64", target_pointer_width = "32")))
-+        all(target_os = "linux", any(target_env = "musl", target_arch = "riscv32", all(target_arch = "x86_64", target_pointer_width = "32")))
-     )))]
-     pub fn files_free(&self) -> libc::c_ulong {
-         self.0.f_ffree
--- 
-2.35.1
-
diff --git a/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb b/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb
index 97fce690e..1f1c186d3 100644
--- a/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb
+++ b/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb
@@ -63,7 +63,7 @@ SRC_URI += " \
     crate://crates.io/humantime/2.1.0 \
     crate://crates.io/instant/0.1.12 \
     crate://crates.io/lazy_static/1.4.0 \
-    crate://crates.io/libc/0.2.112 \
+    crate://crates.io/libc/0.2.120 \
     crate://crates.io/libsystemd/0.4.1 \
     crate://crates.io/log/0.4.14 \
     crate://crates.io/memchr/2.4.1 \
@@ -115,10 +115,8 @@ SRC_URI += " \
     crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
     crate://crates.io/winapi/0.3.9 \
 "
-SRC_URI += "file://0001-riscv64-mod.rs-Add-missing-error-codes.patch;patchdir=../cargo_home/bitbake/libc-0.2.112/ \
-            file://0001-riscv32-Define-O_LARGEFILE.patch;patchdir=../cargo_home/bitbake/libc-0.2.112/ \
+SRC_URI += "\
             file://0001-linux.rs-Define-consts-for-rv32-architecture.patch;patchdir=../cargo_home/bitbake/nix-0.23.1/ \
-            file://0001-statfs-Exclude-riscv32.patch;patchdir=../cargo_home/bitbake/nix-0.23.1/ \
             "
 SRC_URI:append:mips = " file://0001-check-for-mips-targets-for-stat.st_dev-definitions.patch;patchdir=../cargo_home/bitbake/libsystemd-0.4.1/"