hdhoang/homes - Change O6HYJ4OJ22GX4PKIP2MCHOBF6TS4BZV5Q26QHNVAKTTRRQTIKRRAC

portable

Created by hdhoang on April 19, 2024

O6HYJ4OJ22GX4PKIP2MCHOBF6TS4BZV5Q26QHNVAKTTRRQTIKRRAC

Dependencies

In channels

main

Change contents

Replacement in split.marimo.py at line 3 [3.1]
B:BD[3.17] → [3.17:45]
```
__generated_with = "0.1.79"
```
[3.17]
[3.45]
```
__generated_with = "0.3.2"
```

Replacement in split.marimo.py at line 9 [3.1]

B:BD[3.86] → [4.7:36]

B:BD[4.36] → [5.8689:8720]

    prev_water_photo = 768.0
    return (prev_water_photo,)

[3.86]

[3.146]

    prev_water_photo = 781.0
    return prev_water_photo,

Replacement in split.marimo.py at line 15 [3.1]

B:BD[3.168] → [4.37:66]

B:BD[4.66] → [5.8721:8752]

    this_water_photo = 781.0
    return (this_water_photo,)

[3.168]

[3.228]

    this_water_photo = 797.0
    return this_water_photo,

Replacement in split.marimo.py at line 28 [3.1]
B:BD[6.166] → [4.116:148]
```
    left_elec_sha30462 = 941166
```
[6.166]
[6.198]
```
    left_elec_sha30462 = 980_694
```
Replacement in split.marimo.py at line 36 [3.1]
B:BD[6.322] → [4.149:182]
```
    back_elec_sha30461 = 1264044
```
[6.322]
[6.355]
```
    back_elec_sha30461 = 1_093_890
```

File addition: gnu-mips.patch (----------)

[2.1]

diff --git a/Cargo.toml b/Cargo.toml
index 6bddf52..2b2d8c1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,6 +38,7 @@ once_cell = "1.17.0"
 rand = { version = "0.8.5", features = ["small_rng"] }
 widestring = "1.0.2"
 terminfo = { git = "https://github.com/meh/rust-terminfo", rev = "7259f5aa5786a9d396162da0d993e268f6163fb2" }
+portable-atomic = { version = "1.6.0", features = ["fallback"] }
 [dev-dependencies]
 rand_pcg = "0.3.1"
diff --git a/src/env/environment_impl.rs b/src/env/environment_impl.rs
index fcb6368..420a886 100644
--- a/src/env/environment_impl.rs
+++ b/src/env/environment_impl.rs
@@ -22,7 +22,8 @@ use std::marker::PhantomData;
 use std::mem;
 use std::ops::{Deref, DerefMut};
-use std::sync::{atomic::AtomicU64, atomic::Ordering, Arc, Mutex, MutexGuard};
+use portable_atomic::AtomicU64;
+use std::sync::{ atomic::Ordering, Arc, Mutex, MutexGuard};
 // Universal variables instance.
 lazy_static! {
diff --git a/src/fd_monitor.rs b/src/fd_monitor.rs
index 2bfac02..f0974dc 100644
--- a/src/fd_monitor.rs
+++ b/src/fd_monitor.rs
@@ -1,5 +1,6 @@
 use std::os::unix::prelude::*;
-use std::sync::atomic::{AtomicU64, Ordering};
+use portable_atomic::AtomicU64;
+use std::sync::atomic::{ Ordering};
 use std::sync::{Arc, Mutex, Weak};
 use std::time::{Duration, Instant};
diff --git a/src/io.rs b/src/io.rs
index bb68c00..93e5ada 100644
--- a/src/io.rs
+++ b/src/io.rs
@@ -24,7 +24,8 @@ use std::cell::{RefCell, UnsafeCell};
 use std::fs::File;
 use std::io;
 use std::os::fd::{AsRawFd, IntoRawFd, OwnedFd, RawFd};
-use std::sync::atomic::{AtomicU64, Ordering};
+use portable_atomic::AtomicU64;
+use std::sync::atomic::{ Ordering};
 use std::sync::{Arc, Condvar, Mutex, MutexGuard};
 /// separated_buffer_t represents a buffer of output from commands, prepared to be turned into a
diff --git a/src/parser.rs b/src/parser.rs
index 9e1aefd..619f678 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -43,8 +43,9 @@ use std::os::fd::{AsRawFd, OwnedFd, RawFd};
 use std::os::unix::prelude::OsStrExt;
 use std::pin::Pin;
 use std::rc::{Rc, Weak};
+use portable_atomic::AtomicU64;
 use std::sync::{
-    atomic::{AtomicIsize, AtomicU64, Ordering},
+    atomic::{AtomicIsize,  Ordering},
     Arc,
 };
diff --git a/src/proc.rs b/src/proc.rs
index 5bdf008..6e36ae9 100644
--- a/src/proc.rs
+++ b/src/proc.rs
@@ -37,7 +37,8 @@ use std::fs;
 use std::io::{Read, Write};
 use std::os::fd::RawFd;
 use std::rc::Rc;
-use std::sync::atomic::{AtomicBool, AtomicI32, AtomicU64, AtomicU8, Ordering};
+use portable_atomic::AtomicU64;
+use std::sync::atomic::{AtomicBool, AtomicI32,  AtomicU8, Ordering};
 use std::sync::{Arc, Mutex};
 /// Types of processes.
diff --git a/src/reader.rs b/src/reader.rs
index 7d0bbcc..6f3a6a8 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -31,7 +31,8 @@ use std::os::fd::RawFd;
 use std::pin::Pin;
 use std::rc::Rc;
 use std::sync::atomic::Ordering;
-use std::sync::atomic::{AtomicI32, AtomicU32, AtomicU64, AtomicU8};
+use portable_atomic::AtomicU64;
+use std::sync::atomic::{AtomicI32, AtomicU32,  AtomicU8};
 use std::sync::{Arc, Mutex, MutexGuard};
 use std::time::{Duration, Instant};
diff --git a/src/signal.rs b/src/signal.rs
index 0cbeb1d..5ca5827 100644
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -399,15 +399,15 @@ const SIGNAL_TABLE : &[LookupEntry] = &[
     #[cfg(any(bsd, target_os = "macos"))]
     LookupEntry::new(libc::SIGINFO,   L!("SIGINFO"), L!("Information request")),
-    #[cfg(target_os = "linux")]
-    LookupEntry::new(libc::SIGSTKFLT, L!("SISTKFLT"), L!("Stack fault")),
+    //#[cfg(target_os = "linux")]
+    //LookupEntry::new(libc::SIGSTKFLT, L!("SISTKFLT"), L!("Stack fault")),
     #[cfg(target_os = "linux")]
     LookupEntry::new(libc::SIGIOT,   L!("SIGIOT"), L!("Abort (Alias for SIGABRT)")),
-    #[cfg(target_os = "linux")]
-    #[allow(deprecated)]
-    LookupEntry::new(libc::SIGUNUSED, L!("SIGUNUSED"), L!("Unused signal")),
+    //#[cfg(target_os = "linux")]
+    //#[allow(deprecated)]
+    //LookupEntry::new(libc::SIGUNUSED, L!("SIGUNUSED"), L!("Unused signal")),
     #[cfg(target_os = "linux")]
     LookupEntry::new(libc::SIGPWR,    L!("SIGPWR"), L!("Power failure")),
diff --git a/src/wutil/mod.rs b/src/wutil/mod.rs
index 631a41d..3fcbab5 100644
--- a/src/wutil/mod.rs
+++ b/src/wutil/mod.rs
@@ -531,7 +531,7 @@ impl FileId {
     }
     pub fn from_stat(buf: &libc::stat) -> FileId {
         let mut result = FileId::new();
-        result.device = buf.st_dev;
+        result.device = buf.st_dev as u64;
         result.inode = buf.st_ino;
         result.size = buf.st_size as u64;
         result.change_seconds = buf.st_ctime;

File addition: cargo_config.toml (----------)

[2.1]

[target.mipsel-unknown-linux-gnu]
linker = "mipsel-linux-gnu-ld.gold"
rustflags=[  "-C",
  "link-arg=-L/usr/mipsel-linux-gnu/lib",
]

Replacement in fish-mipsel/Containerfile at line 8 [2.26]

B:BD[2.244] → [2.244:333]

    apt install -y --no-install-recommends gcc-mipsel-linux-gnu libc7-dev-mipsel-cross \

[2.244]

[2.333]

    apt install -y --no-install-recommends gcc-mipsel-linux-gnu libc6-dev-mipsel-cross \

Replacement in fish-mipsel/Containerfile at line 10 [2.26]
B:BD[2.366] → [2.366:403]
```
    curl ca-certificates git ripgrep
```
[2.366]
[2.403]
```
    git ripgrep patch
```

Replacement in fish-mipsel/Containerfile at line 12 [2.26]

B:BD[2.404] → [2.404:491]

RUN git clone --depth 1 https://github.com/fish-shell/fish-shell /var/cache/fish-shell

[2.404]

[2.491]

RUN git clone --depth 1 https://github.com/fish-shell/fish-shell /var/cache/fish-shell && \
    cd /var/cache/fish-shell && cargo add portable-atomic@1.6.0 --no-default-features --features fallback && \
    mkdir /var/cache/fish-shell/.cargo/

Insertion in fish-mipsel/Containerfile at line 16 [2.26]
[2.521]
[2.521]
```
COPY cargo_config.toml .cargo/config.toml
```

Replacement in fish-mipsel/Containerfile at line 19 [2.26]

B:BD[2.584] → [2.584:656]

RUN cargo -Zbuild-std build --offline --target mipsel-unknown-linux-gnu

[2.584]


ENV PREFIX=/usr
RUN cargo -Zbuild-std build --offline --target mipsel-unknown-linux-gnu || true
COPY gnu-mips.patch .
RUN patch -p1 <gnu-mips.patch || true

Replacement in config/ric.conf at line 23 [8.15199]
B:BD[7.820] → [7.820:846]
```
MOZ_LOG=IMEHandler:4,sync
```
[7.820]
[8.15644]
```
# MOZ_LOG=IMEHandler:4,sync
```
Deletion in config/cargo.toml at line 12 [9.35]
B:BD[9.70] → [9.70:96]
```
linker = "/usr/bin/clang"
```
Replacement in config/cargo.toml at line 15 [9.35]
B:BD[5.85722] → [5.85722:85751]
```
  "link-arg=--ld-path=mold",
```
[5.85722]
[5.85751]
```
  "link-arg=-fuse-ld=mold",
```
Replacement in config/Justfile at line 10 [3.1609]
B:BD[4.2057] → [4.2057:2084]
```
    sudo-rs dnf upgrade -y
```
[4.2057]
[4.2084]
```
    sudo-rs dnf --setopt=install_weak_deps=False upgrade -y
```

Replacement in config/Justfile at line 18 [3.1609]

B:BD[2.2063] → [2.2063:2195]

    cd ~/rclone-cache/
    yt-dlp -f ba -S ext --download-archive ~/yt.txt -a ~/q --no-mtime --compat-options filename-sanitization

[2.2063]

[3.1889]

    cd ~/rclone-cache/ ; yt-dlp -f ba -S ext --download-archive ~/yt.txt -a ~/q --no-mtime --compat-options filename-sanitization

portable

Dependencies

In channels

Change contents

Replacement in split.marimo.py at line 3 [3.1]

Replacement in split.marimo.py at line 9 [3.1]

Replacement in split.marimo.py at line 15 [3.1]

Replacement in split.marimo.py at line 28 [3.1]

Replacement in split.marimo.py at line 36 [3.1]

File addition: gnu-mips.patch (----------)

File addition: cargo_config.toml (----------)

Replacement in fish-mipsel/Containerfile at line 8 [2.26]

Replacement in fish-mipsel/Containerfile at line 10 [2.26]

Replacement in fish-mipsel/Containerfile at line 12 [2.26]

Insertion in fish-mipsel/Containerfile at line 16 [2.26]

Replacement in fish-mipsel/Containerfile at line 19 [2.26]

Replacement in config/ric.conf at line 23 [8.15199]

Deletion in config/cargo.toml at line 12 [9.35]

Replacement in config/cargo.toml at line 15 [9.35]

Replacement in config/Justfile at line 10 [3.1609]

Replacement in config/Justfile at line 18 [3.1609]