Patchwork [2/4] UBUNTU: [Config] d-i: make all firmware optional too

login
register
mail settings
Submitter Andy Whitcroft
Date June 3, 2010, 9:30 a.m.
Message ID <1275557460-30757-3-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/54468/
State Rejected
Delegated to: Leann Ogasawara
Headers show

Comments

Andy Whitcroft - June 3, 2010, 9:30 a.m.
BugLink: http://bugs.launchpad.net/bugs/588805

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian.master/d-i/firmware/nic-modules  |    6 +++---
 debian.master/d-i/firmware/scsi-modules |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
Leann Ogasawara - June 7, 2010, 6:43 p.m.
Hi Tim and Andy,

I wanted to get come clarification in regards to firmware files being
marked as optional.  In a completely separate thread to this one, Tim
had submitted a patch which updates all the bnx2 udeb firmware files to
*not* be marked as optional:

https://lists.ubuntu.com/archives/kernel-team/2010-June/010944.html

Tim, you had mentioned that "Its worth noting that firmware files,
unlike modules, are not generated and should never be marked
optional..."

So Andy my question here is do we actually need the e100 and qlogic
firmware files marked as optional for the armel-omap udebs?  Or can I
drop this patch as part of the series?

Thanks,
Leann

On Thu, 2010-06-03 at 10:30 +0100, Andy Whitcroft wrote:
> BugLink: http://bugs.launchpad.net/bugs/588805
> 
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
> ---
>  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 ?
> -- 
> 1.7.0.4
> 
>
Tim Gardner - June 7, 2010, 6:56 p.m.
The primary reason I believe firmware files should not be marked 
optional is because they are not generated, as opposed to modules which 
may or may not be built depending on the flavour config. If a firmware 
file changes names or locations, then its better to detect that at build 
time rather then after the package has been released.

rtg

On 06/07/2010 12:43 PM, Leann Ogasawara wrote:
> Hi Tim and Andy,
>
> I wanted to get come clarification in regards to firmware files being
> marked as optional.  In a completely separate thread to this one, Tim
> had submitted a patch which updates all the bnx2 udeb firmware files to
> *not* be marked as optional:
>
> https://lists.ubuntu.com/archives/kernel-team/2010-June/010944.html
>
> Tim, you had mentioned that "Its worth noting that firmware files,
> unlike modules, are not generated and should never be marked
> optional..."
>
> So Andy my question here is do we actually need the e100 and qlogic
> firmware files marked as optional for the armel-omap udebs?  Or can I
> drop this patch as part of the series?
>
> Thanks,
> Leann
>
> On Thu, 2010-06-03 at 10:30 +0100, Andy Whitcroft wrote:
>> BugLink: http://bugs.launchpad.net/bugs/588805
>>
>> Signed-off-by: Andy Whitcroft<apw@canonical.com>
>> ---
>>   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 ?
>> --
>> 1.7.0.4
>>
>>
>
>

Patch

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 ?