temporarily set epoch to 3

Author: lzrd

Cargo.toml

@@ -118,17 +118,18 @@ zip = { version = "0.6", default-features = false, features = ["bzip2"] }
 # Oxide forks and repos
 attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.1.0" }
 dice-mfg-msgs = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.2.1" }
+# TODO: update after merge of hubtools epoch branch
 #gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"] }
-# XXX fix before push
-# gateway-messages = { path = "/home/stoltz/Oxide/src/mgs/epoch/gateway-messages",  default-features = false, features = ["smoltcp"] }
 gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"], branch = "epoch" }
+#gateway-messages = { path = "/home/stoltz/Oxide/src/mgs/epoch/gateway-messages",  default-features = false, features = ["smoltcp"] }
 gimlet-inspector-protocol = { git = "https://github.com/oxidecomputer/gimlet-inspector-protocol", version = "0.1.0" }
 hif = { git = "https://github.com/oxidecomputer/hif", default-features = false }
 humpty = { git = "https://github.com/oxidecomputer/humpty", default-features = false, version = "0.1.3" }
+# XXX Update after merge of hubtools epoch branch
 #hubtools = { git = "https://github.com/oxidecomputer/hubtools", default-features = false, version = "0.4.1" }
-# XXX fix before push
 hubtools = { git = "https://github.com/oxidecomputer/hubtools", default-features = false, branch = "epoch", version = "0.4.7" }
 #hubtools = { path = "/home/stoltz/Oxide/src/hubtools/epoch/hubtools" }
+
 idol = { git = "https://github.com/oxidecomputer/idolatry.git", default-features = false }
 idol-runtime = { git = "https://github.com/oxidecomputer/idolatry.git", default-features = false }
 lpc55_sign = { git = "https://github.com/oxidecomputer/lpc55_support", default-features = false }

app/oxide-rot-1/app.toml

@@ -4,7 +4,7 @@ board = "oxide-rot-1"
 chip = "../../chips/lpc55"
 stacksize = 1024
 image-names = ["a", "b"]
-epoch = 0
+epoch = 1
 version = 0
 fwid = true
 

app/rot-carrier/app.toml

@@ -4,7 +4,7 @@ board = "rot-carrier-2"
 chip = "../../chips/lpc55"
 stacksize = 1024
 image-names = ["a", "b"]
-epoch = 0
+epoch = 3
 version = 0
 fwid = true
 

build/xtask/src/dist.rs

@@ -611,7 +611,7 @@ pub fn package(
                 // The Git hash is included in the default caboose under the key
                 // `GITC`, so we don't include it in the pseudo-version.
                 archive
-                    .write_default_caboose(None, None)
+                    .write_default_caboose(None, Some(&cfg.toml.epoch.to_string()))
                     .context("writing caboose into archive")?;
                 archive.overwrite().context("overwriting archive")?;
             }