From 3ea92d3badc0a6ba00f03978907d4e772862b3dd Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Mon, 16 Feb 2026 08:23:11 +0900 Subject: [PATCH] Add --baobit-commit flag for build provenance Adds BAOBIT_COMMIT constant to boot0/boot1 version.rs, allowing the Guix build channel commit to be embedded in firmware for reproducibility verification. - Add --baobit-commit CLI flag to xtask - Generate BAOBIT_COMMIT in boot version files - Display in audit command output - Simplify versioning.rs to always write files --- bao1x-boot/boot1/src/audit.rs | 1 + xtask/src/main.rs | 17 ++++----- xtask/src/versioning.rs | 71 +++++++++++++++++++---------------- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/bao1x-boot/boot1/src/audit.rs b/bao1x-boot/boot1/src/audit.rs index 9f16eb87c..19b4c9f86 100644 --- a/bao1x-boot/boot1/src/audit.rs +++ b/bao1x-boot/boot1/src/audit.rs @@ -57,6 +57,7 @@ pub fn audit() { crate::println!("Board type reads as: {:?}", boardtype); crate::println!("Boot partition is: {:?}", owc.get_decoded::()); crate::println!("Semver is: {}", crate::version::SEMVER); + crate::println!("Baobit commit is: {}", crate::version::BAOBIT_COMMIT); crate::println!("Description is: {}", crate::RELEASE_DESCRIPTION); crate::println!("Stepping is: {}", detect_stepping()); let slot_mgr = bao1x_hal::acram::SlotManager::new(); diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 04fb77e81..1e4602ece 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -58,16 +58,15 @@ fn main() -> Result<(), Box> { let mut builder = Builder::new(); // encodes a timestamp into the build, unless '--no-timestamp' is passed let do_version = env::args().filter(|x| x == "--no-timestamp").count() == 0; - let git_describe = get_flag("--git-describe")?; - let git_rev = get_flag("--git-rev")?; - if git_describe.is_empty() { - generate_version(do_version, None); - } else { - generate_version(do_version, Some(git_describe[0].to_owned())); - builder.set_git_describe(git_describe[0].to_owned()); + let git_describe_opt = get_flag("--git-describe")?.first().cloned(); + let git_rev_opt = get_flag("--git-rev")?.first().cloned(); + let baobit_commit_opt = get_flag("--baobit-commit")?.first().cloned(); + generate_version(do_version, git_describe_opt.clone(), baobit_commit_opt.clone()); + if let Some(desc) = git_describe_opt { + builder.set_git_describe(desc); } - if !git_rev.is_empty() { - builder.set_git_rev(git_rev[0].to_owned()); + if let Some(rev) = git_rev_opt { + builder.set_git_rev(rev); } if do_version { builder.add_feature("timestamp"); diff --git a/xtask/src/versioning.rs b/xtask/src/versioning.rs index 984badeb4..ba9a5722f 100644 --- a/xtask/src/versioning.rs +++ b/xtask/src/versioning.rs @@ -3,7 +3,7 @@ // It also generates timestamps, if demanded. use std::fs::OpenOptions; -use std::io::{Read, Write}; +use std::io::Write; use std::process::Command; use chrono::{Local, TimeZone, Utc}; @@ -12,7 +12,11 @@ use chrono::{Local, TimeZone, Utc}; /// Ensures consistent version strings regardless of clone depth. const GIT_ABBREV_LEN: u8 = 9; -pub(crate) fn generate_version(add_timestamp: bool, forced_version: Option) { +pub(crate) fn generate_version( + add_timestamp: bool, + forced_version: Option, + baobit_commit: Option, +) { let gitver = { if let Some(ver) = forced_version { ver.as_bytes().to_vec() @@ -32,12 +36,6 @@ pub(crate) fn generate_version(add_timestamp: bool, forced_version: Option(out: &mut U) {