[PATCH pve-kernel 0/3] enable CONFIG_RUST and fix sbuild target with extra-package revision

[PATCH pve-kernel 0/3] enable CONFIG_RUST and fix sbuild target with extra-package revision

[Stoiko Ivanov]

This patchset is the result of testing the effect of enabling CONFIG_RUST
in our current kernel configuration.

* enabling this entails changes to the needed firmware and the kernel ABI
  (I still skipped the updated fwlist and abi-prev files, as the diffs are
  huge and best generated when actually building a kernel with this
  enabled
* built was done locally and once with `make sbuild` (PATCH 1/3 fixed
  `make sbuild` with PKG_REV_EXTRA=~testrust1 for me).
* tested the resulting kernel on 2 VMs with ZFS as /, and on a physical
  test-server in our lab (with PVE 8.4 installed at that time).
  both tests looked ok.

Stoiko Ivanov (3):
  d/control: add dependencies for CONFIG_RUST
  d/rules: explicitly enable CONFIG_RUST
  make: fix DSC variable name

 Makefile          | 2 +-
 debian/control.in | 5 +++++
 debian/rules      | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

-- 
2.47.3

[PATCH pve-kernel 1/3] d/control: add dependencies for CONFIG_RUST

[Stoiko Ivanov]

follows https://docs.kernel.org/rust/quick-start.html

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/control.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/control.in b/debian/control.in
index 9246de0a813e..77a5e66dbc98 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,6 +5,7 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: asciidoc-base,
                automake,
                bc,
+               bindgen,
                bison,
                cpio,
                debhelper-compat (= 13),
@@ -28,6 +29,10 @@ Build-Depends: asciidoc-base,
                python3-dev,
                python3-minimal,
                rsync,
+               rustc,
+               rust-src,
+               rustfmt,
+               rust-clippy,
                sphinx-common,
                xmlto,
                zlib1g-dev,
-- 
2.47.3

[PATCH pve-kernel 2/3] d/rules: explicitly enable CONFIG_RUST

[Stoiko Ivanov]

currently enabling depends on the presence of the build-dependencies
for rust in the linux kernel [0]. Make the choice explicit as to not
be surprised in case the defaults change upstream.
AFAICT - this is determined by:
`debian.master/config/annotations` in our ubuntu-kernel submodule.

[0] https://docs.kernel.org/rust/quick-start.html

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 9c265fd98567..0da03814c8a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,6 +106,7 @@ PMX_CONFIG_OPTS= \
 -d CONFIG_N_GSM \
 -d UBSAN_BOUNDS \
 -d KVM_INTEL_PROVE_VE \
+-e CONFIG_RUST \
 
 
 debian/control: $(wildcard debian/*.in)
-- 
2.47.3

[PATCH pve-kernel 3/3] make: fix DSC variable name

[Stoiko Ivanov]

noticed that `make sbuild` failed for a version with PKG_REV_EXTRA set
(while testing enabling CONFIG_RUST).

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d8f9479998ed..7d108327d9be 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ MODULE_DIRS=$(ZFSDIR)
 # exported to debian/rules via debian/rules.d/dirs.mk
 DIRS=KERNEL_SRC ZFSDIR MODULES
 
-DSC=proxmox-kernel-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)$(KREL_EXTRA).dsc
+DSC=proxmox-kernel-$(KERNEL_MAJMIN)_$(DEB_VERSION).dsc
 DST_DEB=$(PACKAGE)_$(DEB_VERSION)_$(ARCH).deb
 SIGNED_TEMPLATE_DEB=$(PACKAGE)-signed-template_$(DEB_VERSION)_$(ARCH).deb
 META_DEB=proxmox-kernel-$(KERNEL_MAJMIN)_$(DEB_VERSION)_all.deb
-- 
2.47.3