Skip to content

Commit 30c4d50

Browse files
committed
DLPX-93264 24.04 LTS upgrade: kernel builds fail due to rustc conflict (#21)
PR URL: https://www.github.com/delphix/delphix-rust/pull/21
1 parent 1a22454 commit 30c4d50

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
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/rules

Lines changed: 5 additions & 4 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

23-
override_dh_prep:
24-
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"
24+
override_dh_install:
25+
./scripts/fetch-and-run-installer.sh ${RUSTC_VERSION} "/usr" "debian/tmp" $(DEB_HOST_GNU_CPU)
26+
27+
dh_install --autodest "debian/tmp/*"
2728

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

0 commit comments

Comments
 (0)