Skip to content

Commit aada0f3

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

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

RUSTC_VERSION

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

debian/rules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
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_install:
24-
./scripts/fetch-and-run-installer.sh "1.80.0" "/usr" "debian/tmp" $(DEB_HOST_GNU_CPU)
25+
./scripts/fetch-and-run-installer.sh ${RUSTC_VERSION} "/usr" "debian/tmp" $(DEB_HOST_GNU_CPU)
2526

2627
dh_install --autodest "debian/tmp/*"
2728

0 commit comments

Comments
 (0)