Patchwork linux-firmware: Look for RTL license in the right directory

login
register
mail settings
Submitter Darren Hart
Date April 22, 2013, 11:27 p.m.
Message ID <509f81736f95919be413293c2286c739da1de06f.1366673258.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/48661/
State Accepted
Commit 35483a617698587b20e019a58b4973629569764c
Headers show

Comments

Darren Hart - April 22, 2013, 11:27 p.m.
The rtl-license package FILES was pointing to the wrong directory as it
was removed from there in commit:

acd3735 linux-firmware: Remove duplicaed license from rtlwifi subdir

This resulted in a do_rootfs failure for core-image-sato-sdk for fri2
with ipk when the linux-firmware-dev package tried to install
linux-firmware-rtl-license which wasn't created as it was empty.

Tested on core-image-sato-sdk build for fri2 on dylan commit:
789b2b7e0cca404ff8ba8ed5ba823d215e6ba5b4

Cc: Saul Wold <sgw@linux.intel.com>
Cc: Beth Flanagan <elizabeth.flanagan@intel.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 .../linux-firmware/linux-firmware_git.bb           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Otavio Salvador - April 23, 2013, 11:51 a.m.
On Mon, Apr 22, 2013 at 8:27 PM, Darren Hart <dvhart@linux.intel.com> wrote:
> The rtl-license package FILES was pointing to the wrong directory as it
> was removed from there in commit:
>
> acd3735 linux-firmware: Remove duplicaed license from rtlwifi subdir
>
> This resulted in a do_rootfs failure for core-image-sato-sdk for fri2
> with ipk when the linux-firmware-dev package tried to install
> linux-firmware-rtl-license which wasn't created as it was empty.
>
> Tested on core-image-sato-sdk build for fri2 on dylan commit:
> 789b2b7e0cca404ff8ba8ed5ba823d215e6ba5b4
>
> Cc: Saul Wold <sgw@linux.intel.com>
> Cc: Beth Flanagan <elizabeth.flanagan@intel.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

I don't know how the install failure did not happen here but this is
indeed a fix.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Darren Hart - April 23, 2013, 2:23 p.m.
On 04/23/2013 04:51 AM, Otavio Salvador wrote:
> On Mon, Apr 22, 2013 at 8:27 PM, Darren Hart <dvhart@linux.intel.com> wrote:
>> The rtl-license package FILES was pointing to the wrong directory as it
>> was removed from there in commit:
>>
>> acd3735 linux-firmware: Remove duplicaed license from rtlwifi subdir
>>
>> This resulted in a do_rootfs failure for core-image-sato-sdk for fri2
>> with ipk when the linux-firmware-dev package tried to install
>> linux-firmware-rtl-license which wasn't created as it was empty.
>>
>> Tested on core-image-sato-sdk build for fri2 on dylan commit:
>> 789b2b7e0cca404ff8ba8ed5ba823d215e6ba5b4
>>
>> Cc: Saul Wold <sgw@linux.intel.com>
>> Cc: Beth Flanagan <elizabeth.flanagan@intel.com>
>> Cc: Otavio Salvador <otavio@ossystems.com.br>
>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> 
> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
> 
> I don't know how the install failure did not happen here but this is
> indeed a fix.

You would need to build something like SDK which includes the dev
package and I believe you would also need the following patch which
landed after yours:

9fb13a3 linux-firmware: make the main package depend on all sub-packages

Patch

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index ef036cf..414f47a 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -94,7 +94,7 @@  FILES_${PN}-sd8686 = " \
 "
 
 FILES_${PN}-rtl-license = " \
-  /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
+  /lib/firmware/LICENCE.rtlwifi_firmware.txt \
 "
 
 LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi"