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

Author: palash-gandhi

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
 }
 

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.
 #

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.
 #

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.
 #

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.
 #

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.
 #