feat: add option to allow ciel build with --force-use-apt

Author: eatradish

src/actions/packaging.rs

@@ -31,6 +31,7 @@ pub struct BuildCheckPoint {
 pub struct BuildSettings {
     pub offline: bool,
     pub stage2: bool,
+    pub force_use_apt: bool,
 }
 
 pub fn load_build_checkpoint<P: AsRef<Path>>(path: P) -> Result<BuildCheckPoint> {
@@ -151,6 +152,7 @@ fn package_build_inner<P: AsRef<Path>>(
     packages: &[String],
     instance: &str,
     root: P,
+    apt: bool,
 ) -> Result<(i32, usize)> {
     let total = packages.len();
     let hostname = gethostname().map_or_else(
@@ -200,7 +202,18 @@ fn package_build_inner<P: AsRef<Path>>(
             error!("Failed to update the OS before building packages");
             return Ok((status, index));
         }
-        let status = run_in_container(instance, &["/bin/acbs-build", "--", package])?;
+
+        let mut acbs = vec!["/bin/acbs-build"];
+
+        if apt {
+            acbs.push("--force-use-apt");
+        }
+
+        acbs.push("--");
+        acbs.push(package);
+
+        let status = run_in_container(instance, &acbs)?;
+
         if status != 0 {
             error!("Build failed with status: {}", status);
             return Ok((status, index));
@@ -326,7 +339,8 @@ pub fn package_build<S: AsRef<str>, K: Clone + ExactSizeIterator<Item = S>>(
     let root = std::env::current_dir()?.join(output_dir);
     let total = packages.len();
     let start = Instant::now();
-    let (exit_status, progress) = package_build_inner(&packages, instance, root)?;
+    let (exit_status, progress) =
+        package_build_inner(&packages, instance, root, settings.force_use_apt)?;
     if exit_status != 0 {
         let checkpoint = BuildCheckPoint {
             packages,

src/cli.rs

@@ -122,6 +122,7 @@ pub fn build_cli() -> Command {
                 .arg(Arg::new("OFFLINE").short('x').long("offline").action(clap::ArgAction::SetTrue).env("CIEL_OFFLINE").help("Disable network in the container during the build"))
                 .arg(instance_arg.clone().help("Instance to build in"))
                 .arg(Arg::new("STAGE2").long("stage2").short('2').action(clap::ArgAction::SetTrue).env("CIEL_STAGE2").help("Use stage 2 mode instead of the regular build mode"))
+                .arg(Arg::new("force_use_apt").long("force-use-apt").action(clap::ArgAction::SetTrue).env("FORCE_USE_APT").help("Force use apt to run acbs"))
                 .arg(Arg::new("CONTINUE").conflicts_with("SELECT").short('c').long("resume").alias("continue").num_args(1).help("Continue from a Ciel checkpoint"))
                 .arg(Arg::new("SELECT").num_args(0..=1).long("stage-select").help("Select the starting point for a build"))
                 .arg(Arg::new("PACKAGES").conflicts_with("CONTINUE").num_args(1..))

src/main.rs

@@ -302,6 +302,8 @@ fn main() -> Result<()> {
             let settings = BuildSettings {
                 offline: args.get_flag("OFFLINE"),
                 stage2: args.get_flag("STAGE2"),
+                force_use_apt: args.get_flag("force_use_apt")
+                    || read_config().is_ok_and(|config| config.force_use_apt),
             };
             let mut state = None;
             if let Some(cont) = args.get_one::<String>("CONTINUE") {