diff --git a/default-package-config.sh b/default-package-config.sh index 633013c6..2acff6e1 100644 --- a/default-package-config.sh +++ b/default-package-config.sh @@ -35,10 +35,17 @@ function merge_with_upstream() { # The functions below are specific for the Linux kernel packages # and contain the majority of their common code. # +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version to satisfy the kernel's +# dependency on the rust toolchain. Delphix's rust toolchain is +# supplied via virtual packages and hence must be installed explicitly +# otherwise apt installs the Ubuntu's version of the rust toolchain. +# function kernel_prepare() { logmust install_pkgs \ - equivs \ + "$DEPDIR"/delphix-rust/*.deb \ devscripts \ + equivs \ kernel-wedge } diff --git a/packages/linux-kernel-aws/config.delphix.sh b/packages/linux-kernel-aws/config.delphix.sh index 220d14b3..c369203a 100644 --- a/packages/linux-kernel-aws/config.delphix.sh +++ b/packages/linux-kernel-aws/config.delphix.sh @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin # Note: UPSTREAM_GIT_BRANCH is not used here UPSTREAM_GIT_BRANCH="none" +# +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. +# +PACKAGE_DEPENDENCIES="delphix-rust" + # # Force push required when syncing with upstream because we perform a rebase. # diff --git a/packages/linux-kernel-azure/config.delphix.sh b/packages/linux-kernel-azure/config.delphix.sh index 85a41381..f2e46969 100644 --- a/packages/linux-kernel-azure/config.delphix.sh +++ b/packages/linux-kernel-azure/config.delphix.sh @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin # Note: UPSTREAM_GIT_BRANCH is not used here UPSTREAM_GIT_BRANCH="none" +# +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. +# +PACKAGE_DEPENDENCIES="delphix-rust" + # # Force push required when syncing with upstream because we perform a rebase. # diff --git a/packages/linux-kernel-gcp/config.delphix.sh b/packages/linux-kernel-gcp/config.delphix.sh index 8503731b..5318c168 100644 --- a/packages/linux-kernel-gcp/config.delphix.sh +++ b/packages/linux-kernel-gcp/config.delphix.sh @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin # Note: UPSTREAM_GIT_BRANCH is not used here UPSTREAM_GIT_BRANCH="none" +# +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. +# +PACKAGE_DEPENDENCIES="delphix-rust" + # # Force push required when syncing with upstream because we perform a rebase. # diff --git a/packages/linux-kernel-generic/config.delphix.sh b/packages/linux-kernel-generic/config.delphix.sh index 4a8d4e10..4b61fcd1 100644 --- a/packages/linux-kernel-generic/config.delphix.sh +++ b/packages/linux-kernel-generic/config.delphix.sh @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/ # Note: UPSTREAM_GIT_BRANCH is not used here UPSTREAM_GIT_BRANCH="none" +# +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. +# +PACKAGE_DEPENDENCIES="delphix-rust" + # # Force push required when syncing with upstream because we perform a rebase. # diff --git a/packages/linux-kernel-oracle/config.delphix.sh b/packages/linux-kernel-oracle/config.delphix.sh index e41c05d4..8d6518b5 100644 --- a/packages/linux-kernel-oracle/config.delphix.sh +++ b/packages/linux-kernel-oracle/config.delphix.sh @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin # Note: UPSTREAM_GIT_BRANCH is not used here UPSTREAM_GIT_BRANCH="none" +# +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. +# +PACKAGE_DEPENDENCIES="delphix-rust" + # # Force push required when syncing with upstream because we perform a rebase. #