MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-23 05:14:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'sysroot-update' into 'master'

Browse Source 
Use file tags for sysroot invalidation

See merge request redox-os/redox!1741
This commit is contained in:
Jeremy Soller 2025-12-06 08:16:35 -07:00
commit e3807caa84
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cook/cook_build.rs
View File

@ -430,8 +430,14 @@ fn build_deps_dir(
deps_modified: SystemTime,
) -> Result<(), String> {
if deps_dir.is_dir() {
let sysroot_modified = modified_dir(deps_dir)?;
if sysroot_modified < source_modified || sysroot_modified < deps_modified {
let tags_dir = deps_dir.join(".tags");
let sysroot_modified = modified_dir(&tags_dir).unwrap_or(SystemTime::UNIX_EPOCH);
if sysroot_modified < source_modified
|| sysroot_modified < deps_modified
|| dep_pkgars
.iter()
.any(|(pkg, _)| !tags_dir.join(pkg.as_str()).is_file())
{
log_to_pty!(logger, "DEBUG: updating '{}'", deps_dir.display());
remove_all(deps_dir)?;
}
@ -439,20 +445,25 @@ fn build_deps_dir(
if !deps_dir.is_dir() {
// Create sysroot.tmp
create_dir_clean(&deps_dir_tmp)?;
let tags_dir = deps_dir_tmp.join(".tags");
let usr_dir = deps_dir_tmp.join("usr");
create_dir(&tags_dir)?;
create_dir(&usr_dir)?;
// Make sure sysroot/usr exists
create_dir(&deps_dir_tmp.join("usr"))?;
for folder in &["bin", "include", "lib", "share"] {
// Make sure sysroot/usr/$folder exists
create_dir(&deps_dir_tmp.join("usr").join(folder))?;
create_dir(&usr_dir.join(folder))?;
// Link sysroot/$folder sysroot/usr/$folder
symlink(Path::new("usr").join(folder), &deps_dir_tmp.join(folder))?;
}
for (_dep, archive_path) in dep_pkgars {
let public_path = "build/id_ed25519.pub.toml";
pkgar::extract(public_path, &archive_path, deps_dir_tmp.to_str().unwrap()).map_err(
let pkey_path = "build/id_ed25519.pub.toml";
for (name, archive_path) in dep_pkgars {
let tag_file = tags_dir.join(name.without_host().as_str());
fs::write(&tag_file, "")
.map_err(|e| format!("failed to write tag file {}: {:?}", tag_file.display(), e))?;
pkgar::extract(pkey_path, &archive_path, deps_dir_tmp.to_str().unwrap()).map_err(
|err| {
format!(
"failed to install '{}' in '{}': {:?}",