From patchwork Thu Jun 3 09:30:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 54468 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 43101B7D30 for ; Thu, 3 Jun 2010 19:31:13 +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 1OK6lV-0004bK-Cw; Thu, 03 Jun 2010 10:31:05 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OK6lT-0004ab-25 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-0003gu-04 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 1OK6lS-00016k-SH for kernel-team@lists.ubuntu.com; Thu, 03 Jun 2010 10:31:02 +0100 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/4] UBUNTU: [Config] d-i: make all firmware optional too Date: Thu, 3 Jun 2010 10:30:58 +0100 Message-Id: <1275557460-30757-3-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 Signed-off-by: Andy Whitcroft --- debian.master/d-i/firmware/nic-modules | 6 +++--- debian.master/d-i/firmware/scsi-modules | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian.master/d-i/firmware/nic-modules b/debian.master/d-i/firmware/nic-modules index bf601e5..1683452 100644 --- a/debian.master/d-i/firmware/nic-modules +++ b/debian.master/d-i/firmware/nic-modules @@ -5,6 +5,6 @@ bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw ? bnx2/bnx2-rv2p-09-5.0.0.j3.fw ? bnx2x-e1-5.0.21.0.fw ? bnx2x-e1h-5.0.21.0.fw ? -e100/d101m_ucode.bin -e100/d101s_ucode.bin -e100/d102e_ucode.bin +e100/d101m_ucode.bin ? +e100/d101s_ucode.bin ? +e100/d102e_ucode.bin ? diff --git a/debian.master/d-i/firmware/scsi-modules b/debian.master/d-i/firmware/scsi-modules index b089c7d..56bf990 100644 --- a/debian.master/d-i/firmware/scsi-modules +++ b/debian.master/d-i/firmware/scsi-modules @@ -1,3 +1,3 @@ -qlogic/1040.bin -qlogic/12160.bin -qlogic/1280.bin +qlogic/1040.bin ? +qlogic/12160.bin ? +qlogic/1280.bin ?