[pve-devel] [PATCH pve-kernel-meta/pve-kernel] add Provides for plain debian packages

[pve-devel] [PATCH pve-kernel-meta/pve-kernel] add Provides for plain debian packages

[Stoiko Ivanov]

This series results from an off-list discussion following
https://lists.proxmox.com/pipermail/pve-devel/2021-December/051178.html

Mostly the point was that adding a
`Provides: linux-headers-$(uname -r)-amd64` would help our users who
install various DKMS packages and don't expect our kernel headers
to be name pve-headers.

Since the patch already touches both pve-kernel and pve-kernel-meta I
decided to put the `Provides: wireguard-modules (=1.0.0)` in the
meta-package, following Debian upstream.

Tested:
* installing `proxmox-ve` on top of a plain debian VM - to check that this
  still works smootly
* afterwards install `wireguard`
* running `apt install linux-headers-$(uname -r)-amd64`

pve-kernel-meta:
Stoiko Ivanov (2):
  d/control.in: Provide linux-image/linux-headers
  fix #3781: add Provides: wireguard-modules to control.in

 debian/control.in | 2 ++
 1 file changed, 2 insertions(+)

pve-kernel:
Stoiko Ivanov (1):
  d/control.in: Provide versioned linux-image/linux-headers

 debian/control.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.30.2

[pve-devel] [PATCH pve-kernel-meta 1/2] d/control.in: Provide linux-image/linux-headers

[Stoiko Ivanov]

pve-kernel-$MAJ.$MIN (e.g. pve-kernel-5.15) is the equivalent
to linux-image-amd64 for plain debian systems (similarly
pve-headers-$MAJ.$MIN).

Providing the plain debian meta-packages should improve the user
experience, for example when users install DKMS packages, which have a
dependency on linux-headers-amd64.

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

diff --git a/debian/control.in b/debian/control.in
index 3a7d32b..ce9f19a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,6 +9,7 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
 Package: pve-headers-@KERNEL_VER@
 Architecture: all
 Section: admin
+Provides: linux-headers-amd64, linux-headers-generic
 Priority: optional
 Depends: pve-headers-@KERNEL_ABI@,
 Description: Latest Proxmox VE Kernel Headers
@@ -19,6 +20,7 @@ Description: Latest Proxmox VE Kernel Headers
 Package: pve-kernel-@KERNEL_VER@
 Architecture: all
 Section: admin
+Provides: linux-image-amd64, linux-image-generic
 Priority: optional
 Depends: pve-firmware,
          pve-kernel-@KERNEL_ABI@,
-- 
2.30.2

[pve-devel] [PATCH pve-kernel-meta 2/2] 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.

Plain debian has the 'Provides' in the meta-package[0]
(linux-image-amd64), so following this add it to pve-kernel-$MAJ.$MIN

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>
---
 debian/control.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control.in b/debian/control.in
index ce9f19a..036032d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -20,7 +20,7 @@ Description: Latest Proxmox VE Kernel Headers
 Package: pve-kernel-@KERNEL_VER@
 Architecture: all
 Section: admin
-Provides: linux-image-amd64, linux-image-generic
+Provides: linux-image-amd64, linux-image-generic, wireguard-modules (=1.0.0)
 Priority: optional
 Depends: pve-firmware,
          pve-kernel-@KERNEL_ABI@,
-- 
2.30.2

[pve-devel] [PATCH pve-kernel 1/1] d/control.in: Provide versioned linux-image/linux-headers

[Stoiko Ivanov]

pve-headers-$(uname -r) is equivalent to
linux-headers-$(uname -r)-amd64

pve-kernel-$(uname -r) is equivalent to
linux-image-$(uname -r)-amd64

By adding a provides this should help users running
`apt install linux-headers-$(uname -r)-amd64` which is commonly
suggested in install instructions for third-party kernel-drivers on
plain debian.

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

diff --git a/debian/control.in b/debian/control.in
index ee91978..df6ff3d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -50,7 +50,7 @@ Package: pve-headers-@KVNAME@
 Section: devel
 Priority: optional
 Architecture: any
-Provides: linux-headers
+Provides: linux-headers-@KVNAME@-amd64
 Depends: coreutils | fileutils (>= 4.0)
 Description: The Proxmox PVE Kernel Headers
  This package contains the linux kernel headers
@@ -59,7 +59,7 @@ Package: pve-kernel-@KVNAME@
 Section: admin
 Priority: optional
 Architecture: any
-Provides: linux-image
+Provides: linux-image-@KVNAME@-amd64
 Suggests: pve-firmware
 Depends: busybox, initramfs-tools
 Recommends: grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub-efi-arm64
-- 
2.30.2

[pve-devel] applied-series: [PATCH pve-kernel-meta/pve-kernel] add Provides for plain debian packages

[Fabian Grünbichler]

for the active branches for 7.x/2.x

On December 13, 2021 3:52 pm, Stoiko Ivanov wrote:
> This series results from an off-list discussion following
> https://lists.proxmox.com/pipermail/pve-devel/2021-December/051178.html
> 
> Mostly the point was that adding a
> `Provides: linux-headers-$(uname -r)-amd64` would help our users who
> install various DKMS packages and don't expect our kernel headers
> to be name pve-headers.
> 
> Since the patch already touches both pve-kernel and pve-kernel-meta I
> decided to put the `Provides: wireguard-modules (=1.0.0)` in the
> meta-package, following Debian upstream.
> 
> Tested:
> * installing `proxmox-ve` on top of a plain debian VM - to check that this
>   still works smootly
> * afterwards install `wireguard`
> * running `apt install linux-headers-$(uname -r)-amd64`
> 
> pve-kernel-meta:
> Stoiko Ivanov (2):
>   d/control.in: Provide linux-image/linux-headers
>   fix #3781: add Provides: wireguard-modules to control.in
> 
>  debian/control.in | 2 ++
>  1 file changed, 2 insertions(+)
> 
> pve-kernel:
> Stoiko Ivanov (1):
>   d/control.in: Provide versioned linux-image/linux-headers
> 
>  debian/control.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> -- 
> 2.30.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
>