Skip to content

Commit a35392a

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

File tree

6 files changed

+59
-1
lines changed

6 files changed

+59
-1
lines changed

default-package-config.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,19 @@ function merge_with_upstream() {
3434
#
3535
# The functions below are specific for the Linux kernel packages
3636
# and contain the majority of their common code.
37+
# This also installs the `delphix-rust` and `delphix-rust-src`
38+
# packages to satisfy the kernel's dependency on the rust toolchain
39+
# by ensuring that Delphix's version of the rust toolchain is
40+
# installed. Delphix's rust toolchain is supplied via virtual
41+
# packages and hence must be installed explicitly otherwise apt
42+
# installs the Ubuntu's version of the rust toolchain.
3743
#
3844
function kernel_prepare() {
3945
logmust install_pkgs \
40-
equivs \
46+
"$DEPDIR"/delphix-rust/*.deb \
47+
"$DEPDIR"/delphix-rust-src/*.deb \
4148
devscripts \
49+
equivs \
4250
kernel-wedge
4351
}
4452

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ 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+
# This also installs the `delphix-rust` and `delphix-rust-src`
27+
# packages to satisfy the kernel's dependency on the rust toolchain
28+
# by ensuring that Delphix's version of the rust toolchain is
29+
# installed. Delphix's rust toolchain is supplied via virtual
30+
# packages and hence must be installed explicitly otherwise apt
31+
# installs the Ubuntu's version of the rust toolchain.
32+
#
33+
PACKAGE_DEPENDENCIES="delphix-rust delphix-rust-src"
34+
2535
#
2636
# Force push required when syncing with upstream because we perform a rebase.
2737
#

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ 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+
# This also installs the `delphix-rust` and `delphix-rust-src`
27+
# packages to satisfy the kernel's dependency on the rust toolchain
28+
# by ensuring that Delphix's version of the rust toolchain is
29+
# installed. Delphix's rust toolchain is supplied via virtual
30+
# packages and hence must be installed explicitly otherwise apt
31+
# installs the Ubuntu's version of the rust toolchain.
32+
#
33+
PACKAGE_DEPENDENCIES="delphix-rust delphix-rust-src"
34+
2535
#
2636
# Force push required when syncing with upstream because we perform a rebase.
2737
#

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ 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+
# This also installs the `delphix-rust` and `delphix-rust-src`
27+
# packages to satisfy the kernel's dependency on the rust toolchain
28+
# by ensuring that Delphix's version of the rust toolchain is
29+
# installed. Delphix's rust toolchain is supplied via virtual
30+
# packages and hence must be installed explicitly otherwise apt
31+
# installs the Ubuntu's version of the rust toolchain.
32+
#
33+
PACKAGE_DEPENDENCIES="delphix-rust delphix-rust-src"
34+
2535
#
2636
# Force push required when syncing with upstream because we perform a rebase.
2737
#

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ 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+
# This also installs the `delphix-rust` and `delphix-rust-src`
27+
# packages to satisfy the kernel's dependency on the rust toolchain
28+
# by ensuring that Delphix's version of the rust toolchain is
29+
# installed. Delphix's rust toolchain is supplied via virtual
30+
# packages and hence must be installed explicitly otherwise apt
31+
# installs the Ubuntu's version of the rust toolchain.
32+
#
33+
PACKAGE_DEPENDENCIES="delphix-rust delphix-rust-src"
34+
2535
#
2636
# Force push required when syncing with upstream because we perform a rebase.
2737
#

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ 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+
# This also installs the `delphix-rust` and `delphix-rust-src`
27+
# packages to satisfy the kernel's dependency on the rust toolchain
28+
# by ensuring that Delphix's version of the rust toolchain is
29+
# installed. Delphix's rust toolchain is supplied via virtual
30+
# packages and hence must be installed explicitly otherwise apt
31+
# installs the Ubuntu's version of the rust toolchain.
32+
#
33+
PACKAGE_DEPENDENCIES="delphix-rust delphix-rust-src"
34+
2535
#
2636
# Force push required when syncing with upstream because we perform a rebase.
2737
#

0 commit comments

Comments
 (0)