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

misc: cleanup

Browse Source 
Signed-off-by: Anhad Singh <andypython@protonmail.com>
This commit is contained in:
Anhad Singh 2025-02-01 00:19:18 +11:00
parent bd5f5357a8
commit 78bf3a68fc
No known key found for this signature in database
GPG Key ID: 80E0357347554B89
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/cook.rs
View File

@ -783,9 +783,10 @@ fn package(
stage_dir: &Path,
target_dir: &Path,
name: &str,
package: &PackageRecipe,
recipe: &Recipe,
) -> Result<PathBuf, String> {
//TODO: metadata like dependencies, name, and version
let package = &recipe.package;
let secret_path = "build/id_ed25519.toml";
let public_path = "build/id_ed25519.pub.toml";
@ -833,12 +834,7 @@ fn package(
depends: Vec<String>,
}
let depends = if should_build_shared() {
package
.dependencies
.iter()
.chain(package.shared_deps.iter())
.cloned()
.collect()
recipe.runtime_dependencies()
} else {
package.dependencies.clone()
};
@ -877,7 +873,7 @@ fn cook(recipe_dir: &Path, name: &str, recipe: &Recipe, fetch_only: bool) -> Res
let stage_dir = build(recipe_dir, &source_dir, &target_dir, name, &recipe)
.map_err(|err| format!("failed to build: {}", err))?;
let _package_file = package(recipe_dir, &stage_dir, &target_dir, name, &recipe.package)
let _package_file = package(recipe_dir, &stage_dir, &target_dir, name, &recipe)
.map_err(|err| format!("failed to package: {}", err))?;
Ok(())