feat(rootfs, config): add support for old builders

Author: Samuka007

dadk-config/src/manifest.rs

@@ -58,6 +58,11 @@ fn check_used_default() -> bool {
 pub struct Metadata {
     /// Target processor architecture
     pub arch: TargetArch,
+
+    /// DADK builder version for isolating unstable features
+    #[serde(default = "default_dadk_builder_version", rename = "builder-version")]
+    pub builder_version: String,
+
     /// Rootfs configuration file path
     #[serde(default = "default_rootfs_config_path", rename = "rootfs-config")]
     pub rootfs_config: PathBuf,
@@ -88,6 +93,10 @@ pub struct Metadata {
     pub user_config_dir: PathBuf,
 }
 
+fn default_dadk_builder_version() -> String {
+    "v1".to_string()
+}
+
 /// Returns the default path for the rootfs configuration file.
 fn default_rootfs_config_path() -> PathBuf {
     set_used_default();

dadk/src/actions/mod.rs

@@ -10,7 +10,16 @@ pub fn run(ctx: DADKExecContext) {
             unimplemented!("kernel command has not implemented for run yet.")
         }
         crate::console::Action::Rootfs(rootfs_command) => {
-            rootfs::run(&ctx, rootfs_command).expect("Run rootfs action error.")
+            match ctx.manifest().metadata.builder_version.as_str() {
+                "v2" => {
+                    // v2版本的rootfs命令
+                    rootfs::v2::run(&ctx, rootfs_command).expect("Run rootfs action error.")
+                }
+                "v1" | _ => {
+                    // v1版本的rootfs命令
+                    rootfs::v1::run(&ctx, rootfs_command).expect("Run rootfs action error.")
+                }
+            }
         }
         crate::console::Action::User(user_command) => {
             user::run(&ctx, user_command).expect("Run user action error.")

dadk/src/actions/rootfs/mod.rs

@@ -1,19 +1,2 @@
-use crate::{console::rootfs::RootFSCommand, context::DADKExecContext};
-use anyhow::Result;
-
-mod disk_img;
-mod loopdev;
-mod sysroot;
-
-pub(super) fn run(ctx: &DADKExecContext, rootfs_cmd: &RootFSCommand) -> Result<()> {
-    match rootfs_cmd {
-        RootFSCommand::Create(param) => disk_img::create(ctx, param.skip_if_exists),
-        RootFSCommand::Delete => disk_img::delete(ctx, false),
-        RootFSCommand::DeleteSysroot => sysroot::delete(ctx),
-        RootFSCommand::Mount => disk_img::mount(ctx),
-        RootFSCommand::Umount => disk_img::umount(ctx),
-        RootFSCommand::CheckDiskImageExists => disk_img::check_disk_image_exists(ctx),
-        RootFSCommand::ShowMountPoint => disk_img::show_mount_point(ctx),
-        RootFSCommand::ShowLoopDevice => disk_img::show_loop_device(ctx),
-    }
-}
+pub mod v1;
+pub mod v2;

dadk/src/actions/rootfs/disk_img.rs renamed to dadk/src/actions/rootfs/v1/disk_img.rs

@@ -261,7 +261,10 @@ pub fn show_mount_point(ctx: &DADKExecContext) -> Result<()> {
 
 pub fn show_loop_device(ctx: &DADKExecContext) -> Result<()> {
     let disk_image_path = ctx.disk_image_path();
-    let mut loop_device = LoopDeviceBuilder::new().detach_on_drop(false).img_path(disk_image_path).build()?;
+    let mut loop_device = LoopDeviceBuilder::new()
+        .detach_on_drop(false)
+        .img_path(disk_image_path)
+        .build()?;
     if let Err(e) = loop_device.attach_by_exists() {
         log::error!("Failed to attach loop device: {}", e);
     } else {

dadk/src/actions/rootfs/loopdev.rs renamed to dadk/src/actions/rootfs/v1/loopdev.rs

@@ -115,7 +115,11 @@ impl LoopDevice {
             if new_path.exists() {
                 return Ok(new_path);
             }
-            log::error!("Both {} and {} not exist!", direct_path.display(), new_path.display());
+            log::error!(
+                "Both {} and {} not exist!",
+                direct_path.display(),
+                new_path.display()
+            );
             return Err(anyhow!("Unable to find partition path {}", nth));
         }
         Ok(direct_path)
@@ -139,13 +143,14 @@ impl LoopDevice {
             self.mapper = false;
         }
 
-        let output = Command::new("losetup")
-            .arg("-d")
-            .arg(&loop_device)
-            .output();
+        let output = Command::new("losetup").arg("-d").arg(&loop_device).output();
 
         if !output.is_ok() {
-            log::error!("losetup failed to detach loop device [{}]: {}", &loop_device, output.unwrap_err());
+            log::error!(
+                "losetup failed to detach loop device [{}]: {}",
+                &loop_device,
+                output.unwrap_err()
+            );
             return;
         }
 
@@ -159,7 +164,6 @@ impl LoopDevice {
                 str::from_utf8(output.stderr.as_slice()).unwrap_or("<Unknown>")
             );
         }
-
     }
 
     #[allow(dead_code)]
@@ -182,9 +186,9 @@ impl Drop for LoopDevice {
 }
 
 mod mapper {
-    use std::process::Command;
-    use anyhow::Result;
     use anyhow::anyhow;
+    use anyhow::Result;
+    use std::process::Command;
 
     pub(super) fn create_mapper(dev_path: &str) -> Result<()> {
         let output = Command::new("kpartx")
@@ -218,7 +222,11 @@ mod mapper {
                 );
             }
         } else {
-            log::error!("Failed to detach mapper device [{}]: {}", dev_path, output.unwrap_err());
+            log::error!(
+                "Failed to detach mapper device [{}]: {}",
+                dev_path,
+                output.unwrap_err()
+            );
         }
     }
 }
@@ -254,7 +262,7 @@ impl LoopDeviceBuilder {
             img_path: self.img_path,
             loop_device_path: self.loop_device_path,
             detach_on_drop: self.detach_on_drop,
-            mapper: false
+            mapper: false,
         };
 
         Ok(loop_dev)

dadk/src/actions/rootfs/v1/mod.rs

@@ -0,0 +1,19 @@
+use crate::{console::rootfs::RootFSCommand, context::DADKExecContext};
+use anyhow::Result;
+
+mod disk_img;
+mod loopdev;
+mod sysroot;
+
+pub fn run(ctx: &DADKExecContext, rootfs_cmd: &RootFSCommand) -> Result<()> {
+    match rootfs_cmd {
+        RootFSCommand::Create(param) => disk_img::create(ctx, param.skip_if_exists),
+        RootFSCommand::Delete => disk_img::delete(ctx, false),
+        RootFSCommand::DeleteSysroot => sysroot::delete(ctx),
+        RootFSCommand::Mount => disk_img::mount(ctx),
+        RootFSCommand::Umount => disk_img::umount(ctx),
+        RootFSCommand::CheckDiskImageExists => disk_img::check_disk_image_exists(ctx),
+        RootFSCommand::ShowMountPoint => disk_img::show_mount_point(ctx),
+        RootFSCommand::ShowLoopDevice => disk_img::show_loop_device(ctx),
+    }
+}