File tree 6 files changed +59
-1
lines changed
6 files changed +59
-1
lines changed Original file line number Diff line number Diff line change @@ -34,11 +34,19 @@ 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 \
47
+ " $DEPDIR " /delphix-rust-src/* .deb \
41
48
devscripts \
49
+ equivs \
42
50
kernel-wedge
43
51
}
44
52
Original file line number Diff line number Diff line change @@ -22,6 +22,16 @@ 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
+ # This also installs the `delphix-rust` and `delphix-rust-src`
27
+ # packages to satisfy the kernel's dependency on the rust toolchain
28
+ # by ensuring that Delphix's version of the rust toolchain is
29
+ # installed. Delphix's rust toolchain is supplied via virtual
30
+ # packages and hence must be installed explicitly otherwise apt
31
+ # installs the Ubuntu's version of the rust toolchain.
32
+ #
33
+ PACKAGE_DEPENDENCIES=" delphix-rust delphix-rust-src"
34
+
25
35
#
26
36
# Force push required when syncing with upstream because we perform a rebase.
27
37
#
Original file line number Diff line number Diff line change @@ -22,6 +22,16 @@ 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
+ # This also installs the `delphix-rust` and `delphix-rust-src`
27
+ # packages to satisfy the kernel's dependency on the rust toolchain
28
+ # by ensuring that Delphix's version of the rust toolchain is
29
+ # installed. Delphix's rust toolchain is supplied via virtual
30
+ # packages and hence must be installed explicitly otherwise apt
31
+ # installs the Ubuntu's version of the rust toolchain.
32
+ #
33
+ PACKAGE_DEPENDENCIES=" delphix-rust delphix-rust-src"
34
+
25
35
#
26
36
# Force push required when syncing with upstream because we perform a rebase.
27
37
#
Original file line number Diff line number Diff line change @@ -22,6 +22,16 @@ 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
+ # This also installs the `delphix-rust` and `delphix-rust-src`
27
+ # packages to satisfy the kernel's dependency on the rust toolchain
28
+ # by ensuring that Delphix's version of the rust toolchain is
29
+ # installed. Delphix's rust toolchain is supplied via virtual
30
+ # packages and hence must be installed explicitly otherwise apt
31
+ # installs the Ubuntu's version of the rust toolchain.
32
+ #
33
+ PACKAGE_DEPENDENCIES=" delphix-rust delphix-rust-src"
34
+
25
35
#
26
36
# Force push required when syncing with upstream because we perform a rebase.
27
37
#
Original file line number Diff line number Diff line change @@ -22,6 +22,16 @@ 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
+ # This also installs the `delphix-rust` and `delphix-rust-src`
27
+ # packages to satisfy the kernel's dependency on the rust toolchain
28
+ # by ensuring that Delphix's version of the rust toolchain is
29
+ # installed. Delphix's rust toolchain is supplied via virtual
30
+ # packages and hence must be installed explicitly otherwise apt
31
+ # installs the Ubuntu's version of the rust toolchain.
32
+ #
33
+ PACKAGE_DEPENDENCIES=" delphix-rust delphix-rust-src"
34
+
25
35
#
26
36
# Force push required when syncing with upstream because we perform a rebase.
27
37
#
Original file line number Diff line number Diff line change @@ -22,6 +22,16 @@ 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
+ # This also installs the `delphix-rust` and `delphix-rust-src`
27
+ # packages to satisfy the kernel's dependency on the rust toolchain
28
+ # by ensuring that Delphix's version of the rust toolchain is
29
+ # installed. Delphix's rust toolchain is supplied via virtual
30
+ # packages and hence must be installed explicitly otherwise apt
31
+ # installs the Ubuntu's version of the rust toolchain.
32
+ #
33
+ PACKAGE_DEPENDENCIES=" delphix-rust delphix-rust-src"
34
+
25
35
#
26
36
# Force push required when syncing with upstream because we perform a rebase.
27
37
#
You can’t perform that action at this time.
0 commit comments