Skip to content

Commit f9da3b5

Browse files
DLPX-93401 LTS 24.04: Kernel builds require delphix-rust-src to be installed (#335)
PR URL: https://www.github.com/delphix/linux-pkg/pull/335
1 parent 11c86fc commit f9da3b5

File tree

6 files changed

+38
-1
lines changed

6 files changed

+38
-1
lines changed

default-package-config.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,17 @@ function merge_with_upstream() {
3535
# The functions below are specific for the Linux kernel packages
3636
# and contain the majority of their common code.
3737
#
38+
# Ensure that Delphix's version of the rust toolchain is
39+
# installed rather than Ubuntu's version to satisfy the kernel's
40+
# dependency on the rust toolchain. Delphix's rust toolchain is
41+
# supplied via virtual packages and hence must be installed explicitly
42+
# otherwise apt installs the Ubuntu's version of the rust toolchain.
43+
#
3844
function kernel_prepare() {
3945
logmust install_pkgs \
40-
equivs \
46+
"$DEPDIR"/delphix-rust/*.deb \
4147
devscripts \
48+
equivs \
4249
kernel-wedge
4350
}
4451

packages/linux-kernel-aws/config.delphix.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
2222
# Note: UPSTREAM_GIT_BRANCH is not used here
2323
UPSTREAM_GIT_BRANCH="none"
2424

25+
#
26+
# Ensure that Delphix's version of the rust toolchain is
27+
# installed rather than Ubuntu's version.
28+
#
29+
PACKAGE_DEPENDENCIES="delphix-rust"
30+
2531
#
2632
# Force push required when syncing with upstream because we perform a rebase.
2733
#

packages/linux-kernel-azure/config.delphix.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
2222
# Note: UPSTREAM_GIT_BRANCH is not used here
2323
UPSTREAM_GIT_BRANCH="none"
2424

25+
#
26+
# Ensure that Delphix's version of the rust toolchain is
27+
# installed rather than Ubuntu's version.
28+
#
29+
PACKAGE_DEPENDENCIES="delphix-rust"
30+
2531
#
2632
# Force push required when syncing with upstream because we perform a rebase.
2733
#

packages/linux-kernel-gcp/config.delphix.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
2222
# Note: UPSTREAM_GIT_BRANCH is not used here
2323
UPSTREAM_GIT_BRANCH="none"
2424

25+
#
26+
# Ensure that Delphix's version of the rust toolchain is
27+
# installed rather than Ubuntu's version.
28+
#
29+
PACKAGE_DEPENDENCIES="delphix-rust"
30+
2531
#
2632
# Force push required when syncing with upstream because we perform a rebase.
2733
#

packages/linux-kernel-generic/config.delphix.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/
2222
# Note: UPSTREAM_GIT_BRANCH is not used here
2323
UPSTREAM_GIT_BRANCH="none"
2424

25+
#
26+
# Ensure that Delphix's version of the rust toolchain is
27+
# installed rather than Ubuntu's version.
28+
#
29+
PACKAGE_DEPENDENCIES="delphix-rust"
30+
2531
#
2632
# Force push required when syncing with upstream because we perform a rebase.
2733
#

packages/linux-kernel-oracle/config.delphix.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
2222
# Note: UPSTREAM_GIT_BRANCH is not used here
2323
UPSTREAM_GIT_BRANCH="none"
2424

25+
#
26+
# Ensure that Delphix's version of the rust toolchain is
27+
# installed rather than Ubuntu's version.
28+
#
29+
PACKAGE_DEPENDENCIES="delphix-rust"
30+
2531
#
2632
# Force push required when syncing with upstream because we perform a rebase.
2733
#

0 commit comments

Comments
 (0)