Skip to content

Commit bccfd77

Browse files
committed
Is this it?
1 parent fedb88a commit bccfd77

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.github/buildomat/jobs/p5p.sh

+10
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
#:
2525
#: [dependencies.xde]
2626
#: job = "opte-xde"
27+
#;
28+
#: [dependencies.opteadm]
29+
#: job = "opteadm"
2730

2831
set -o errexit
2932
set -o pipefail
@@ -48,9 +51,11 @@ header "move artifacts for packaging"
4851
# Copy in just-built artifacts
4952
DBG_SRC=target/x86_64-illumos/debug
5053
DBG_LINK_SRC=target/i686-unknown-illumos/debug
54+
DBG_ADM_SRC=target/debug
5155

5256
REL_SRC=target/x86_64-illumos/release
5357
REL_LINK_SRC=target/i686-unknown-illumos/release
58+
REL_ADM_SRC=target/release
5459

5560
mkdir -p $REL_SRC
5661
cp /input/xde/work/release/xde $REL_SRC
@@ -62,6 +67,11 @@ cp /input/xde/work/release/xde_link.so $REL_LINK_SRC/libxde_link.so
6267
mkdir -p $DBG_LINK_SRC
6368
cp /input/xde/work/debug/xde_link.dbg.so $DBG_LINK_SRC/libxde_link.so
6469

70+
mkdir -p $REL_ADM_SRC
71+
cp /input/opteadm/work/release/opteadm $REL_ADM_SRC
72+
mkdir -p $DBG_ADM_SRC
73+
cp /input/opteadm/work/debug/opteadm $DBG_ADM_SRC
74+
6575
header "package opte"
6676
cargo xtask package --skip-build
6777

pkg/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cp ../target/i686-unknown-illumos/release/libxde_link.so proto/usr/lib/devfsadm/
2020

2121
if [ -z ${RELEASE_ONLY+x} ]; then
2222
cp ../target/debug/opteadm proto/opt/oxide/opte/bin/opteadm.dbg
23-
cp ../target/x86_64-illumos/debug/xde.dbg proto/kernel/drv/amd64/xde.dbg
23+
cp ../target/x86_64-illumos/debug/xde proto/kernel/drv/amd64/xde.dbg
2424
INC_DEBUG=""
2525
else
2626
INC_DEBUG="#"

0 commit comments

Comments
 (0)