DLPX-93401 LTS 24.04: Kernel builds require delphix-rust-src to be installed

palash-gandhi · palash-gandhi · commit 7f997dd10797 · 2025-02-14T13:26:36.000-08:00
PR URL: https://www.github.com/delphix/linux-pkg/pull/335
diff --git a/default-package-config.sh b/default-package-config.sh
@@ -34,11 +34,18 @@ function merge_with_upstream() {
 #
 # The functions below are specific for the Linux kernel packages
 # and contain the majority of their common code.
+# This also installs the `delphix-rust` and `delphix-rust-src`
+# packages to satisfy the kernel's dependency on the rust toolchain
+# by ensuring that Delphix's version of the rust toolchain is
+# installed. 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
@@ -22,6 +22,16 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
 # Note: UPSTREAM_GIT_BRANCH is not used here
 UPSTREAM_GIT_BRANCH="none"
 
+#
+# This also installs the `delphix-rust` and `delphix-rust-src`
+# packages to satisfy the kernel's dependency on the rust toolchain
+# by ensuring that Delphix's version of the rust toolchain is
+# installed. 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.
+#
+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
@@ -22,6 +22,16 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
 # Note: UPSTREAM_GIT_BRANCH is not used here
 UPSTREAM_GIT_BRANCH="none"
 
+#
+# This also installs the `delphix-rust` and `delphix-rust-src`
+# packages to satisfy the kernel's dependency on the rust toolchain
+# by ensuring that Delphix's version of the rust toolchain is
+# installed. 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.
+#
+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
@@ -22,6 +22,16 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
 # Note: UPSTREAM_GIT_BRANCH is not used here
 UPSTREAM_GIT_BRANCH="none"
 
+#
+# This also installs the `delphix-rust` and `delphix-rust-src`
+# packages to satisfy the kernel's dependency on the rust toolchain
+# by ensuring that Delphix's version of the rust toolchain is
+# installed. 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.
+#
+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
@@ -22,6 +22,16 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/
 # Note: UPSTREAM_GIT_BRANCH is not used here
 UPSTREAM_GIT_BRANCH="none"
 
+#
+# This also installs the `delphix-rust` and `delphix-rust-src`
+# packages to satisfy the kernel's dependency on the rust toolchain
+# by ensuring that Delphix's version of the rust toolchain is
+# installed. 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.
+#
+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
@@ -22,6 +22,16 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
 # Note: UPSTREAM_GIT_BRANCH is not used here
 UPSTREAM_GIT_BRANCH="none"
 
+#
+# This also installs the `delphix-rust` and `delphix-rust-src`
+# packages to satisfy the kernel's dependency on the rust toolchain
+# by ensuring that Delphix's version of the rust toolchain is
+# installed. 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.
+#
+PACKAGE_DEPENDENCIES="delphix-rust"
+
 #
 # Force push required when syncing with upstream because we perform a rebase.
 #

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,18 @@ function merge_with_upstream() {`
`34`	`34`	`#`
`35`	`35`	`# The functions below are specific for the Linux kernel packages`
`36`	`36`	`# 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.`
`37`	`43`	`#`
`38`	`44`	`function kernel_prepare() {`
`39`	`45`	`logmust install_pkgs \`
`40`		`- equivs \`
	`46`	`+ "$DEPDIR"/delphix-rust/*.deb \`
`41`	`47`	`devscripts \`
	`48`	`+ equivs \`
`42`	`49`	`kernel-wedge`
`43`	`50`	`}`
`44`	`51`