All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts
@ 2014-10-22  8:36 jackie.huang
  2014-10-22 13:11 ` Otavio Salvador
  0 siblings, 1 reply; 6+ messages in thread
From: jackie.huang @ 2014-10-22  8:36 UTC (permalink / raw)
  To: openembedded-core

From: Yue Tao <yue.tao@windriver.com>

Use alternatives mechanism to prevent linux-firmware and microcode-ctl bin
files from causing conflicts.

The error is :

error: file /lib/firmware/amd-ucode/microcode_amd.bin from install of
linux-firmware conflicts with file from package microcode-ctl-firmware

error: file /lib/firmware/amd-ucode/microcode_amd_fam15h.bin from
install of linux-firmware conflicts with file from package microcode-ctl-firmware

Signed-off-by: Yue Tao <yue.tao@windriver.com>
---
 meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index a107f80..28d71f5 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -228,3 +228,8 @@ python populate_packages_prepend () {
     firmware_pkgs = oe.utils.packages_filter_out_system(d)
     d.appendVar('RDEPENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs))
 }
+
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "microcode_amd.bin microcode_amd_fam15h.bin"
+ALTERNATIVE_LINK_NAME[microcode_amd.bin] = "/lib/firmware/amd-ucode/microcode_amd.bin"
+ALTERNATIVE_LINK_NAME[microcode_amd_fam15h.bin] = "/lib/firmware/amd-ucode/microcode_amd_fam15h.bin"
-- 
2.0.0



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts
  2014-10-22  8:36 [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts jackie.huang
@ 2014-10-22 13:11 ` Otavio Salvador
  2014-10-23  5:14   ` Huang, Jie (Jackie)
  2014-11-04  6:59   ` Huang, Jie (Jackie)
  0 siblings, 2 replies; 6+ messages in thread
From: Otavio Salvador @ 2014-10-22 13:11 UTC (permalink / raw)
  To: jackie.huang; +Cc: Patches and discussions about the oe-core layer

On Wed, Oct 22, 2014 at 6:36 AM,  <jackie.huang@windriver.com> wrote:
> From: Yue Tao <yue.tao@windriver.com>
>
> Use alternatives mechanism to prevent linux-firmware and microcode-ctl bin
> files from causing conflicts.
>
> The error is :
>
> error: file /lib/firmware/amd-ucode/microcode_amd.bin from install of
> linux-firmware conflicts with file from package microcode-ctl-firmware
>
> error: file /lib/firmware/amd-ucode/microcode_amd_fam15h.bin from
> install of linux-firmware conflicts with file from package microcode-ctl-firmware
>
> Signed-off-by: Yue Tao <yue.tao@windriver.com>

* The firmware should be split in a specific package, if possible (in
a separated patch)
* microcode-ctl-firmware does not exist here
* microcode-ctl-firmware seems useless if you can rely on
linux-firmware to provide the file.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts
  2014-10-22 13:11 ` Otavio Salvador
@ 2014-10-23  5:14   ` Huang, Jie (Jackie)
  2014-10-23 10:59     ` Otavio Salvador
  2014-10-23 11:55     ` Burton, Ross
  2014-11-04  6:59   ` Huang, Jie (Jackie)
  1 sibling, 2 replies; 6+ messages in thread
From: Huang, Jie (Jackie) @ 2014-10-23  5:14 UTC (permalink / raw)
  To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer



> -----Original Message-----
> From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf Of Otavio Salvador
> Sent: Wednesday, October 22, 2014 9:12 PM
> To: Huang, Jie (Jackie)
> Cc: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts
> 
> On Wed, Oct 22, 2014 at 6:36 AM,  <jackie.huang@windriver.com> wrote:
> > From: Yue Tao <yue.tao@windriver.com>
> >
> > Use alternatives mechanism to prevent linux-firmware and microcode-ctl
> > bin files from causing conflicts.
> >
> > The error is :
> >
> > error: file /lib/firmware/amd-ucode/microcode_amd.bin from install of
> > linux-firmware conflicts with file from package microcode-ctl-firmware
> >
> > error: file /lib/firmware/amd-ucode/microcode_amd_fam15h.bin from
> > install of linux-firmware conflicts with file from package
> > microcode-ctl-firmware
> >
> > Signed-off-by: Yue Tao <yue.tao@windriver.com>
> 
> * The firmware should be split in a specific package, if possible (in a separated patch)

Thanks for pointing this, I will re-work on it.

> * microcode-ctl-firmware does not exist here

Yes, I know, but we have it in our own layer.

> * microcode-ctl-firmware seems useless if you can rely on linux-firmware to provide the file.

Maybe, but someone may choose to use the one provided by microcode-ctl-firmware.

Thanks,
Jackie

> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts
  2014-10-23  5:14   ` Huang, Jie (Jackie)
@ 2014-10-23 10:59     ` Otavio Salvador
  2014-10-23 11:55     ` Burton, Ross
  1 sibling, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2014-10-23 10:59 UTC (permalink / raw)
  To: Huang, Jie (Jackie); +Cc: Patches and discussions about the oe-core layer

On Thu, Oct 23, 2014 at 3:14 AM, Huang, Jie (Jackie)
<Jackie.Huang@windriver.com> wrote:
>> On Wed, Oct 22, 2014 at 6:36 AM,  <jackie.huang@windriver.com> wrote:
>> > From: Yue Tao <yue.tao@windriver.com>
>> >
>> > Use alternatives mechanism to prevent linux-firmware and microcode-ctl
>> > bin files from causing conflicts.
>> >
>> > The error is :
>> >
>> > error: file /lib/firmware/amd-ucode/microcode_amd.bin from install of
>> > linux-firmware conflicts with file from package microcode-ctl-firmware
>> >
>> > error: file /lib/firmware/amd-ucode/microcode_amd_fam15h.bin from
>> > install of linux-firmware conflicts with file from package
>> > microcode-ctl-firmware
>> >
>> > Signed-off-by: Yue Tao <yue.tao@windriver.com>
>>
>> * The firmware should be split in a specific package, if possible (in a separated patch)
>
> Thanks for pointing this, I will re-work on it.
>
>> * microcode-ctl-firmware does not exist here
>
> Yes, I know, but we have it in our own layer.
>
>> * microcode-ctl-firmware seems useless if you can rely on linux-firmware to provide the file.
>
> Maybe, but someone may choose to use the one provided by microcode-ctl-firmware.

Well I think we ought to avoid duplication but it is your call as it
is in your layer. Anyway don't use error messages which point to your
company's data so don't cite it in the commit log.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts
  2014-10-23  5:14   ` Huang, Jie (Jackie)
  2014-10-23 10:59     ` Otavio Salvador
@ 2014-10-23 11:55     ` Burton, Ross
  1 sibling, 0 replies; 6+ messages in thread
From: Burton, Ross @ 2014-10-23 11:55 UTC (permalink / raw)
  To: Huang, Jie (Jackie)
  Cc: Otavio Salvador, Patches and discussions about the oe-core layer

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

On 23 October 2014 06:14, Huang, Jie (Jackie) <Jackie.Huang@windriver.com>
wrote:

> > * microcode-ctl-firmware seems useless if you can rely on linux-firmware
> to provide the file.
>
> Maybe, but someone may choose to use the one provided by
> microcode-ctl-firmware.


Would they intentionally pick the file in your microcode-ctl-firmware
package, and if they do so because it's a newer/better/faster microcode,
why isn't that upstreamed into linux-firmware?

Ross

[-- Attachment #2: Type: text/html, Size: 847 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts
  2014-10-22 13:11 ` Otavio Salvador
  2014-10-23  5:14   ` Huang, Jie (Jackie)
@ 2014-11-04  6:59   ` Huang, Jie (Jackie)
  1 sibling, 0 replies; 6+ messages in thread
From: Huang, Jie (Jackie) @ 2014-11-04  6:59 UTC (permalink / raw)
  To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer



> -----Original Message-----
> From: Huang, Jie (Jackie)
> Sent: Thursday, October 23, 2014 1:14 PM
> To: 'Otavio Salvador'
> Cc: Patches and discussions about the oe-core layer
> Subject: RE: [OE-core] [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts
> 
> 
> 
> > -----Original Message-----
> > From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On
> > Behalf Of Otavio Salvador
> > Sent: Wednesday, October 22, 2014 9:12 PM
> > To: Huang, Jie (Jackie)
> > Cc: Patches and discussions about the oe-core layer
> > Subject: Re: [OE-core] [PATCH] linux-firmware: resolve linux-firmware
> > and microcode-ctl file conflicts
> >
> > On Wed, Oct 22, 2014 at 6:36 AM,  <jackie.huang@windriver.com> wrote:
> > > From: Yue Tao <yue.tao@windriver.com>
> > >
> > > Use alternatives mechanism to prevent linux-firmware and
> > > microcode-ctl bin files from causing conflicts.
> > >
> > > The error is :
> > >
> > > error: file /lib/firmware/amd-ucode/microcode_amd.bin from install
> > > of linux-firmware conflicts with file from package
> > > microcode-ctl-firmware
> > >
> > > error: file /lib/firmware/amd-ucode/microcode_amd_fam15h.bin from
> > > install of linux-firmware conflicts with file from package
> > > microcode-ctl-firmware
> > >
> > > Signed-off-by: Yue Tao <yue.tao@windriver.com>
> >
> > * The firmware should be split in a specific package, if possible (in
> > a separated patch)
> 
> Thanks for pointing this, I will re-work on it.
> 
> > * microcode-ctl-firmware does not exist here
> 
> Yes, I know, but we have it in our own layer.
> 
> > * microcode-ctl-firmware seems useless if you can rely on linux-firmware to provide the file.
> 
> Maybe, but someone may choose to use the one provided by microcode-ctl-firmware.

We have fixed this in microcode-ctl-firmware, so this patch is not needed.

Thanks,
Jackie

> 
> Thanks,
> Jackie
> 
> >
> > --
> > Otavio Salvador                             O.S. Systems
> > http://www.ossystems.com.br        http://code.ossystems.com.br
> > Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-11-04  6:59 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-22  8:36 [PATCH] linux-firmware: resolve linux-firmware and microcode-ctl file conflicts jackie.huang
2014-10-22 13:11 ` Otavio Salvador
2014-10-23  5:14   ` Huang, Jie (Jackie)
2014-10-23 10:59     ` Otavio Salvador
2014-10-23 11:55     ` Burton, Ross
2014-11-04  6:59   ` Huang, Jie (Jackie)

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.