From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F0CA3840FF for ; Fri, 10 Dec 2021 17:50:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DCB6129563 for ; Fri, 10 Dec 2021 17:50:06 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 21A212955A for ; Fri, 10 Dec 2021 17:50:06 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D44A746A7D for ; Fri, 10 Dec 2021 17:50:05 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 10 Dec 2021 17:49:47 +0100 Message-Id: <20211210164947.3138643-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.282 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [control.in] Subject: [pve-devel] [PATCH pve-kernel] fix #3781: add Provides: wireguard-modules to control.in X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Dec 2021 16:50:37 -0000 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 --- * 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: -- 2.30.2