File tree 6 files changed +38
-1
lines changed
6 files changed +38
-1
lines changed Original file line number Diff line number Diff line change @@ -35,10 +35,17 @@ function merge_with_upstream() {
35
35
# The functions below are specific for the Linux kernel packages
36
36
# and contain the majority of their common code.
37
37
#
38
+ # Ensure that Delphix's version of the rust toolchain is
39
+ # installed rather than Ubuntu's version to satisfy the kernel's
40
+ # dependency on the rust toolchain. Delphix's rust toolchain is
41
+ # supplied via virtual packages and hence must be installed explicitly
42
+ # otherwise apt installs the Ubuntu's version of the rust toolchain.
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
Original file line number Diff line number Diff line change @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
22
22
# Note: UPSTREAM_GIT_BRANCH is not used here
23
23
UPSTREAM_GIT_BRANCH=" none"
24
24
25
+ #
26
+ # Ensure that Delphix's version of the rust toolchain is
27
+ # installed rather than Ubuntu's version.
28
+ #
29
+ PACKAGE_DEPENDENCIES=" delphix-rust"
30
+
25
31
#
26
32
# Force push required when syncing with upstream because we perform a rebase.
27
33
#
Original file line number Diff line number Diff line change @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
22
22
# Note: UPSTREAM_GIT_BRANCH is not used here
23
23
UPSTREAM_GIT_BRANCH=" none"
24
24
25
+ #
26
+ # Ensure that Delphix's version of the rust toolchain is
27
+ # installed rather than Ubuntu's version.
28
+ #
29
+ PACKAGE_DEPENDENCIES=" delphix-rust"
30
+
25
31
#
26
32
# Force push required when syncing with upstream because we perform a rebase.
27
33
#
Original file line number Diff line number Diff line change @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
22
22
# Note: UPSTREAM_GIT_BRANCH is not used here
23
23
UPSTREAM_GIT_BRANCH=" none"
24
24
25
+ #
26
+ # Ensure that Delphix's version of the rust toolchain is
27
+ # installed rather than Ubuntu's version.
28
+ #
29
+ PACKAGE_DEPENDENCIES=" delphix-rust"
30
+
25
31
#
26
32
# Force push required when syncing with upstream because we perform a rebase.
27
33
#
Original file line number Diff line number Diff line change @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/
22
22
# Note: UPSTREAM_GIT_BRANCH is not used here
23
23
UPSTREAM_GIT_BRANCH=" none"
24
24
25
+ #
26
+ # Ensure that Delphix's version of the rust toolchain is
27
+ # installed rather than Ubuntu's version.
28
+ #
29
+ PACKAGE_DEPENDENCIES=" delphix-rust"
30
+
25
31
#
26
32
# Force push required when syncing with upstream because we perform a rebase.
27
33
#
Original file line number Diff line number Diff line change @@ -22,6 +22,12 @@ UPSTREAM_GIT_URL="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/lin
22
22
# Note: UPSTREAM_GIT_BRANCH is not used here
23
23
UPSTREAM_GIT_BRANCH=" none"
24
24
25
+ #
26
+ # Ensure that Delphix's version of the rust toolchain is
27
+ # installed rather than Ubuntu's version.
28
+ #
29
+ PACKAGE_DEPENDENCIES=" delphix-rust"
30
+
25
31
#
26
32
# Force push required when syncing with upstream because we perform a rebase.
27
33
#
You can’t perform that action at this time.
0 commit comments