Merge branch 'build-deps' into 'master'

Allow check build deps on make image

See merge request redox-os/cookbook!653
This commit is contained in:
Jeremy Soller 2025-10-05 06:58:40 -06:00
commit d8295c4445
2 changed files with 9 additions and 4 deletions

View File

@ -1417,7 +1417,7 @@ fn main() {
};
}
let recipes = match CookRecipe::get_build_deps_recursive(&recipe_names) {
let recipes = match CookRecipe::get_build_deps_recursive(&recipe_names, !with_package_deps) {
Ok(ok) => ok,
Err(err) => {
eprintln!(

View File

@ -202,11 +202,16 @@ impl CookRecipe {
Ok(recipes)
}
pub fn get_build_deps_recursive(names: &[PackageName]) -> Result<Vec<Self>, PackageError> {
pub fn get_build_deps_recursive(
names: &[PackageName],
mark_is_deps: bool,
) -> Result<Vec<Self>, PackageError> {
let mut packages = Self::new_recursive(names, WALK_DEPTH)?;
for package in packages.iter_mut() {
package.is_deps = !names.contains(&package.name);
if mark_is_deps {
for package in packages.iter_mut() {
package.is_deps = !names.contains(&package.name);
}
}
Ok(packages)