Use Permissive Serializers in order to collect errors without fail.

Author: daym

Cargo.toml

@@ -7,8 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-amd-apcb = { git = "https://github.com/oxidecomputer/amd-apcb.git", tag = "v0.1.5", features = ["std", "serde", "schemars"] }
-amd-efs = { git = "ssh://git@github.com/oxidecomputer/amd-efs.git", tag = "v0.3.0", features = ["std", "serde", "schemars"] }
+amd-apcb = { git = "https://github.com/oxidecomputer/amd-apcb.git", branch = "issue-113", features = ["std", "serde", "schemars"] }
+amd-efs = { git = "ssh://git@github.com/oxidecomputer/amd-efs.git", branch = "issue-99", features = ["std", "serde", "schemars"] }
 amd-flash = { git = "ssh://git@github.com/oxidecomputer/amd-flash.git", tag = "v0.2.1", features = ["std"] }
 goblin = { version = "0.4", features = ["elf64", "endian_fd"] }
 #serde = { version = "1.0", default-features = false, features = ["derive"] }

amd-host-image-builder-config/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-amd-apcb = { git = "https://github.com/oxidecomputer/amd-apcb.git", tag = "v0.1.5", features = ["std", "serde", "schemars"] }
-amd-efs = { git = "ssh://git@github.com/oxidecomputer/amd-efs.git", tag = "v0.3.0", features = ["std", "serde", "schemars"] }
+amd-apcb = { git = "https://github.com/oxidecomputer/amd-apcb.git", branch = "issue-113", features = ["std", "serde", "schemars"] }
+amd-efs = { git = "ssh://git@github.com/oxidecomputer/amd-efs.git", tag = "issue-99", features = ["std", "serde", "schemars"] }
 amd-flash = { git = "ssh://git@github.com/oxidecomputer/amd-flash.git", tag = "v0.2.1", features = ["std"] }
 schemars = "0.8.8"
 serde = { version = "1.0", default-features = false, features = ["derive"] }

src/main.rs

@@ -25,13 +25,17 @@ use std::io::BufReader;
 use std::io::Read;
 use std::io::Seek;
 use std::io::SeekFrom;
+use std::io::stdout;
 use std::path::Path;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
 mod static_config;
 use amd_flash::allocators::{ArenaFlashAllocator, FlashAllocate};
 
+mod serializers;
+use serializers::DummySerializer;
+
 use amd_flash::{
     ErasableLocation, ErasableRange, FlashAlign, FlashRead, FlashWrite,
     Location,
@@ -699,11 +703,12 @@ fn dump_bhd_directory<'a, T: FlashRead + FlashWrite>(
                                 )
                                 .unwrap();
 
+                            let apcb_options = ApcbIoOptions::builder().with_check_checksum(false).build();
                             let apcb = Apcb::load(
                                 std::borrow::Cow::Borrowed(
                                     &mut apcb_buffer[..],
                                 ),
-                                &ApcbIoOptions::default(),
+                                &apcb_options,
                             )
                             .unwrap();
                             apcb.validate(None).unwrap(); // TODO: abl0 version ?