migrate: apply remaining patches to source forks, clean up
Apply all active patches from archived patches to source forks: - kernel: 33 individual patches + consolidated mega-patch (34 total commits) - relibc: 33 individual patches (34 total commits) - base: 26 individual patches + redox.patch mega-patch (28 total commits) - bootloader: 4 patches (5 total commits) - installer: 1 patch (2 total commits) - redoxfs: 2 patches (3 total commits) - userutils: 2 patches (3 total commits) Cleanup: - Remove all .rej and .orig files from fork repos - Delete all absorbed/ subdirectories (71 already-folded patches) - Delete stale .patch files from recipe directories (~130 upstream port patches) - 282 remaining .patch files are for non-fork components (archived, not in build system)
This commit is contained in:
@@ -1,22 +0,0 @@
|
||||
diff --git a/stdlib/src/posixsubprocess.rs b/stdlib/src/posixsubprocess.rs
|
||||
index 7f418c899..4da6a6858 100644
|
||||
--- a/stdlib/src/posixsubprocess.rs
|
||||
+++ b/stdlib/src/posixsubprocess.rs
|
||||
@@ -441,15 +441,14 @@ fn close_dir_fds(keep: KeepFds<'_>) -> nix::Result<()> {
|
||||
fn close_filetable_fds(keep: KeepFds<'_>) -> nix::Result<()> {
|
||||
use nix::fcntl;
|
||||
use std::os::fd::{FromRawFd, OwnedFd};
|
||||
- let fd = fcntl::open(
|
||||
+ let filetable = fcntl::open(
|
||||
c"/scheme/thisproc/current/filetable",
|
||||
fcntl::OFlag::O_RDONLY,
|
||||
nix::sys::stat::Mode::empty(),
|
||||
)?;
|
||||
- let filetable = unsafe { OwnedFd::from_raw_fd(fd) };
|
||||
let read_one = || -> nix::Result<_> {
|
||||
let mut byte = 0;
|
||||
- let n = nix::unistd::read(filetable.as_raw_fd(), std::slice::from_mut(&mut byte))?;
|
||||
+ let n = nix::unistd::read(&filetable, std::slice::from_mut(&mut byte))?;
|
||||
Ok((n > 0).then_some(byte))
|
||||
};
|
||||
while let Some(c) = read_one()? {
|
||||
Reference in New Issue
Block a user