From 7f997dd107977def1bb6cba976ad5c84fdf053bc Mon Sep 17 00:00:00 2001 From: Palash Gandhi Date: Fri, 14 Feb 2025 11:49:48 -0800 Subject: [PATCH 1/3] 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 --- default-package-config.sh | 9 ++++++++- packages/linux-kernel-aws/config.delphix.sh | 10 ++++++++++ packages/linux-kernel-azure/config.delphix.sh | 10 ++++++++++ packages/linux-kernel-gcp/config.delphix.sh | 10 ++++++++++ packages/linux-kernel-generic/config.delphix.sh | 10 ++++++++++ packages/linux-kernel-oracle/config.delphix.sh | 10 ++++++++++ 6 files changed, 58 insertions(+), 1 deletion(-) diff --git a/default-package-config.sh b/default-package-config.sh index 633013c6..6b075d51 100644 --- 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 index 220d14b3..c936d794 100644 --- 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 index 85a41381..2e057a04 100644 --- 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 index 8503731b..24b9ee3b 100644 --- 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 index 4a8d4e10..acdffcba 100644 --- 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 index e41c05d4..5bf24016 100644 --- 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. # From ac99b37065f59bf6620d6239610782710a1f1cca Mon Sep 17 00:00:00 2001 From: Palash Gandhi Date: Tue, 18 Feb 2025 08:19:18 -0800 Subject: [PATCH 2/3] Update comment per Mark's comment --- default-package-config.sh | 8 ++------ packages/linux-kernel-aws/config.delphix.sh | 8 ++------ packages/linux-kernel-azure/config.delphix.sh | 8 ++------ packages/linux-kernel-gcp/config.delphix.sh | 8 ++------ packages/linux-kernel-generic/config.delphix.sh | 8 ++------ packages/linux-kernel-oracle/config.delphix.sh | 8 ++------ 6 files changed, 12 insertions(+), 36 deletions(-) diff --git a/default-package-config.sh b/default-package-config.sh index 6b075d51..0517ff4c 100644 --- a/default-package-config.sh +++ b/default-package-config.sh @@ -34,12 +34,8 @@ 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. +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. # function kernel_prepare() { logmust install_pkgs \ diff --git a/packages/linux-kernel-aws/config.delphix.sh b/packages/linux-kernel-aws/config.delphix.sh index c936d794..c369203a 100644 --- a/packages/linux-kernel-aws/config.delphix.sh +++ b/packages/linux-kernel-aws/config.delphix.sh @@ -23,12 +23,8 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin 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. +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. # PACKAGE_DEPENDENCIES="delphix-rust" diff --git a/packages/linux-kernel-azure/config.delphix.sh b/packages/linux-kernel-azure/config.delphix.sh index 2e057a04..f2e46969 100644 --- a/packages/linux-kernel-azure/config.delphix.sh +++ b/packages/linux-kernel-azure/config.delphix.sh @@ -23,12 +23,8 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin 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. +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. # PACKAGE_DEPENDENCIES="delphix-rust" diff --git a/packages/linux-kernel-gcp/config.delphix.sh b/packages/linux-kernel-gcp/config.delphix.sh index 24b9ee3b..5318c168 100644 --- a/packages/linux-kernel-gcp/config.delphix.sh +++ b/packages/linux-kernel-gcp/config.delphix.sh @@ -23,12 +23,8 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin 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. +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. # PACKAGE_DEPENDENCIES="delphix-rust" diff --git a/packages/linux-kernel-generic/config.delphix.sh b/packages/linux-kernel-generic/config.delphix.sh index acdffcba..4b61fcd1 100644 --- a/packages/linux-kernel-generic/config.delphix.sh +++ b/packages/linux-kernel-generic/config.delphix.sh @@ -23,12 +23,8 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/ 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. +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. # PACKAGE_DEPENDENCIES="delphix-rust" diff --git a/packages/linux-kernel-oracle/config.delphix.sh b/packages/linux-kernel-oracle/config.delphix.sh index 5bf24016..8d6518b5 100644 --- a/packages/linux-kernel-oracle/config.delphix.sh +++ b/packages/linux-kernel-oracle/config.delphix.sh @@ -23,12 +23,8 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin 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. +# Ensure that Delphix's version of the rust toolchain is +# installed rather than Ubuntu's version. # PACKAGE_DEPENDENCIES="delphix-rust" From a20e5f901074709b2908c8857512639a10bf7804 Mon Sep 17 00:00:00 2001 From: Palash Gandhi Date: Tue, 18 Feb 2025 08:58:21 -0800 Subject: [PATCH 3/3] Update comment per Mark's comment part deux --- default-package-config.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/default-package-config.sh b/default-package-config.sh index 0517ff4c..2acff6e1 100644 --- a/default-package-config.sh +++ b/default-package-config.sh @@ -34,8 +34,12 @@ 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. +# 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 \