From patchwork Tue Jul 10 19:17:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 942162 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41QBmd5150z9s2L; Wed, 11 Jul 2018 05:17:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fcy8v-00029a-6r; Tue, 10 Jul 2018 19:17:45 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fcy8t-00029E-RD for kernel-team@lists.ubuntu.com; Tue, 10 Jul 2018 19:17:43 +0000 Received: from 1.general.kamal.us.vpn ([10.172.68.52] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fcy8t-0006e5-F0 for kernel-team@lists.ubuntu.com; Tue, 10 Jul 2018 19:17:43 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1fcy8r-0000as-07 for kernel-team@lists.ubuntu.com; Tue, 10 Jul 2018 12:17:41 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [RFC][PATCH 1/1][bionic] UBUNTU: [Packaging] do not use ${shlibs:Depends} for image or modules Date: Tue, 10 Jul 2018 12:17:39 -0700 Message-Id: <1531250259-2230-2-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531250259-2230-1-git-send-email-kamal@canonical.com> References: <1531250259-2230-1-git-send-email-kamal@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Resolve build warnings for the main image and modules packages which have no shared lib dependencies and hence get no generated ${shlibs:Depends} variable, resulting in: dpkg-gencontrol: warning: Depends field of package PACKAGE: unknown substitution variable ${shlibs:Depends} for PACKAGE's: linux-image-unsigned-4.15.0-24-generic linux-image-unsigned-4.15.0-24-lowlatency linux-modules-4.15.0-24-generic linux-modules-4.15.0-24-lowlatency linux-modules-extra-4.15.0-24-generic Signed-off-by: Kamal Mostafa --- debian.master/control.d/flavour-control.stub | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub index 918b41a..2cc4711 100644 --- a/debian.master/control.d/flavour-control.stub +++ b/debian.master/control.d/flavour-control.stub @@ -27,7 +27,7 @@ Architecture: ARCH Section: kernel Priority: optional Provides: linux-image, fuse-module, aufs-dkms, =PROVIDES=${linux:rprovides} -Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-PKGVER-ABINUM-FLAVOUR +Depends: ${misc:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-PKGVER-ABINUM-FLAVOUR Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR @@ -49,7 +49,7 @@ Build-Profiles: Architecture: ARCH Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends} Description: Linux kernel extra modules for version PKGVER on DESC Contains the corresponding System.map file, the modules built by the packager, and scripts that try to ensure that the system is not left in an @@ -68,7 +68,7 @@ Build-Profiles: Architecture: ARCH Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR | linux-image-unsigned-PKGVER-ABINUM-FLAVOUR, crda | wireless-crda +Depends: ${misc:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR | linux-image-unsigned-PKGVER-ABINUM-FLAVOUR, crda | wireless-crda Description: Linux kernel extra modules for version PKGVER on DESC This package contains the Linux kernel extra modules for version PKGVER on DESC.