Skip to content

Commit cccc8d2

Browse files
authored
Pull in updated OPTE and xde kernel bits. (#1506)
Bump the opte and xde commits in `install_opte.sh`. Tested created a VM with an ephemeral external IP and works as expected. The updated kernel bits also means that the viona migration changes are now also included.
1 parent 1d61e37 commit cccc8d2

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sled-agent/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ vsss-rs = { version = "2.0.0-pre2", default-features = false, features = ["std"]
6262
zone = "0.1"
6363

6464
[target.'cfg(target_os = "illumos")'.dependencies]
65-
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "23884d35aa7908e23accaa77f125a370ddf5c606" }
66-
opte = { git = "https://github.com/oxidecomputer/opte", rev = "23884d35aa7908e23accaa77f125a370ddf5c606", features = [ "api", "std" ] }
65+
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "52176b99cc578f5b7b90f9bae8935013f961086c" }
66+
opte = { git = "https://github.com/oxidecomputer/opte", rev = "52176b99cc578f5b7b90f9bae8935013f961086c", features = [ "api", "std" ] }
6767

6868
[dev-dependencies]
6969
expectorate = "1.0.5"

tools/install_opte.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ function add_publisher {
122122
# `helios-netdev` provides the xde kernel driver and the `opteadm` userland tool
123123
# for interacting with it.
124124
HELIOS_NETDEV_BASE_URL="https://buildomat.eng.oxide.computer/public/file/oxidecomputer/opte/repo"
125-
HELIOS_NETDEV_COMMIT="23884d35aa7908e23accaa77f125a370ddf5c606"
125+
HELIOS_NETDEV_COMMIT="52176b99cc578f5b7b90f9bae8935013f961086c"
126126
HELIOS_NETDEV_REPO_URL="$HELIOS_NETDEV_BASE_URL/$HELIOS_NETDEV_COMMIT/opte.p5p"
127127
HELIOS_NETDEV_REPO_SHA_URL="$HELIOS_NETDEV_BASE_URL/$HELIOS_NETDEV_COMMIT/opte.p5p.sha256"
128128
HELIOS_NETDEV_REPO_PATH="$XDE_DIR/$(basename "$HELIOS_NETDEV_REPO_URL")"
129129

130130
# The xde repo provides a full OS/Net incorporation, with updated kernel bits
131131
# that the `xde` kernel module and OPTE rely on.
132132
XDE_REPO_BASE_URL="https://buildomat.eng.oxide.computer/public/file/oxidecomputer/os-build/xde"
133-
XDE_REPO_COMMIT="bd79a6eb03c6622760297887458d0601ebc188eb"
133+
XDE_REPO_COMMIT="37beaa374df2094e5b5df9f37d9fd87d77ebb4a0"
134134
XDE_REPO_URL="$XDE_REPO_BASE_URL/$XDE_REPO_COMMIT/repo.p5p"
135135
XDE_REPO_SHA_URL="$XDE_REPO_BASE_URL/$XDE_REPO_COMMIT/repo.p5p.sha256"
136136
XDE_REPO_PATH="$XDE_DIR/$(basename "$XDE_REPO_URL")"

0 commit comments

Comments
 (0)