| Submitter | Ross Burton |
|---|---|
| Date | Oct. 18, 2012, 2:03 p.m. |
| Message ID | <1350569021-17352-1-git-send-email-ross.burton@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/38279/ |
| State | Accepted |
| Commit | 5b822610e8559c42edb16d5f34d77951f95b8d57 |
| Headers | show |
Comments
On 10/18/2012 07:03 AM, Ross Burton wrote: > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > index 559f82a..f4eb4cf 100644 > --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > @@ -19,10 +19,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \ > file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ > " > > -SRCREV = "e98750f0d68d0037ce5a186f7f863a9c13bf773a" > +SRCREV = "0d6729f2b0bc6254d3628eb831bc80a36b5a17db" > PE = "1" > PV = "0.0+git${SRCPV}" > -PR = "r4" > +PR = "r5" > > SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git" > > Merged into OE-Core Thanks Sau!
On Wed, Oct 24, 2012 at 08:07:05AM -0700, Saul Wold wrote: > On 10/18/2012 07:03 AM, Ross Burton wrote: > > Signed-off-by: Ross Burton <ross.burton@intel.com> > > --- > > meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > > index 559f82a..f4eb4cf 100644 > > --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > > +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > > @@ -19,10 +19,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \ > > file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ > > " > > > > -SRCREV = "e98750f0d68d0037ce5a186f7f863a9c13bf773a" > > +SRCREV = "0d6729f2b0bc6254d3628eb831bc80a36b5a17db" > > PE = "1" > > PV = "0.0+git${SRCPV}" > > -PR = "r4" > > +PR = "r5" > > > > SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git" > > > > > Merged into OE-Core Probably not caused by this upgrade, but do you also see: NOTE: Running setscene task 1956 of 2655 (/OE/shr-core/openembedded-core/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb, do_package_setscene) NOTE: recipe linux-firmware-1_0.0+git2+0d6729f2b0bc6254d3628eb831bc80a36b5a17db-r5: task do_populate_sysroot_setscene: Started NOTE: recipe linux-firmware-1_0.0+git2+0d6729f2b0bc6254d3628eb831bc80a36b5a17db-r5: task do_package_setscene: Started WARNING: The recipe linux-firmware is trying to install files into a shared area when those files already exist. Those files are: /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/ti_5052.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/mts_edge.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/whiteheat_loader.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/mts_cdma.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/whiteheat.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/mts_gsm.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/ti_3410.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/kaweth/new_code_fix.bin /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/kaweth/trigger_code_fix.bin /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/kaweth/new_code.bin /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/kaweth/trigger_code.bin /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/keyspan_pda/keyspan_pda.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/keyspan_pda/xircom_pgs.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/down.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/down3.bin /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/down2.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/boot.fw /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/boot2.fw NOTE: recipe linux-firmware-1_0.0+git2+0d6729f2b0bc6254d3628eb831bc80a36b5a17db-r5: task do_populate_sysroot_setscene: Succeeded Here it's installed by kernel recipe (linux-openmoko not linux-yocto based) but I don't see firmware install disabled in kernel.bbclass or linux-yocto. Cheers,
On Wed, 2012-10-24 at 17:12 +0200, Martin Jansa wrote: > On Wed, Oct 24, 2012 at 08:07:05AM -0700, Saul Wold wrote: > > On 10/18/2012 07:03 AM, Ross Burton wrote: > > > Signed-off-by: Ross Burton <ross.burton@intel.com> > > > --- > > > meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > > > index 559f82a..f4eb4cf 100644 > > > --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > > > +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > > > @@ -19,10 +19,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \ > > > file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ > > > " > > > > > > -SRCREV = "e98750f0d68d0037ce5a186f7f863a9c13bf773a" > > > +SRCREV = "0d6729f2b0bc6254d3628eb831bc80a36b5a17db" > > > PE = "1" > > > PV = "0.0+git${SRCPV}" > > > -PR = "r4" > > > +PR = "r5" > > > > > > SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git" > > > > > > > > Merged into OE-Core > > Probably not caused by this upgrade, but do you also see: > > NOTE: Running setscene task 1956 of 2655 (/OE/shr-core/openembedded-core/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb, do_package_setscene) > NOTE: recipe linux-firmware-1_0.0+git2+0d6729f2b0bc6254d3628eb831bc80a36b5a17db-r5: task do_populate_sysroot_setscene: Started > NOTE: recipe linux-firmware-1_0.0+git2+0d6729f2b0bc6254d3628eb831bc80a36b5a17db-r5: task do_package_setscene: Started > WARNING: The recipe linux-firmware is trying to install files into a shared area when those files already exist. Those files are: > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/ti_5052.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/mts_edge.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/whiteheat_loader.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/mts_cdma.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/whiteheat.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/mts_gsm.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/ti_3410.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/kaweth/new_code_fix.bin > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/kaweth/trigger_code_fix.bin > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/kaweth/new_code.bin > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/kaweth/trigger_code.bin > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/keyspan_pda/keyspan_pda.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/keyspan_pda/xircom_pgs.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/down.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/down3.bin > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/down2.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/boot.fw > /OE/shr-core/tmp-eglibc/sysroots/om-gta02/lib/firmware/edgeport/boot2.fw > NOTE: recipe linux-firmware-1_0.0+git2+0d6729f2b0bc6254d3628eb831bc80a36b5a17db-r5: task do_populate_sysroot_setscene: Succeeded > > Here it's installed by kernel recipe (linux-openmoko not linux-yocto based) but I don't > see firmware install disabled in kernel.bbclass or linux-yocto. I've not seen those warnings in my builds or on the autobuilder... Cheers, Richard
Patch
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 559f82a..f4eb4cf 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -19,10 +19,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ " -SRCREV = "e98750f0d68d0037ce5a186f7f863a9c13bf773a" +SRCREV = "0d6729f2b0bc6254d3628eb831bc80a36b5a17db" PE = "1" PV = "0.0+git${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git"
Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)