MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-28 15:48:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check build against stage pkgar instead of dir

Browse Source
This commit is contained in:
Wildan M 2026-01-29 13:04:04 +07:00
parent 7d128ee762
commit e80b936954
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cook/cook_build.rs
View File

@ -180,6 +180,10 @@ pub fn build(
let sysroot_dir = target_dir.join("sysroot");
let toolchain_dir = target_dir.join("toolchain");
let stage_dirs = get_stage_dirs(&recipe.optional_packages, target_dir);
let stage_pkgars: Vec<PathBuf> = stage_dirs
.iter()
.map(|p| p.with_added_extension("pkgar"))
.collect();
let cli_verbose = cook_config.verbose;
let cli_jobs = cook_config.jobs;
if recipe.build.kind == BuildKind::None {
@ -218,7 +222,7 @@ pub fn build(
};
}
if !check_source && stage_dirs.iter().all(|dir| dir.exists()) {
if !check_source && stage_pkgars.iter().all(|file| file.is_file()) {
if cli_verbose {
log_to_pty!(logger, "DEBUG: using cached build, not checking source");
}
@ -245,14 +249,7 @@ pub fn build(
.unwrap_or(Ok(SystemTime::UNIX_EPOCH))?;
// check stage dir modified against pkgar files, any files missing will result in UNIX_EPOCH
let stage_modified = modified_all(
&stage_dirs
.iter()
.map(|p| p.with_added_extension("pkgar"))
.collect(),
modified,
)
.unwrap_or(SystemTime::UNIX_EPOCH);
let stage_modified = modified_all(&stage_pkgars, modified).unwrap_or(SystemTime::UNIX_EPOCH);
// Rebuild stage if source is newer
if stage_modified < source_modified
|| stage_modified < deps_modified