d/rules: adapt to workspace additions

Gbp-Dch: ignore

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2024-10-21 11:24:55 +02:00
parent c68811964a
commit 4e71afe8e7
2 changed files with 5 additions and 1 deletions

View File

@ -14,6 +14,7 @@ for i in "$scriptdir/debian/patches"/prune/d-00*.patch; do
"$scriptdir/debian/ensure-patch" -N "$i"
done
# keep in sync with d/rules
workspaces=". src/bootstrap library src/tools/rust-analyzer src/tools/cargo src/tools/rustbook"
for ws in $workspaces; do
test -f "$ws/Cargo.lock.org" || cp "$ws/Cargo.lock" "$ws/Cargo.lock.orig"

5
debian/rules vendored
View File

@ -275,7 +275,10 @@ debian/dh_auto_configure.stamp: debian/config.toml check-no-old-llvm extra-vendo
if test $$(grep "127.0.0.1\s*localhost" /etc/hosts | wc -l) -gt 1; then \
debian/ensure-patch -N debian/patches-unused/d-test-host-duplicates.patch; fi
# don't care about lock changes
rm -f Cargo.lock src/bootstrap/Cargo.lock src/tools/rust-analyzer/Cargo.lock src/tools/cargo/Cargo.lock
# keep in sync with d/prune-unused-deps
for ws in . src/bootstrap library src/tools/rust-analyzer src/tools/cargo src/tools/rustbook; do \
rm -f "$$ws/Cargo.lock"; \
done
# We patched some crates so have to rm the checksums
find vendor -name .cargo-checksum.json -execdir "$(CURDIR)/debian/prune-checksums" "{}" +
# Link against system liblzma, see https://github.com/alexcrichton/xz2-rs/issues/16