From patchwork Wed Oct 2 11:04:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Watson X-Patchwork-Id: 279690 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 76B072C00BA for ; Wed, 2 Oct 2013 21:05:04 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VRKEh-0005Mj-Je; Wed, 02 Oct 2013 11:04:55 +0000 Received: from chiark.greenend.org.uk ([212.13.197.229]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VRKEb-0005LS-C4 for kernel-team@lists.ubuntu.com; Wed, 02 Oct 2013 11:04:49 +0000 Received: from [172.20.153.9] (helo=riva.pelham.vpn.ucam.org) by chiark.greenend.org.uk (Debian Exim 4.72 #1) with esmtps (return-path cjwatson@ubuntu.com) id 1VRKEb-00027u-7a for kernel-team@lists.ubuntu.com; Wed, 02 Oct 2013 12:04:49 +0100 Received: from ns1.pelham.vpn.ucam.org ([172.20.153.2] helo=riva.ucam.org) by riva.pelham.vpn.ucam.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1VRKEa-0006sv-66 for kernel-team@lists.ubuntu.com; Wed, 02 Oct 2013 12:04:48 +0100 Date: Wed, 2 Oct 2013 12:04:46 +0100 From: Colin Watson To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] Clean up various udeb Provides Message-ID: <20131002110446.GB32337@riva.ucam.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 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-bounces@lists.ubuntu.com Make the Provides fields of kernel-image, block-modules, fs-core-modules, fs-secondary-modules, and md-modules better match their contents. This should make the bulk of udebs in the archive installable as far as proposed-migration is concerned. This parallels a similar change to debian.master (https://lists.ubuntu.com/archives/kernel-team/2013-October/033011.html). Signed-off-by: Colin Watson --- debian.ppc/d-i/package-list | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian.ppc/d-i/package-list b/debian.ppc/d-i/package-list index e899056..da1391b 100644 --- a/debian.ppc/d-i/package-list +++ b/debian.ppc/d-i/package-list @@ -1,4 +1,5 @@ Package: kernel-image +Provides: ext3-modules, ext4-modules Package: fat-modules Depends: kernel-image @@ -24,14 +25,14 @@ Description: Floppy driver support Package: fs-core-modules Depends: kernel-image Priority: standard -Provides: jfs-modules, reiserfs-modules, xfs-modules +Provides: ext2-modules, jfs-modules, reiserfs-modules, xfs-modules Description: Base filesystem modules This includes jfs, reiserfs and xfs. Package: fs-secondary-modules Depends: kernel-image, fat-modules Priority: standard -Provides: ntfs-modules, hfs-modules +Provides: btrfs-modules, ntfs-modules, hfs-modules Description: Extra filesystem modules This includes support for Windows NTFS and MacOS HFS/HFSPlus @@ -48,6 +49,7 @@ Description: Support for Infrared protocols Package: md-modules Depends: kernel-image Priority: standard +Provides: crypto-dm-modules Description: Multi-device support (raid, device-mapper, lvm) Package: nic-modules @@ -138,6 +140,7 @@ Description: NFS filesystem drivers Package: block-modules Priority: standard Depends: kernel-image, storage-core-modules, parport-modules, virtio-modules +Provides: nbd-modules Description: Block storage devices This package contains the block storage devices, including DAC960 and paraide.