>(
p: Option,
components: &[&str],
) -> Result {
- let mut top = if let Some(p) = p {
- p.as_ref().to_path_buf()
- } else {
- top()?
- };
+ let mut top =
+ if let Some(p) = p { p.as_ref().to_path_buf() } else { top()? };
for c in components {
top.push(c);
}
@@ -253,11 +258,15 @@ fn ensure_dir(components: &[&str]) -> Result {
Ok(dir)
}
-
-fn create_ips_repo(log: &Logger, path: P, publ: S, torch: bool)
- -> Result<()>
- where P: AsRef,
- S: AsRef,
+fn create_ips_repo(
+ log: &Logger,
+ path: P,
+ publ: S,
+ torch: bool,
+) -> Result<()>
+where
+ P: AsRef,
+ S: AsRef,
{
let publ: &str = publ.as_ref();
let path: &Path = path.as_ref();
@@ -295,8 +304,10 @@ fn cmd_merge_illumos(ca: &CommandArg) -> Result<()> {
opts.optopt("p", "", "output publisher name", "PUBLISHER");
let usage = || {
- println!("{}",
- opts.usage("Usage: helios [OPTIONS] merge-illumos [OPTIONS]"));
+ println!(
+ "{}",
+ opts.usage("Usage: helios [OPTIONS] merge-illumos [OPTIONS]")
+ );
};
let log = ca.log;
@@ -348,10 +359,12 @@ fn cmd_merge_illumos(ca: &CommandArg) -> Result<()> {
ensure_dir(&["tmp", &tillumos])?;
let repo_merge = top_path(&["tmp", &tillumos, "nightly-merged"])?;
- let repo_d = rel_path(Some(&gate),
- &["packages", "i386", "nightly", "repo.redist"])?;
- let repo_nd = rel_path(Some(&gate),
- &["packages", "i386", "nightly-nd", "repo.redist"])?;
+ let repo_d =
+ rel_path(Some(&gate), &["packages", "i386", "nightly", "repo.redist"])?;
+ let repo_nd = rel_path(
+ Some(&gate),
+ &["packages", "i386", "nightly-nd", "repo.redist"],
+ )?;
/*
* Merge the packages from the DEBUG and non-DEBUG builds into a single
@@ -360,9 +373,18 @@ fn cmd_merge_illumos(ca: &CommandArg) -> Result<()> {
info!(log, "recreating merging repository at {:?}", &repo_merge);
create_ips_repo(log, &repo_merge, &input_publisher, true)?;
- ensure::run(log, &["/usr/bin/pkgmerge", "-d", &repo_merge.to_str().unwrap(),
- "-s", &format!("debug.illumos=false,{}/", repo_nd.to_str().unwrap()),
- "-s", &format!("debug.illumos=true,{}/", repo_d.to_str().unwrap())])?;
+ ensure::run(
+ log,
+ &[
+ "/usr/bin/pkgmerge",
+ "-d",
+ &repo_merge.to_str().unwrap(),
+ "-s",
+ &format!("debug.illumos=false,{}/", repo_nd.to_str().unwrap()),
+ "-s",
+ &format!("debug.illumos=true,{}/", repo_d.to_str().unwrap()),
+ ],
+ )?;
info!(log, "transforming packages for publishing...");
@@ -384,14 +406,25 @@ fn cmd_merge_illumos(ca: &CommandArg) -> Result<()> {
top_path(&["packages", "os"])?
};
- ensure::run(log, &[PKGRECV,
- "-s", &repo_merge.to_str().unwrap(),
- "-d", &repo.to_str().unwrap(),
- "--mog-file", &mog_publisher.to_str().unwrap(),
- "--mog-file", &mog_conflicts.to_str().unwrap(),
- "--mog-file", &mog_deps.to_str().unwrap(),
- "-m", "latest",
- "*"])?;
+ ensure::run(
+ log,
+ &[
+ PKGRECV,
+ "-s",
+ &repo_merge.to_str().unwrap(),
+ "-d",
+ &repo.to_str().unwrap(),
+ "--mog-file",
+ &mog_publisher.to_str().unwrap(),
+ "--mog-file",
+ &mog_conflicts.to_str().unwrap(),
+ "--mog-file",
+ &mog_deps.to_str().unwrap(),
+ "-m",
+ "latest",
+ "*",
+ ],
+ )?;
ensure::run(log, &[PKGREPO, "refresh", "-s", &repo.to_str().unwrap()])?;
/*
@@ -409,11 +442,8 @@ fn ncpus() -> Result {
/*
* XXX Replace with kstat check.
*/
- /* "psrinfo -t" */
- let out = Command::new("/usr/sbin/psrinfo")
- .env_clear()
- .arg("-t")
- .output()?;
+ let out =
+ Command::new("/usr/sbin/psrinfo").env_clear().arg("-t").output()?;
if !out.status.success() {
bail!("could not count CPUs: {}", out.info());
@@ -448,16 +478,21 @@ impl BuildType {
}
}
-fn regen_publisher_mog>(log: &Logger, mogfile: Option,
- publisher: &str) -> Result<()>
-{
+fn regen_publisher_mog>(
+ log: &Logger,
+ mogfile: Option,
+ publisher: &str,
+) -> Result<()> {
/*
* Create the pkgmogrify template that we need to replace the pkg(5)
* publisher name when promoting packages from a build repository to the
* central repository.
*/
- let mog = format!(" \
- edit value pkg://[^/]+/ pkg://{}/>\n", publisher);
+ let mog = format!(
+ " \
+ edit value pkg://[^/]+/ pkg://{}/>\n",
+ publisher
+ );
let mogpath = if let Some(mogfile) = mogfile {
mogfile.as_ref().to_path_buf()
} else {
@@ -470,9 +505,8 @@ fn regen_publisher_mog>(log: &Logger, mogfile: Option,
fn determine_release_version() -> Result {
let relpath = "/etc/os-release";
let relfile = std::fs::read_to_string(relpath)?;
- let map: HashMap<_, _> = relfile.lines().filter_map(|l| {
- l.split_once('=')
- }).collect();
+ let map: HashMap<_, _> =
+ relfile.lines().filter_map(|l| l.split_once('=')).collect();
let Some(id) = map.get("ID") else {
bail!("ID missing from {relpath:?}");
@@ -491,9 +525,12 @@ fn determine_release_version() -> Result {
})
}
-fn regen_illumos_sh>(log: &Logger, gate: P, bt: BuildType,
- relver: RelVer) -> Result
-{
+fn regen_illumos_sh>(
+ log: &Logger,
+ gate: P,
+ bt: BuildType,
+ relver: RelVer,
+) -> Result {
let gate = gate.as_ref();
let path_env = rel_path(Some(gate), &[bt.script_name()])?;
@@ -635,8 +672,10 @@ fn cmd_build_illumos(ca: &CommandArg) -> Result<()> {
opts.optflag("i", "incremental", "perform an incremental build");
let usage = || {
- println!("{}",
- opts.usage("Usage: helios [OPTIONS] build-illumos [OPTIONS]"));
+ println!(
+ "{}",
+ opts.usage("Usage: helios [OPTIONS] build-illumos [OPTIONS]")
+ );
};
let log = ca.log;
@@ -684,20 +723,25 @@ fn cmd_build_illumos(ca: &CommandArg) -> Result<()> {
};
let env_sh = regen_illumos_sh(log, &gate, bt, relver)?;
- let script = format!("cd {} && ./usr/src/tools/scripts/nightly{} {}",
+ let script = format!(
+ "cd {} && ./usr/src/tools/scripts/nightly{} {}",
gate.to_str().unwrap(),
if res.opt_present("i") { " -i" } else { "" },
- env_sh.to_str().unwrap());
+ env_sh.to_str().unwrap()
+ );
ensure::run(log, &["/sbin/sh", "-c", &script])?;
Ok(())
}
-fn create_transformed_repo(log: &Logger, gate: &Path, tmpdir: &Path,
- debug: bool, refresh: bool)
- -> Result
-{
+fn create_transformed_repo(
+ log: &Logger,
+ gate: &Path,
+ tmpdir: &Path,
+ debug: bool,
+ refresh: bool,
+) -> Result {
let repo = rel_path(Some(tmpdir), &["repo.redist"])?;
create_ips_repo(log, &repo, "on-nightly", true)?;
@@ -709,15 +753,25 @@ fn create_transformed_repo(log: &Logger, gate: &Path, tmpdir: &Path,
info!(log, "transforming packages for installation...");
let which = if debug { "nightly" } else { "nightly-nd" };
- let repo_nd = rel_path(Some(gate),
- &["packages", "i386", which, "repo.redist"])?;
- ensure::run(log, &[PKGRECV,
- "-s", &repo_nd.to_str().unwrap(),
- "-d", &repo.to_str().unwrap(),
- "--mog-file", &mog_conflicts.to_str().unwrap(),
- "--mog-file", &mog_deps.to_str().unwrap(),
- "-m", "latest",
- "*"])?;
+ let repo_nd =
+ rel_path(Some(gate), &["packages", "i386", which, "repo.redist"])?;
+ ensure::run(
+ log,
+ &[
+ PKGRECV,
+ "-s",
+ &repo_nd.to_str().unwrap(),
+ "-d",
+ &repo.to_str().unwrap(),
+ "--mog-file",
+ &mog_conflicts.to_str().unwrap(),
+ "--mog-file",
+ &mog_deps.to_str().unwrap(),
+ "-m",
+ "latest",
+ "*",
+ ],
+ )?;
if refresh {
ensure::run(log, &[PKGREPO, "refresh", "-s", &repo.to_str().unwrap()])?;
}
@@ -799,8 +853,13 @@ fn cmd_illumos_onu(ca: &CommandArg) -> Result<()> {
* consolidations. To do this, we create an onu-specific repository:
*/
info!(log, "creating temporary repository...");
- let repo = create_transformed_repo(log, &gate,
- &ensure_dir(&["tmp", &tonu])?, res.opt_present("d"), true)?;
+ let repo = create_transformed_repo(
+ log,
+ &gate,
+ &ensure_dir(&["tmp", &tonu])?,
+ res.opt_present("d"),
+ true,
+ )?;
if res.opt_present("P") {
info!(log, "transformed packages available for onu at: {:?}", &repo);
@@ -882,13 +941,34 @@ fn cmd_illumos_onu(ca: &CommandArg) -> Result<()> {
* privileges as it modifies the system.
*/
info!(log, "installing packages...");
- let onu = rel_path(Some(&gate), &["usr", "src", "tools", "proto",
- "root_i386-nd", "opt", "onbld", "bin", "onu"])?;
+ let onu = rel_path(
+ Some(&gate),
+ &[
+ "usr",
+ "src",
+ "tools",
+ "proto",
+ "root_i386-nd",
+ "opt",
+ "onbld",
+ "bin",
+ "onu",
+ ],
+ )?;
let onu_dir = top_path(&["tmp", &tonu])?;
- ensure::run(log, &["pfexec", &onu.to_str().unwrap(), "-v",
- "-d", &onu_dir.to_str().unwrap(),
- "-t", &bename])?;
+ ensure::run(
+ log,
+ &[
+ "pfexec",
+ &onu.to_str().unwrap(),
+ "-v",
+ "-d",
+ &onu_dir.to_str().unwrap(),
+ "-t",
+ &bename,
+ ],
+ )?;
info!(log, "onu complete! you must now reboot");
Ok(())
@@ -982,8 +1062,8 @@ fn cmd_illumos_bldenv(ca: &CommandArg) -> Result<()> {
let env = rel_path(Some(&gate), &[t.script_name()])?;
let src = rel_path(Some(&gate), &["usr", "src"])?;
- let bldenv = rel_path(Some(&gate), &["usr", "src",
- "tools", "scripts", "bldenv"])?;
+ let bldenv =
+ rel_path(Some(&gate), &["usr", "src", "tools", "scripts", "bldenv"])?;
/*
* bldenv(1) starts an interactive build shell with the correct environment
@@ -1000,17 +1080,6 @@ fn cmd_illumos_bldenv(ca: &CommandArg) -> Result<()> {
bail!("exec failure: {:?}", err);
}
-#[derive(Debug)]
-enum BuildFile {
- Script(PathBuf),
- Manifest(PathBuf),
-}
-
-struct BuildPackage {
- name: String,
- file: BuildFile,
-}
-
fn read_string(path: &Path) -> Result {
let f = File::open(path)?;
let mut buf = String::new();
@@ -1019,115 +1088,18 @@ fn read_string(path: &Path) -> Result {
Ok(buf)
}
-fn extract_pkgs(_log: &Logger, dir: &Path) -> Result> {
- /*
- * First, find all the build.sh scripts.
- */
- fn is_build_sh(ent: &DirEntry) -> bool {
- ent.file_type().is_file() &&
- ent.file_name().to_str()
- .map(|s| s.starts_with("build") && s.ends_with(".sh"))
- .unwrap_or(false)
- }
-
- fn is_p5m(ent: &DirEntry) -> bool {
- ent.file_type().is_file() &&
- ent.file_name().to_str()
- .map(|s| s.ends_with(".p5m"))
- .unwrap_or(false)
- }
-
- let mut out = Vec::new();
- let re = Regex::new(r"\bPKG=([^[:space:]]+)[[:space:]]*(#.*)?$").unwrap();
- let re2 = Regex::new(r"^set name=pkg.fmri value=([^[:space:]]+).*")
- .unwrap();
- let re3 = Regex::new("^(?:.*//[^/]*/)?(.+?)(?:@.*)$").unwrap();
-
- for ent in WalkDir::new(&dir).into_iter() {
- let ent = ent?;
-
- if is_p5m(&ent) {
- for l in read_string(&ent.path())?.lines() {
- if let Some(cap) = re2.captures(&l) {
- let pkg = cap.get(1).unwrap().as_str();
- if let Some(cap) = re3.captures(&pkg) {
- let pkg = cap.get(1).unwrap().as_str();
- out.push(BuildPackage {
- name: pkg.to_string(),
- file: BuildFile::Manifest(ent.path().to_path_buf()),
- });
- } else {
- bail!("weird package? {}", l);
- }
- }
- }
- continue;
- }
-
- if !is_build_sh(&ent) {
- continue;
- }
-
- /*
- * Inspect the contents of each build script and look for packages.
- */
- for l in read_string(&ent.path())?.lines() {
- if l.contains("##IGNORE##") {
- continue;
- }
-
- if let Some(cap) = re.captures(&l) {
- if let Some(pkg) = cap.get(1) {
- let pkg = pkg.as_str().trim();
- if !pkg.is_empty() {
- out.push(BuildPackage {
- name: pkg.to_string(),
- file: BuildFile::Script(ent.path().to_path_buf()),
- });
- }
- }
- }
- }
- }
-
- Ok(out)
-}
-
-fn cmd_build_omnios(ca: &CommandArg) -> Result<()> {
- let opts = baseopts();
-
- let usage = || {
- println!("{}", opts.usage("Usage: helios [OPTIONS] build-omnios \
- [OPTIONS]"));
- };
-
- let log = ca.log;
- let res = opts.parse(ca.args)?;
-
- if res.opt_present("help") {
- usage();
- return Ok(());
- }
-
- let dir = top_path(&["projects", "omnios-build", "build"])?;
-
- let mut pkgs = extract_pkgs(log, &dir)?;
-
- pkgs.sort_by(|a, b| a.name.cmp(&b.name));
-
- for pkg in pkgs.iter() {
- println!(" * {}", pkg.name);
- println!(" {:?}", pkg.file);
- }
-
- Ok(())
-}
-
-fn cargo_target_cmd(project: &str, command: &str, debug: bool)
- -> Result
-{
- let bin = top_path(&["projects", project, "target",
- if debug { "debug" } else { "release" }, command])?;
+fn cargo_target_cmd(
+ project: &str,
+ command: &str,
+ debug: bool,
+) -> Result {
+ let bin = top_path(&[
+ "projects",
+ project,
+ "target",
+ if debug { "debug" } else { "release" },
+ command,
+ ])?;
if !bin.is_file() {
bail!("binary {:?} does not exist. run \"gmake setup\"?", bin);
}
@@ -1159,8 +1131,10 @@ fn genproto(proto: &Path, output_template: &Path) -> Result<()> {
/*
* On illumos, /bin is always a symbolic link to /usr/bin.
*/
- bail!("proto {:?} contains a /bin directory; should use /usr/bin",
- proto);
+ bail!(
+ "proto {:?} contains a /bin directory; should use /usr/bin",
+ proto
+ );
}
/*
@@ -1198,9 +1172,7 @@ fn genproto(proto: &Path, output_template: &Path) -> Result<()> {
|| relpath == PathBuf::from("opt")
{
"sys"
- } else if relpath.starts_with("lib")
- || relpath.starts_with("usr")
- {
+ } else if relpath.starts_with("lib") || relpath.starts_with("usr") {
"bin"
} else {
"root"
@@ -1242,26 +1214,31 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
opts.optopt("o", "", "output directory for image", "DIR");
opts.optmulti("F", "", "pass extra image builder features", "KEY[=VAL]");
opts.optflag("B", "", "include omicron1 brand");
- opts.optopt("C", "", "compliance dock location", "DOCK");
opts.optopt("N", "name", "image name", "NAME");
opts.optflag("R", "", "recovery image");
opts.optmulti("X", "", "skip this phase", "PHASE");
opts.optflag("", "ddr-testing", "build ROMs for other DDR frequencies");
opts.optopt("p", "", "use an external package repository", "PUBLISHER=URL");
opts.optopt("P", "", "include all files from extra proto area", "DIR");
- opts.optmulti("Y", "", "AMD firmware blob directories override \
- (e.g., \"GN/1.0.0.1\")", "DIR");
+ opts.optmulti(
+ "Y",
+ "",
+ "AMD firmware blob directories override \
+ (e.g., \"GN/1.0.0.1\")",
+ "DIR",
+ );
opts.optopt("Z", "", "AMD firmware configuration file override", "FILE");
let usage = || {
- println!("{}",
- opts.usage("Usage: helios [OPTIONS] experiment-image [OPTIONS]"));
+ println!(
+ "{}",
+ opts.usage("Usage: helios [OPTIONS] experiment-image [OPTIONS]")
+ );
};
let log = ca.log;
let res = opts.parse(ca.args.iter())?;
- let cdock = res.opt_str("C");
- let brand = res.opt_present("B") || cdock.is_some();
+ let brand = res.opt_present("B");
let (publisher, extrepo) = if let Some(arg) = res.opt_str("p") {
if let Some((key, val)) = arg.split_once('=') {
(key.to_string(), Some(val.to_string()))
@@ -1285,10 +1262,9 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
None
};
- let image_template = res.opt_str("N")
- .unwrap_or_else(
- || r"${user}@${host}: ${os_short_commit}; ${date} ${time}"
- .to_string());
+ let image_template = res.opt_str("N").unwrap_or_else(|| {
+ r"${user}@${host}: ${os_short_commit}; ${date} ${time}".to_string()
+ });
if res.opt_present("help") {
usage();
@@ -1329,22 +1305,25 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
info!(log, "using AMD firmware configuration file {amdconf:?}");
let amdblobs = if res.opt_present("Y") {
- res.opt_strs("Y").into_iter().map(|y| {
- /*
- * If the override is an absolute path, just pass it through.
- * Otherwise look in the place where we usually store the
- * firmware blobs:
- */
- let d = if y.starts_with("/") {
- let p = PathBuf::from(y);
- assert!(p.is_absolute());
- p
- } else {
- top_path(&["projects", "amd-firmware", &y])?
- };
+ res.opt_strs("Y")
+ .into_iter()
+ .map(|y| {
+ /*
+ * If the override is an absolute path, just pass it through.
+ * Otherwise look in the place where we usually store the
+ * firmware blobs:
+ */
+ let d = if y.starts_with("/") {
+ let p = PathBuf::from(y);
+ assert!(p.is_absolute());
+ p
+ } else {
+ top_path(&["projects", "amd-firmware", &y])?
+ };
- Ok(d)
- }).collect::>>()?
+ Ok(d)
+ })
+ .collect::>>()?
} else {
/*
* If there is no override, use the default:
@@ -1363,11 +1342,14 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
let builder = cargo_target_cmd("image-builder", "image-builder", true)?;
let mkimage = cargo_target_cmd("bootserver", "mkimage", false)?;
let pinprick = cargo_target_cmd("pinprick", "pinprick", false)?;
- let ahib = cargo_target_cmd("amd-host-image-builder",
- "amd-host-image-builder", true)?;
+ let ahib = cargo_target_cmd(
+ "amd-host-image-builder",
+ "amd-host-image-builder",
+ true,
+ )?;
let baseline = "/usr/lib/brand/omicron1/baseline";
if brand && !PathBuf::from(baseline).is_file() {
- bail!("pkg install /system/zones/brand/omicron1/tools");
+ bail!("Please run: pkg install /system/zones/brand/omicron1/tools");
}
/*
@@ -1381,8 +1363,10 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
bail!("neither LOGNAME nor IMAGE_DATASET present in environment?");
};
if !zfs::dataset_exists(&imgds)? {
- bail!("ZFS dataset {:?} does not exist; we need it to create images",
- imgds);
+ bail!(
+ "ZFS dataset {:?} does not exist; we need it to create images",
+ imgds
+ );
}
let mp = zfs::zfs_get(&imgds, "mountpoint")?;
@@ -1449,8 +1433,13 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
* consolidations. To do this, we create an onu-specific repository:
*/
info!(log, "creating temporary repository...");
- Some(create_transformed_repo(log, &gate, &tempdir,
- res.opt_present("d"), false)?)
+ Some(create_transformed_repo(
+ log,
+ &gate,
+ &tempdir,
+ res.opt_present("d"),
+ false,
+ )?)
};
/*
@@ -1472,13 +1461,8 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
cmd.arg("-F").arg(&format!("relver={}", relver));
if let Some(genproto) = &genproto {
cmd.arg("-E").arg(extra_proto.as_deref().unwrap());
- cmd.arg("-F").arg(&format!("genproto={}",
- genproto.to_str().unwrap()));
- }
- if let Some(cdock) = &cdock {
- cmd.arg("-F").arg("compliance");
- cmd.arg("-F").arg("stress");
- cmd.arg("-E").arg(&cdock);
+ cmd.arg("-F")
+ .arg(&format!("genproto={}", genproto.to_str().unwrap()));
}
cmd.arg("-E").arg(&brand_extras);
cmd.arg("-E").arg(&projects_extras);
@@ -1489,8 +1473,8 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
cmd.arg("-F").arg("debug_variant");
}
} else if let Some(repo) = &repo {
- cmd.arg("-F").arg(format!("repo_redist={}",
- repo.to_str().unwrap()));
+ cmd.arg("-F")
+ .arg(format!("repo_redist={}", repo.to_str().unwrap()));
}
cmd.arg("-F").arg("baud=3000000");
if brand {
@@ -1519,10 +1503,10 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
*/
info!(log, "omicron1 baseline generation...");
- ensure::run(log, &[baseline,
- "-R", &root,
- &brand_extras.to_str().unwrap()
- ])?;
+ ensure::run(
+ log,
+ &[baseline, "-R", &root, &brand_extras.to_str().unwrap()],
+ )?;
}
info!(log, "image builder template: ramdisk-02-trim...");
@@ -1540,9 +1524,7 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
info!(log, "skipping installation phase, using existing archive");
}
- let tname = if recovery { "zfs-recovery" }
- else if cdock.is_some() { "zfs-compliance" }
- else { "zfs" };
+ let tname = if recovery { "zfs-recovery" } else { "zfs" };
info!(log, "image builder template: {}...", tname);
let mut cmd = basecmd();
cmd.arg("-n").arg(tname);
@@ -1554,8 +1536,10 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
let mut tokens = HashMap::new();
let now: OffsetDateTime = SystemTime::now().into();
- tokens.insert("user".to_string(),
- illumos::get_username()?.unwrap_or_else(|| "unknown".to_string()));
+ tokens.insert(
+ "user".to_string(),
+ illumos::get_username()?.unwrap_or_else(|| "unknown".to_string()),
+ );
tokens.insert("host".to_string(), illumos::nodename());
let dt_fmt = format_description::parse(DATE_FORMAT_STR).unwrap();
tokens.insert("date".to_string(), now.format(&dt_fmt).unwrap());
@@ -1603,12 +1587,10 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
/*
* Assemble a set of extra metadata to include in the archive.
*/
- let mut infos = vec![
- (
- "image-args.txt".to_string(),
- format!("image arguments: {:#?}\n", ca.args).as_bytes().to_vec(),
- ),
- ];
+ let mut infos = vec![(
+ "image-args.txt".to_string(),
+ format!("image arguments: {:#?}\n", ca.args).as_bytes().to_vec(),
+ )];
/*
* Include some basic git metadata from the set of project directories we
@@ -1698,16 +1680,7 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
/*
* Create the image and extract the checksum:
*/
- let target_size = if cdock.is_some() {
- /*
- * In the compliance rack we would like to avoid running out of space,
- * and we have no customer workloads, so using more RAM for the ramdisk
- * pool is OK.
- */
- 16 * 1024
- } else {
- 4 * 1024
- };
+ let target_size = 4 * 1024;
info!(log, "creating Oxide boot image...");
let mut cmd = Command::new(&mkimage);
cmd.arg("-i").arg(&raw);
@@ -1739,9 +1712,9 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
let tar = archive::Archive::new(
&tarpath,
metadata::MetadataBuilder::new(ArchiveType::Os)
- .info("name", &image_name)?
- .info("checksum", &csum)?
- .build()?,
+ .info("name", &image_name)?
+ .info("checksum", &csum)?
+ .build()?,
)?;
for (name, data) in infos {
@@ -1758,8 +1731,16 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
let mkcpio = top_path(&["image", "mkcpio.sh"])?;
let cpio = rel_path(Some(&outdir), &["cpio"])?;
info!(log, "creating boot archive (CPIO)...");
- ensure::run(log, &["bash", mkcpio.to_str().unwrap(),
- &root, cpio.to_str().unwrap(), tempdir.to_str().unwrap()])?;
+ ensure::run(
+ log,
+ &[
+ "bash",
+ mkcpio.to_str().unwrap(),
+ &root,
+ cpio.to_str().unwrap(),
+ tempdir.to_str().unwrap(),
+ ],
+ )?;
/*
* Create a compressed CPIO and kernel to be passed to nanobl-rs via XMODEM.
@@ -1770,31 +1751,64 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
let unix = format!("{}/platform/oxide/kernel/amd64/unix", root);
let unixz = rel_path(Some(&outdir), &["unix.z"])?;
info!(log, "creating compressed cpio/unix for nanobl-rs...");
- ensure::run(log, &["bash", "-c",
- &format!("'{}' '{}' >'{}'", pinprick, unix,
- unixz.to_str().unwrap())])?;
+ ensure::run(
+ log,
+ &[
+ "bash",
+ "-c",
+ &format!(
+ "'{}' '{}' >'{}'",
+ pinprick,
+ unix,
+ unixz.to_str().unwrap()
+ ),
+ ],
+ )?;
tar.add_file(&unixz, "unix.z")?;
- ensure::run(log, &["bash", "-c",
- &format!("'{}' '{}' >'{}'", pinprick, cpio.to_str().unwrap(),
- cpioz.to_str().unwrap())])?;
+ ensure::run(
+ log,
+ &[
+ "bash",
+ "-c",
+ &format!(
+ "'{}' '{}' >'{}'",
+ pinprick,
+ cpio.to_str().unwrap(),
+ cpioz.to_str().unwrap()
+ ),
+ ],
+ )?;
tar.add_file(&cpioz, "cpio.z")?;
/*
* Create the reset image for the Gimlet SPI ROM:
*/
info!(log, "creating reset image...");
- ensure::run_in(log, &top_path(&["projects", "phbl"])?,
- &["cargo", "xtask", "build", "--release",
- "--cpioz", cpioz.to_str().unwrap()])?;
+ ensure::run_in(
+ log,
+ &top_path(&["projects", "phbl"])?,
+ &[
+ "cargo",
+ "xtask",
+ "build",
+ "--release",
+ "--cpioz",
+ cpioz.to_str().unwrap(),
+ ],
+ )?;
info!(log, "building host image...");
let rom = rel_path(Some(&outdir), &["rom"])?;
- let reset = top_path(&["projects", "phbl", "target",
- "x86_64-oxide-none-elf", "release", "phbl"])?;
+ let reset = top_path(&[
+ "projects",
+ "phbl",
+ "target",
+ "x86_64-oxide-none-elf",
+ "release",
+ "phbl",
+ ])?;
let ahibdir = top_path(&["projects", "amd-host-image-builder"])?;
let ahibargs_base = {
- let mut t: Vec = vec![
- ahib.as_str().into(),
- ];
+ let mut t: Vec = vec![ahib.as_str().into()];
for blob in amdblobs {
t.push("-B".into());
t.push(blob.to_str().unwrap().into());
@@ -1815,8 +1829,11 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
t
};
- ensure::run_in(log, &ahibdir,
- &ahibargs.iter().map(String::as_str).collect::>())?;
+ ensure::run_in(
+ log,
+ &ahibdir,
+ &ahibargs.iter().map(String::as_str).collect::>(),
+ )?;
tar.add_file(&rom, "rom")?;
if ddr_testing {
@@ -1835,8 +1852,10 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
* Produce a new configuration file with the specified
* MemBusFrequencyLimit:
*/
- let tmpcfg = rel_path(Some(&tempdir),
- &[&format!("milan-gimlet-b.ddr{}.efs.json", limit)])?;
+ let tmpcfg = rel_path(
+ Some(&tempdir),
+ &[&format!("milan-gimlet-b.ddr{}.efs.json", limit)],
+ )?;
maybe_unlink(&tmpcfg)?;
mk_rom_config(inputcfg.clone(), &tmpcfg, limit)?;
@@ -1857,8 +1876,11 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
t
};
- ensure::run_in(log, &ahibdir,
- &ahibargs.iter().map(String::as_str).collect::>())?;
+ ensure::run_in(
+ log,
+ &ahibdir,
+ &ahibargs.iter().map(String::as_str).collect::>(),
+ )?;
tar.add_file(&rom, &romname)?;
}
}
@@ -1871,10 +1893,11 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
Ok(())
}
-fn mk_rom_config(mut input: serde_json::Value, output: &Path, ddr_speed: u32)
- -> Result<()>
-{
-
+fn mk_rom_config(
+ mut input: serde_json::Value,
+ output: &Path,
+ ddr_speed: u32,
+) -> Result<()> {
let Some(bhd) = input.get_mut("bhd") else {
bail!("could not find bhd");
};
@@ -1900,7 +1923,7 @@ fn mk_rom_config(mut input: serde_json::Value, output: &Path, ddr_speed: u32)
target: EntryTarget,
}
- let ee: Entry= serde_json::from_value(e.clone())?;
+ let ee: Entry = serde_json::from_value(e.clone())?;
if ee.target.type_ != "ApcbBackup" {
continue;
}
@@ -1931,8 +1954,9 @@ fn mk_rom_config(mut input: serde_json::Value, output: &Path, ddr_speed: u32)
};
let h: Header = serde_json::from_value(h.clone())?;
- if h.group_id != 0x3000 || h.entry_id != 0x0004 ||
- h.instance_id != 0
+ if h.group_id != 0x3000
+ || h.entry_id != 0x0004
+ || h.instance_id != 0
{
continue;
}
@@ -1960,8 +1984,10 @@ fn mk_rom_config(mut input: serde_json::Value, output: &Path, ddr_speed: u32)
continue;
}
}
- dword.insert("MemBusFrequencyLimit".to_string(),
- serde_json::Value::String(format!("Ddr{}", ddr_speed)));
+ dword.insert(
+ "MemBusFrequencyLimit".to_string(),
+ serde_json::Value::String(format!("Ddr{}", ddr_speed)),
+ );
}
}
}
@@ -2121,8 +2147,11 @@ fn cmd_setup(ca: &CommandArg) -> Result<()> {
let bs = git_branch_status(&path)?;
if &bs.head == "(detached)" && bs.oid == fixup.from_commit {
- info!(log, "applying fixup: moving to branch {}...",
- fixup.to_branch);
+ info!(
+ log,
+ "applying fixup: moving to branch {}...",
+ fixup.to_branch
+ );
let mut child = Command::new("git")
.current_dir(&path)
.arg("checkout")
@@ -2250,8 +2279,13 @@ fn cmd_setup(ca: &CommandArg) -> Result<()> {
site_sh += &format!("TMPDIR={}\n", &tmp.to_str().unwrap());
site_sh += "DTMPDIR=$TMPDIR\n";
- ensure::file_str(&log, &site_sh, &ssp, 0o644,
- ensure::Create::Always)?;
+ ensure::file_str(
+ &log,
+ &site_sh,
+ &ssp,
+ 0o644,
+ ensure::Create::Always,
+ )?;
}
if name == "illumos" {
@@ -2276,8 +2310,11 @@ fn cmd_setup(ca: &CommandArg) -> Result<()> {
regen_publisher_mog(log, NO_PATH, publisher)?;
for mog in &["os-conflicts", "os-deps"] {
let mogpath = top_path(&["packages", &format!("{}.mogrify", mog)])?;
- ensure::symlink(log, &mogpath,
- &format!("../tools/packages/{}.mogrify", mog))?;
+ ensure::symlink(
+ log,
+ &mogpath,
+ &format!("../tools/packages/{}.mogrify", mog),
+ )?;
}
/*
@@ -2363,13 +2400,6 @@ fn main() -> Result<()> {
hide: false,
blank: false,
});
- handlers.push(CommandInfo {
- name: "build-omnios".into(),
- desc: "build-omnios".into(),
- func: cmd_build_omnios,
- hide: true,
- blank: false,
- });
handlers.push(CommandInfo {
name: "experiment-image".into(),
desc: "experimental image construction for Gimlets".into(),
@@ -2422,10 +2452,7 @@ fn main() -> Result<()> {
continue;
}
- let ca = CommandArg {
- log: &log,
- args: args.as_slice(),
- };
+ let ca = CommandArg { log: &log, args: args.as_slice() };
return (ci.func)(&ca);
}
diff --git a/tools/helios-build/src/zfs.rs b/tools/helios-build/src/zfs.rs
index 5982fb3..0a6d652 100644
--- a/tools/helios-build/src/zfs.rs
+++ b/tools/helios-build/src/zfs.rs
@@ -1,6 +1,9 @@
use std::process::Command;
+/*
+ * Copyright 2024 Oxide Computer Company
+ */
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
pub fn dataset_exists(dataset: &str) -> Result {
if dataset.contains('@') {
@@ -10,7 +13,8 @@ pub fn dataset_exists(dataset: &str) -> Result {
let zfs = Command::new("/sbin/zfs")
.env_clear()
.arg("list")
- .arg("-Ho").arg("name")
+ .arg("-Ho")
+ .arg("name")
.arg(dataset)
.output()?;
@@ -30,7 +34,8 @@ pub fn zfs_get(dataset: &str, n: &str) -> Result {
.env_clear()
.arg("get")
.arg("-H")
- .arg("-o").arg("value")
+ .arg("-o")
+ .arg("value")
.arg(n)
.arg(dataset)
.output()?;
diff --git a/tools/packages/os-conflicts.mogrify b/tools/packages/os-conflicts.mogrify
index 85fd131..91507e6 100644
--- a/tools/packages/os-conflicts.mogrify
+++ b/tools/packages/os-conflicts.mogrify
@@ -1,2 +1,6 @@
+#
+# Copyright 2024 Oxide Computer Company
+#
+
drop>
drop>
diff --git a/tools/packages/os-deps.mogrify b/tools/packages/os-deps.mogrify
index 9e750f1..bbf0bb9 100644
--- a/tools/packages/os-deps.mogrify
+++ b/tools/packages/os-deps.mogrify
@@ -1,3 +1,7 @@
+#
+# Copyright 2024 Oxide Computer Company
+#
+
#
# Each "transform" rule acts on a specific pkg(5) action, such as a "depend"
# or a "file" entry. In this file, we wish to trim out a few specific