Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
palash-gandhi merged 3 commits into from
Feb 18, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f997dd
DLPX-93401 LTS 24.04: Kernel builds require delphix-rust-src to be in…
palash-gandhi Feb 14, 2025
ac99b37
Update comment per Mark's comment
palash-gandhi Feb 18, 2025
a20e5f9
Update comment per Mark's comment part deux
palash-gandhi Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion default-package-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
6 changes: 6 additions & 0 deletions packages/linux-kernel-aws/config.delphix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
6 changes: 6 additions & 0 deletions packages/linux-kernel-azure/config.delphix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
6 changes: 6 additions & 0 deletions packages/linux-kernel-gcp/config.delphix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
6 changes: 6 additions & 0 deletions packages/linux-kernel-generic/config.delphix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
6 changes: 6 additions & 0 deletions packages/linux-kernel-oracle/config.delphix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down