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

Merge branch 'dev-in-bin' into 'master'

Browse Source 
Allow excluding dev inside binary packages, Prevent binary host recipes temporarily

See merge request redox-os/redox!1903
This commit is contained in:
Jeremy Soller 2026-02-13 11:14:05 -07:00
commit 3d7087cf17
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/repo.rs
View File

@ -576,6 +576,26 @@ fn parse_args(args: Vec<String>) -> anyhow::Result<(CliConfig, CliCommand, Vec<C
if command.is_building() || (command.is_pushing() && config.with_package_deps) {
// Pushing do not need dev deps, so does binary recipes at building
let include_dev = command.is_building();
if include_dev && default_rule == "source" {
// let's cover a very specific case, binary -> source -> binary -> dev
// in this case, we need to move that "source" to "binary", because
// that would include dev from its binary child, which is unnecessary
let mut i = 0;
while i < source_recipe_names.len() {
let name = &source_recipe_names[i];
match special_rules.get(name) {
Some(s) if s.as_str() == "source" => {
if binary_names.contains(name) {
let bin = source_recipe_names.remove(i);
binary_recipe_names.push(bin);
continue;
}
}
_ => {}
}
i += 1;
}
}
CookRecipe::get_build_deps_recursive(&source_recipe_names, include_dev)?
} else {
CookRecipe::from_list(source_recipe_names.clone())?
@ -611,6 +631,11 @@ fn parse_args(args: Vec<String>) -> anyhow::Result<(CliConfig, CliCommand, Vec<C
(false, true) => "binary",
(false, false) => default_rule,
};
if recipe.name.is_host() && rule == "binary" {
// host recipe binaries is currently not supported
continue;
}
recipe.apply_filesystem_config(rule)?;
}