Skip to content
This repository was archived by the owner on Mar 24, 2022. It is now read-only.

Commit f44bfed

Browse files
author
Pat Hickey
authored
Merge pull request #570 from bytecodealliance/pch/delete_deb_packaging
Delete `cargo deb` packaging metadata
2 parents d80e86c + e08a6c8 commit f44bfed

File tree

6 files changed

+7
-81
lines changed

6 files changed

+7
-81
lines changed

Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ install-dev: build-dev
2121
@helpers/install.sh --unoptimized
2222

2323
.PHONY: test
24-
test: indent-check test-packages
24+
test: indent-check test-crates
2525

26-
.PHONY: test-packages
27-
test-packages:
26+
.PHONY: test-crates
27+
test-crates:
2828
cargo test --no-fail-fast --all $(CRATES_NOT_TESTED:%=--exclude %)
2929

3030
.PHONY: test-full
@@ -43,12 +43,13 @@ test-release-executables:
4343
helpers/lucet-toolchain-tests/objdump.sh release
4444

4545
.PHONY: test-ci
46-
test-ci: test-packages test-objdump test-bitrot test-signature test-objdump
46+
test-ci: test-crates test-objdump test-bitrot test-signature test-objdump
4747

4848
.PHONY: test-bitrot
4949
test-bitrot:
50-
# build but do *not* run these packages to mitigate bitrot
51-
cargo build -p lucet-spectest -p lucet-runtime-example
50+
# build but do *not* run these crates. The tests for these crates are
51+
# known to fail, but we want to make sure they still build.
52+
cargo check -p lucet-spectest -p lucet-runtime-example
5253

5354
.PHONY: test-signature
5455
test-signature:

lucet-objdump/Cargo.toml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,3 @@ object = "0.18"
1414
byteorder="1.2.1"
1515
colored="1.8.0"
1616
lucet-module = { path = "../lucet-module", version = "=0.7.0-dev" }
17-
18-
[package.metadata.deb]
19-
name = "fst-lucet-objdump"
20-
maintainer = "Lucet team <lucet@fastly.com>"
21-
depends = "$auto"
22-
priority = "optional"
23-
assets = [
24-
["target/release/lucet-objdump", "/opt/fst-lucet-objdump/bin/lucet-objdump", "755"],
25-
["LICENSE", "/opt/fst-lucet-objdump/share/doc/lucet-objdump/", "644"],
26-
]

lucet-runtime/Cargo.toml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,6 @@ cc = "1.0"
3636
name = "lucet_runtime"
3737
crate-type = ["rlib", "staticlib", "cdylib"]
3838

39-
[package.metadata.deb]
40-
name = "fst-lucet-runtime"
41-
maintainer = "Adam C. Foltzer <acfoltzer@fastly.com>"
42-
depends = "$auto"
43-
priority = "optional"
44-
assets = [
45-
["target/release/liblucet_runtime.a", "/opt/fst-lucet-runtime/lib/", "644"],
46-
["target/release/liblucet_runtime.rlib", "/opt/fst-lucet-runtime/lib/", "644"],
47-
["target/release/liblucet_runtime.so", "/opt/fst-lucet-runtime/lib/", "755"],
48-
["include/*.h", "/opt/fst-lucet-runtime/include/", "644"],
49-
]
50-
5139
[features]
5240
default = ["uffd"]
5341
uffd = ["lucet-runtime-internals/uffd"]

lucet-validate/Cargo.toml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,3 @@ lucet-wasi = { path = "../lucet-wasi", version = "=0.7.0-dev" }
2828
lucet-wasi-sdk = { path = "../lucet-wasi-sdk", version = "=0.7.0-dev" }
2929
tempfile = "3.0"
3030
wabt = "0.9.2"
31-
32-
[package.metadata.deb]
33-
name = "fst-lucet-validate"
34-
maintainer = "Lucet team <lucet@fastly.com>"
35-
depends = "$auto"
36-
priority = "optional"
37-
assets = [
38-
["target/release/lucet-validate", "/opt/fst-lucet-validate/bin/lucet-validate", "755"],
39-
["target/release/liblucet_validate.rlib", "/opt/fst-lucet-validate/lib/", "644"],
40-
["LICENSE", "/opt/fst-lucet-validate/share/doc/lucet-validate/", "644"],
41-
["../wasi/phases/old/snapshot_0/witx/typenames.witx",
42-
"/opt/fst-lucet-validate/share/wasi/snapshot_0/typenames.witx", "644"],
43-
["../wasi/phases/old/snapshot_0/witx/wasi_unstable.witx",
44-
"/opt/fst-lucet-validate/share/wasi/snapshot_0/wasi_unstable.witx", "644"],
45-
["../wasi/phases/snapshot/witx/typenames.witx",
46-
"/opt/fst-lucet-validate/share/wasi/snapshot_1/typenames.witx", "644"],
47-
["../wasi/phases/snapshot/witx/wasi_snapshot_preview1.witx",
48-
"/opt/fst-lucet-validate/share/wasi/snapshot_1/wasi_snapshot_preview1.witx", "644"],
49-
]

lucet-wasi/Cargo.toml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,3 @@ tempfile = "3.0"
3333
[lib]
3434
name = "lucet_wasi"
3535
crate-type = ["rlib", "staticlib", "cdylib"]
36-
37-
[package.metadata.deb]
38-
name = "fst-lucet-wasi"
39-
maintainer = "Adam C. Foltzer <acfoltzer@fastly.com>"
40-
depends = "$auto"
41-
priority = "optional"
42-
assets = [
43-
["target/release/liblucet_wasi.a", "/opt/fst-lucet-wasi/lib/", "644"],
44-
["target/release/liblucet_wasi.rlib", "/opt/fst-lucet-wasi/lib/", "644"],
45-
["target/release/liblucet_wasi.so", "/opt/fst-lucet-wasi/lib/", "755"],
46-
["include/*.h", "/opt/fst-lucet-wasi/include/", "644"],
47-
["LICENSE", "/opt/fst-lucet-wasi/share/doc/lucet-wasi/", "644"],
48-
["LICENSE.wasmtime", "/opt/fst-lucet-wasi/share/doc/lucet-wasi/", "644"],
49-
["LICENSE.cloudabi-utils", "/opt/fst-lucet-wasi/share/doc/lucet-wasi/", "644"],
50-
]

lucetc/Cargo.toml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,3 @@ serde = "1.0"
4343
serde_json = "1.0"
4444
thiserror = "1.0.4"
4545
raw-cpuid = "6.0.0"
46-
47-
[package.metadata.deb]
48-
name = "fst-lucetc"
49-
maintainer = "Lucet team <lucet@fastly.com>"
50-
depends = "$auto"
51-
priority = "optional"
52-
assets = [
53-
["target/release/lucetc", "/opt/fst-lucetc/bin/lucetc", "755"],
54-
["target/release/liblucetc.rlib", "/opt/fst-lucetc/lib/", "644"],
55-
["LICENSE", "/opt/fst-lucetc/share/doc/lucetc/", "644"],
56-
["../wasi/phases/old/snapshot_0/witx/typenames.witx",
57-
"/opt/fst-lucetc/share/wasi/snapshot_0/typenames.witx", "644"],
58-
["../wasi/phases/old/snapshot_0/witx/wasi_unstable.witx",
59-
"/opt/fst-lucetc/share/wasi/snapshot_0/wasi_unstable.witx", "644"],
60-
["../wasi/phases/snapshot/witx/typenames.witx",
61-
"/opt/fst-lucetc/share/wasi/snapshot_1/typenames.witx", "644"],
62-
["../wasi/phases/snapshot/witx/wasi_snapshot_preview1.witx",
63-
"/opt/fst-lucetc/share/wasi/snapshot_1/wasi_snapshot_preview1.witx", "644"],
64-
]

0 commit comments

Comments
 (0)