[pve-devel] [PATCH pve-kernel] fix #3781: add Provides: wireguard-modules to control.in

[pve-devel] [PATCH pve-kernel] fix #3781: add Provides: wireguard-modules to control.in

[Stoiko Ivanov]

without this line `apt install wireguard` pulls in Debian's kernel +
firmware which confilcts with pve-firmware - forcing users to install
via `apt install --no-install-recommends wireguard-tools` in order
to get the userspace utils.

For Debian's upstream kernel the linux-image-amd64 provides the
modules [0] - since pve-kernel-@KVNAME@ already provides linux-image
this should be the place where we add the provides

versioned dependency added since wireguard has a versioned dependency
on wireguard-modules.

[0] https://salsa.debian.org/kernel-team/linux/-/blob/master/debian/templates/control.image.meta.in

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
* quickly tested by building a kernel with this patch - installing it in a VM
  and running `apt install wireguard` afterwards
 debian/control.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index ee91978..fd8f4cb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -59,7 +59,7 @@ Package: pve-kernel-@KVNAME@
 Section: admin
 Priority: optional
 Architecture: any
-Provides: linux-image
+Provides: linux-image, wireguard-modules (= 1.0.0)
 Suggests: pve-firmware
 Depends: busybox, initramfs-tools
 Recommends: grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub-efi-arm64
@@ -68,7 +68,7 @@ Description: The Proxmox PVE Kernel Image
 
 Package: pve-kernel-@KVNAME@-dbgsym
 Architecture: any
-Provides: linux-debug
+Provides: linux-debug, wireguard-modules (= 1.0.0)
 Section: devel
 Priority: optional
 Build-Profiles: <pkg.pve-kernel.debug>
-- 
2.30.2

Re: [pve-devel] [PATCH pve-kernel] fix #3781: add Provides: wireguard-modules to control.in

[Thomas Lamprecht]

On 10.12.21 17:49, Stoiko Ivanov wrote:
> without this line `apt install wireguard` pulls in Debian's kernel +
> firmware which confilcts with pve-firmware - forcing users to install
> via `apt install --no-install-recommends wireguard-tools` in order
> to get the userspace utils.
> 
> For Debian's upstream kernel the linux-image-amd64 provides the
> modules [0] - since pve-kernel-@KVNAME@ already provides linux-image
> this should be the place where we add the provides
> 
> versioned dependency added since wireguard has a versioned dependency
> on wireguard-modules.
> 
> [0] https://salsa.debian.org/kernel-team/linux/-/blob/master/debian/templates/control.image.meta.in

did we actually had users run into this? I'm probably way to accustomed to
just installing `wireguard-tools` that I never even noticed that there's a
meta package - I mean wireguard got mainlined with 5.6, that was released on
2020-01-26, so rather ancient ;-P

anyhow, lgtm

Re: [pve-devel] [PATCH pve-kernel] fix #3781: add Provides: wireguard-modules to control.in

[Stoiko Ivanov]

On Fri, 10 Dec 2021 18:27:39 +0100
Thomas Lamprecht <t.lamprecht@proxmox.com> wrote:

> On 10.12.21 17:49, Stoiko Ivanov wrote:
> > without this line `apt install wireguard` pulls in Debian's kernel +
> > firmware which confilcts with pve-firmware - forcing users to install
> > via `apt install --no-install-recommends wireguard-tools` in order
> > to get the userspace utils.
> > 
> > For Debian's upstream kernel the linux-image-amd64 provides the
> > modules [0] - since pve-kernel-@KVNAME@ already provides linux-image
> > this should be the place where we add the provides
> > 
> > versioned dependency added since wireguard has a versioned dependency
> > on wireguard-modules.
> > 
> > [0] https://salsa.debian.org/kernel-team/linux/-/blob/master/debian/templates/control.image.meta.in  
> 
> did we actually had users run into this? I'm probably way to accustomed to
> just installing `wireguard-tools` that I never even noticed that there's a
> meta package - I mean wireguard got mainlined with 5.6, that was released on
> 2020-01-26, so rather ancient ;-P
> 
> anyhow, lgtm

well - at least the reporter in:
https://bugzilla.proxmox.com/show_bug.cgi?id=3781

also - when installing `wireguard-tools` on a (slightly older) VM of mine
it tries to pull in `apparmor linux-image-5.10.0-9-rt-amd64
linux-image-rt-amd64 wireguard-tools`
(since wireguard-tools Recommends wireguard-modules)

not a problem per se - but ever since the few reports of people
uninstalling pve-kernel (since linux-image-amd64 started depending on
linux-firmware, which uninstalled pve-firmware) - I'm a bit weary of
keeping Debian's stock kernel installed in parallel

(my first draft for this report was also - marking it as RESOVLED
WORKSFORME though ;)