bump(main/below): 0.8.1 (#19930)
This commit is contained in:
parent
825bc52d33
commit
13d2cee4c1
|
@ -0,0 +1,11 @@
|
|||
--- a/below/ethtool/src/reader.rs
|
||||
+++ b/below/ethtool/src/reader.rs
|
||||
@@ -33,7 +33,7 @@ fn ioctl(
|
||||
ifr_ifru: libc::__c_anonymous_ifr_ifru { ifru_data: data },
|
||||
};
|
||||
|
||||
- let exit_code = unsafe { libc::ioctl(fd.as_raw_fd(), nix::libc::SIOCETHTOOL, &ifr) };
|
||||
+ let exit_code = unsafe { libc::ioctl(fd.as_raw_fd(), nix::libc::SIOCETHTOOL.try_into().unwrap(), &ifr) };
|
||||
if exit_code != 0 {
|
||||
return Err(Errno::from_i32(exit_code));
|
||||
}
|
|
@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/facebookincubator/below
|
|||
TERMUX_PKG_DESCRIPTION="An interactive tool to view and record historical system data"
|
||||
TERMUX_PKG_LICENSE="Apache-2.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=0.7.1
|
||||
TERMUX_PKG_VERSION="0.8.1"
|
||||
TERMUX_PKG_SRCURL=https://github.com/facebookincubator/below/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=9b70d010189e8d343dc67b730a1d8eeb0e1d19805688e4f70662e216fb4cd6b5
|
||||
TERMUX_PKG_SHA256=bfeb9cd911e0477a5428ee0b6cbf7cbdc7eba90b716ac1e4f6cbadcde2ffbcb1
|
||||
TERMUX_PKG_DEPENDS="libelf, zlib"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
|
@ -33,12 +33,6 @@ termux_step_pre_configure() {
|
|||
< "$TERMUX_PKG_BUILDER_DIR/${p}" || :
|
||||
done
|
||||
done
|
||||
for d in $CARGO_HOME/registry/src/*/nix-*; do
|
||||
for p in nix-{0.22.0,0.23.1}-src-sys-statfs.rs.diff; do
|
||||
patch --silent -p1 -d ${d} \
|
||||
< "$TERMUX_PKG_BUILDER_DIR/${p}" || :
|
||||
done
|
||||
done
|
||||
|
||||
local _CARGO_TARGET_LIBDIR=target/$CARGO_TARGET_NAME/release/deps
|
||||
mkdir -p $_CARGO_TARGET_LIBDIR
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/src/sys/statfs.rs
|
||||
+++ b/src/sys/statfs.rs
|
||||
@@ -94,6 +94,8 @@
|
||||
pub const CGROUP_SUPER_MAGIC: FsType = FsType(libc::CGROUP_SUPER_MAGIC as fs_type_t);
|
||||
#[cfg(all(target_os = "linux", not(target_env = "musl")))]
|
||||
pub const CGROUP2_SUPER_MAGIC: FsType = FsType(libc::CGROUP2_SUPER_MAGIC as fs_type_t);
|
||||
+#[cfg(target_os = "android")]
|
||||
+pub const CGROUP2_SUPER_MAGIC: FsType = FsType(0x63677270 as fs_type_t);
|
||||
|
||||
|
||||
impl Statfs {
|
|
@ -1,12 +0,0 @@
|
|||
--- a/src/sys/statfs.rs
|
||||
+++ b/src/sys/statfs.rs
|
||||
@@ -132,6 +132,9 @@
|
||||
#[cfg(all(target_os = "linux", not(target_env = "musl")))]
|
||||
#[allow(missing_docs)]
|
||||
pub const CGROUP2_SUPER_MAGIC: FsType = FsType(libc::CGROUP2_SUPER_MAGIC as fs_type_t);
|
||||
+#[cfg(target_os = "android")]
|
||||
+#[allow(missing_docs)]
|
||||
+pub const CGROUP2_SUPER_MAGIC: FsType = FsType(0x63677270 as fs_type_t);
|
||||
|
||||
|
||||
impl Statfs {
|
Loading…
Reference in New Issue