Commit 85150a7
authored
Split out a
On main as of #5158, we unexpectedly get some binaries depending on
`libnvme` that shouldn't. In release builds:
```
installinator
omicron-dev
omicron-package
services-ledger-check-migrate
sled-agent
sled-agent-sim
wicketd
```
and in debug builds, all of the above plus `omdb`. We don't really care
about this for binaries that don't run on the rack, so stripping the
list down to binaries we do care about:
```
installinator
omdb (debug only)
sled-agent
wicketd
```
It's correct and expected that installinator and sled-agent depend on
libnvme, but omdb shouldn't (and doesn't in release), and wicketd _must
not_, as libnvme isn't available in the switch zone.
This PR fixes that incorrect dependency by splitting the parts of the
`sled-hardware` crate that wicketd and omdb depended on (directly or
transitively) into a new `sled-hardware-types` crate. On this PR, we are
left with only the following needing libnvme, in both debug and release:
```
installinator
omicron-dev
omicron-package
services-ledger-check-migrate
sled-agent
sled-agent-sim
```
I assume with a bit more work we could trim out everything but
`installinator` and `sled-agent`, and that might be worth doing, but
we'd like to land this ASAP so as to not break any updates performed off
of `main`. Separately, we could also imagine a CI check that we don't
have unexpected library dependencies present in the final binaries;
@papertigers is going to work on that.sled-hardware-types crate (#5245)1 parent fdbbbe5 commit 85150a7
File tree
53 files changed
+279
-222
lines changed- bootstore
- src/schemes/v0
- tests
- common
- clients
- bootstrap-agent-client
- src
- ddm-admin-client
- src
- mg-admin-client
- dev-tools/omdb
- src/bin/omdb
- installinator
- src
- sled-agent
- src
- bin
- bootstrap
- rack_setup
- sim
- sled-hardware
- src
- illumos
- non_illumos
- types
- src
- wicketd
- src
- bin
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
53 files changed
+279
-222
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| 67 | + | |
67 | 68 | | |
68 | 69 | | |
69 | 70 | | |
| |||
142 | 143 | | |
143 | 144 | | |
144 | 145 | | |
| 146 | + | |
145 | 147 | | |
146 | 148 | | |
147 | 149 | | |
| |||
373 | 375 | | |
374 | 376 | | |
375 | 377 | | |
| 378 | + | |
376 | 379 | | |
377 | 380 | | |
378 | 381 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
0 commit comments