Multiple changes
- quirks: added quirks, that does nothing for now - deb: install arch-independant dependencies (too much is better) - deb: added linux-riscv crossbuild test
This commit is contained in:
@@ -185,22 +185,22 @@ pub async fn build(
|
||||
return Err("Could not install build-dependencies for the build".into());
|
||||
}
|
||||
|
||||
// // Install arch-independant build dependencies
|
||||
// log::debug!("Installing arch-independant build dependencies...");
|
||||
// let status = ctx.command("apt-get")
|
||||
// .current_dir(package_dir_str)
|
||||
// .envs(env.clone())
|
||||
// .arg("-y")
|
||||
// .arg("build-dep")
|
||||
// .arg("--indep-only")
|
||||
// .arg("./")
|
||||
// .status()?;
|
||||
// Install arch-independant build dependencies
|
||||
log::debug!("Installing arch-independant build dependencies...");
|
||||
let status = ctx
|
||||
.command("apt-get")
|
||||
.current_dir(package_dir_str)
|
||||
.envs(env.clone())
|
||||
.arg("-y")
|
||||
.arg("build-dep")
|
||||
.arg("./")
|
||||
.status()?;
|
||||
|
||||
// // If build-dep fails, we try to explain the failure using dose-debcheck
|
||||
// if !status.success() {
|
||||
// dose3_explain_dependencies(package, version, arch, build_root, cross)?;
|
||||
// return Err("Could not install build-dependencies for the build".into());
|
||||
// }
|
||||
// If build-dep fails, we try to explain the failure using dose-debcheck
|
||||
if !status.success() {
|
||||
dose3_explain_dependencies(package, version, arch, build_root, cross)?;
|
||||
return Err("Could not install build-dependencies for the build".into());
|
||||
}
|
||||
|
||||
// Run the build step
|
||||
log::debug!("Building (debian/rules build) package...");
|
||||
@@ -260,6 +260,7 @@ fn dose3_explain_dependencies(
|
||||
}
|
||||
|
||||
// Transform the dsc file into a 'Source' stanza (replacing 'Source' with 'Package')
|
||||
// TODO: Remove potential GPG headers/signature
|
||||
let dsc_path = find_dsc_file(build_root, package, version)?;
|
||||
let mut dsc_content = ctx.read_file(&dsc_path)?;
|
||||
dsc_content = dsc_content.replace("Source", "Package");
|
||||
|
||||
Reference in New Issue
Block a user