From patchwork Thu Jun 3 09:30:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 54469 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 035D3B7D51 for ; Thu, 3 Jun 2010 19:31:14 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OK6lW-0004bZ-5Y; Thu, 03 Jun 2010 10:31:06 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OK6lT-0004ah-9q for kernel-team@lists.ubuntu.com; Thu, 03 Jun 2010 10:31:03 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OK6lT-0003hC-7C for ; Thu, 03 Jun 2010 10:31:03 +0100 Received: from 79-70-103-73.dynamic.dsl.as9105.com ([79.70.103.73] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OK6lT-00016k-2U for kernel-team@lists.ubuntu.com; Thu, 03 Jun 2010 10:31:03 +0100 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/4] UBUNTU: [Config] d-i: make armel configuration versatile flavour specific Date: Thu, 3 Jun 2010 10:30:59 +0100 Message-Id: <1275557460-30757-4-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1275557460-30757-1-git-send-email-apw@canonical.com> References: <1275557460-30757-1-git-send-email-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/588805 The newly introduced omap configuration is quite different from the existing versatile configuration making it hard to share the configuration at the architecture level. Make the current armel configuration specific to the versatile flavour. Signed-off-by: Andy Whitcroft --- debian.master/d-i/exclude-modules.armel | 20 -------------------- debian.master/d-i/exclude-modules.armel-versatile | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 debian.master/d-i/exclude-modules.armel create mode 100644 debian.master/d-i/exclude-modules.armel-versatile diff --git a/debian.master/d-i/exclude-modules.armel b/debian.master/d-i/exclude-modules.armel deleted file mode 100644 index df63c66..0000000 --- a/debian.master/d-i/exclude-modules.armel +++ /dev/null @@ -1,20 +0,0 @@ -crypto-modules -fb-modules -fs-core-modules -fs-secondary-modules -nic-modules -nic-pcmcia-modules -nic-usb-modules -scsi-modules -storage-core-modules -nfs-modules -pcmcia-modules -parport-modules -serial-modules -plip-modules -pcmcia-storage-modules -mouse-modules -irda-modules -floppy-modules -char-modules -virtio-modules diff --git a/debian.master/d-i/exclude-modules.armel-versatile b/debian.master/d-i/exclude-modules.armel-versatile new file mode 100644 index 0000000..df63c66 --- /dev/null +++ b/debian.master/d-i/exclude-modules.armel-versatile @@ -0,0 +1,20 @@ +crypto-modules +fb-modules +fs-core-modules +fs-secondary-modules +nic-modules +nic-pcmcia-modules +nic-usb-modules +scsi-modules +storage-core-modules +nfs-modules +pcmcia-modules +parport-modules +serial-modules +plip-modules +pcmcia-storage-modules +mouse-modules +irda-modules +floppy-modules +char-modules +virtio-modules