Skip to content

Commit 4cbc73e

Browse files
palash-gandhiprakashsurya
authored andcommitted
DLPX-94087 LTS 24.04: update delphix-rust for Ubuntu 24.04 appliance
1 parent 1a22454 commit 4cbc73e

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

RUSTC_VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.84.1

debian/control

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,18 @@ Standards-Version: 4.1.2
2222

2323
Package: delphix-rust
2424
Architecture: any
25-
Provides: cargo, rust-gdb, rustc
26-
Conflicts: cargo, rust-gdb, rustc
25+
Provides: cargo (= ${binary:Version}),
26+
rust-gdb (= ${binary:Version}),
27+
rustc (= ${binary:Version}),
28+
rustfmt (= ${binary:Version}),
29+
cargo-fmt (= ${binary:Version})
30+
Conflicts: cargo, rust-gdb, rustc, rustfmt, cargo-fmt
2731
Description: Rust - A programming language empowering everyone to build
2832
reliable and efficient software.
2933

3034
Package: delphix-rust-src
3135
Architecture: any
32-
Provides: rust-src
36+
Provides: rust-src (= ${binary:Version})
3337
Conflicts: rust-src
3438
Description: Rust - A programming language empowering everyone to build
3539
reliable and efficient software.

debian/rules

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
#
1717

1818
DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
19+
RUSTC_VERSION := $(shell tr -d '\n' < RUSTC_VERSION)
1920

2021
%:
2122
dh $@
2223

2324
override_dh_prep:
2425
dh_prep
25-
./scripts/fetch-and-run-installer.sh "1.84.1" "/usr" "debian/tmp" $(DEB_HOST_GNU_CPU)
26-
./scripts/fetch-and-unpack-src.sh "1.84.1" "/usr/src" "debian/tmp"
26+
./scripts/fetch-and-run-installer.sh "${RUSTC_VERSION}" "/usr" "debian/tmp" $(DEB_HOST_GNU_CPU)
27+
./scripts/fetch-and-unpack-src.sh "${RUSTC_VERSION}" "/usr/src" "debian/tmp"
2728

2829
override_dh_strip:
2930
# Skip this step; use artifacts from Rust tarballs as-is.

0 commit comments

Comments
 (0)