From patchwork Tue Oct 20 11:23:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1384850 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CFrr21VYNz9sRk; Tue, 20 Oct 2020 22:24:34 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kUpke-00011O-AB; Tue, 20 Oct 2020 11:24:24 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kUpkb-00011I-Ry for kernel-team@lists.ubuntu.com; Tue, 20 Oct 2020 11:24:21 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kUpkb-0007cc-JA for kernel-team@lists.ubuntu.com; Tue, 20 Oct 2020 11:24:21 +0000 Received: by mail-wm1-f69.google.com with SMTP id s25so339708wmj.7 for ; Tue, 20 Oct 2020 04:24:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=nvAduSO+GBrm12QJp0KAsmaPl0j3wrZTGKNt0he07i4=; b=LlY1yQkV5hN7ttBLYaFWQGYoTan3tsudqyaYoUFOc/feX0kgdjcb6VuyPTnS3u39U7 uzVOdtdG08ZxGYQAiwTq8vivtkVtnvCK2pRPAY+HSVkgb9HGzmz0qOyiUXQXQpy4shJn KvRezpYbs5hxI/HNcERNJH1fGfmQqAjuPoIxKba5RKwqtQcYfWC5WRBj3WbS33ojJfsx Aiz3e3ujXK6lr0ZvRpYRSkyw70ZlVOcN2Rg8PqRBLk4Dm1ljpLJ17nOqTvE3iKrq1PHd /VjF0Lzhv9unKDJOuHAyh56ZDB2rJVMs/u1x0vUJUOJLfQngW5iST4m7AkiBf9hh7fH9 ukxg== X-Gm-Message-State: AOAM533fRuk3UrEMpuiYl/Km2jD/2Nnjo8UywefYluW1+lX93ahQIhl9 vjvEKP5MLazA+rw1Vw6e1ueDc3k9m33kxrM716y8DbW2UtwxRSES8d+QlsAgvd37IyOsOsprgvm t1snCFJ+XpsQpZbBT6tTINr2sL44Z7E4zYAaAyA+rTw== X-Received: by 2002:a1c:e48b:: with SMTP id b133mr2383259wmh.0.1603193061029; Tue, 20 Oct 2020 04:24:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlV3ucVMJWrMY3qTHu083EQ1rFek1AwYm5Vjbvryjhgcj9C1oBEekvhk2r68D50Pg3jxYAaA== X-Received: by 2002:a1c:e48b:: with SMTP id b133mr2383236wmh.0.1603193060701; Tue, 20 Oct 2020 04:24:20 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id m1sm1311234wme.48.2020.10.20.04.24.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 04:24:20 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][G/meta-raspi][PATCH] UBUNTU: [Packaging] Add missing provides for wireguard Date: Tue, 20 Oct 2020 13:23:47 +0200 Message-Id: <20201020112347.62254-1-juergh@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1900683 Also, since wireguard is now part of the kernel, the modules package is a build dependency so that the version can be extracted from the module. Signed-off-by: Juerg Haefliger Acked-by: Andrea Righi Acked-by: Kleber Sacilotto de Souza --- debian/control.common | 1 + debian/control.d/raspi | 2 +- debian/control.d/raspi-nolpae | 1 + debian/rules | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/control.common b/debian/control.common index c93fe13f5242..f386aa9f135a 100644 --- a/debian/control.common +++ b/debian/control.common @@ -7,4 +7,5 @@ Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, Build-Depends-Arch: @KERNEL_SOURCE@-headers-@KERNEL_ABI_VERSION@, linux-headers-@KERNEL_ABI_VERSION@-raspi, + linux-modules-@KERNEL_ABI_VERSION@-raspi, Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta-raspi/+git/@SERIES@ diff --git a/debian/control.d/raspi b/debian/control.d/raspi index f7f78210b45b..7796da6ec2d0 100644 --- a/debian/control.d/raspi +++ b/debian/control.d/raspi @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers Package: linux-image-raspi${variant:suffix} Architecture: armhf arm64 Section: kernel -Provides: ${dkms:zfs-modules} +Provides: ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules} Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware Description: Raspberry Pi Linux kernel image This package will always depend on the latest Raspberry Pi Linux diff --git a/debian/control.d/raspi-nolpae b/debian/control.d/raspi-nolpae index d494dd1f3963..cc4f3227e9b4 100644 --- a/debian/control.d/raspi-nolpae +++ b/debian/control.d/raspi-nolpae @@ -9,6 +9,7 @@ Description: No-LPAE Raspberry Pi Linux kernel headers Package: linux-image-raspi-nolpae${variant:suffix} Architecture: armhf Section: kernel +Provides: ${dkms:wireguard-linux-compat-modules} Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi-nolpae, linux-firmware Description: No-LPAE Raspberry Pi Linux kernel image This package will always depend on the latest no-LPAE Raspberry Pi Linux diff --git a/debian/rules b/debian/rules index 45369c0c4b9a..cd71bc87fce4 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,7 @@ clean: debian/control # Versions of dkms packages. dkms_zfs_linux_version=$(shell gawk '/^zfs-linux/ { print $$2; }' debian/dkms-versions) dkms_virtualbox_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) -dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat/ { print $$2; }' debian/dkms-versions) +dkms_wireguard_version=$(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-raspi/kernel/drivers/net/wireguard/wireguard.ko) debian/control: tp_key=test:provides\(-full\|-image\|-headers\|-modules-extra\) debian/control: $(control_files)