Patchwork bootimg: Use STAGING_KERNEL_DIR

login
register
mail settings
Submitter Darren Hart
Date July 5, 2012, 6:08 p.m.
Message ID <4f44ff83fd87ca9ee470f3ee789bb5550aa5101a.1341511739.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/31287/
State Accepted
Commit 8f16811a8d51982a8b3d70e6087aef4a41926840
Headers show

Comments

Darren Hart - July 5, 2012, 6:08 p.m.
bootimg.bbclass using STAGING_DIR_HOST/kernel instead of
STAGING_KERNEL_DIR, resulting in build failure of live images.

| install: cannot stat `/usr/local/dev/yocto/fishriver-test/build/tmp/sysroots/fishriver/kernel/bzImage': No such file or directory

Replace it with STAGING_KERNEL_DIR.

UNTESTED - PLEASE TEST PRIOR TO PULL.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: tom.zanussi@intel.com
CC: saul.wold@intel.com
CC: nitin.a.kamble@intel.com
---
 meta/classes/bootimg.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Tom Zanussi - July 5, 2012, 8:06 p.m.
On Thu, 2012-07-05 at 11:08 -0700, Darren Hart wrote:
> bootimg.bbclass using STAGING_DIR_HOST/kernel instead of
> STAGING_KERNEL_DIR, resulting in build failure of live images.
> 
> | install: cannot stat `/usr/local/dev/yocto/fishriver-test/build/tmp/sysroots/fishriver/kernel/bzImage': No such file or directory
> 
> Replace it with STAGING_KERNEL_DIR.
> 
> UNTESTED - PLEASE TEST PRIOR TO PULL.

Fixed the build problem here.

Tested-by: Tom Zanussi <tom.zanussi@intel.com>

> 
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> CC: tom.zanussi@intel.com
> CC: saul.wold@intel.com
> CC: nitin.a.kamble@intel.com
> ---
>  meta/classes/bootimg.bbclass |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
> index 370b378..a4c0e8d 100644
> --- a/meta/classes/bootimg.bbclass
> +++ b/meta/classes/bootimg.bbclass
> @@ -63,7 +63,7 @@ populate() {
>  	install -d ${DEST}
>  
>  	# Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
> -	install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz
> +	install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz
>  
>  	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
>  		install -m 0644 ${INITRD} ${DEST}/initrd
Darren Hart - July 5, 2012, 9:29 p.m.
On 07/05/2012 01:06 PM, Tom Zanussi wrote:
> On Thu, 2012-07-05 at 11:08 -0700, Darren Hart wrote:
>> bootimg.bbclass using STAGING_DIR_HOST/kernel instead of
>> STAGING_KERNEL_DIR, resulting in build failure of live images.
>>
>> | install: cannot stat `/usr/local/dev/yocto/fishriver-test/build/tmp/sysroots/fishriver/kernel/bzImage': No such file or directory
>>
>> Replace it with STAGING_KERNEL_DIR.
>>
>> UNTESTED - PLEASE TEST PRIOR TO PULL.
> 
> Fixed the build problem here.
> 
> Tested-by: Tom Zanussi <tom.zanussi@intel.com>

Great. I'm getting bags packed and kids ready to go. Can someone please
pull this one in and clean up the commit log to remove the UNTESTED line
and add Tom's Tested-by?

Thanks,

Darren

> 
>>
>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
>> CC: tom.zanussi@intel.com
>> CC: saul.wold@intel.com
>> CC: nitin.a.kamble@intel.com
>> ---
>>  meta/classes/bootimg.bbclass |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
>> index 370b378..a4c0e8d 100644
>> --- a/meta/classes/bootimg.bbclass
>> +++ b/meta/classes/bootimg.bbclass
>> @@ -63,7 +63,7 @@ populate() {
>>  	install -d ${DEST}
>>  
>>  	# Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
>> -	install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz
>> +	install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz
>>  
>>  	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
>>  		install -m 0644 ${INITRD} ${DEST}/initrd
> 
>
Nitin A Kamble - July 6, 2012, 5:24 a.m.
ACK, This patch fixes the build. Bitbake is able to complete the creation of the bootable images.

Nitin


> -----Original Message-----
> From: Darren Hart [mailto:dvhart@linux.intel.com]
> Sent: Thursday, July 05, 2012 11:39 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Darren Hart; Zanussi, Tom; Wold, Saul; Kamble, Nitin A
> Subject: [PATCH] bootimg: Use STAGING_KERNEL_DIR
> 
> bootimg.bbclass using STAGING_DIR_HOST/kernel instead of
> STAGING_KERNEL_DIR, resulting in build failure of live images.
> 
> | install: cannot stat
> | `/usr/local/dev/yocto/fishriver-test/build/tmp/sysroots/fishriver/kern
> | el/bzImage': No such file or directory
> 
> Replace it with STAGING_KERNEL_DIR.
> 
> UNTESTED - PLEASE TEST PRIOR TO PULL.
> 
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> CC: tom.zanussi@intel.com
> CC: saul.wold@intel.com
> CC: nitin.a.kamble@intel.com
> ---
>  meta/classes/bootimg.bbclass |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
> index 370b378..a4c0e8d 100644
> --- a/meta/classes/bootimg.bbclass
> +++ b/meta/classes/bootimg.bbclass
> @@ -63,7 +63,7 @@ populate() {
>  	install -d ${DEST}
> 
>  	# Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
> -	install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage
> ${DEST}/vmlinuz
> +	install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz
> 
>  	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
>  		install -m 0644 ${INITRD} ${DEST}/initrd
> --
> 1.7.10.4
Richard Purdie - July 6, 2012, 8:39 a.m.
On Thu, 2012-07-05 at 14:29 -0700, Darren Hart wrote:
> 
> On 07/05/2012 01:06 PM, Tom Zanussi wrote:
> > On Thu, 2012-07-05 at 11:08 -0700, Darren Hart wrote:
> >> bootimg.bbclass using STAGING_DIR_HOST/kernel instead of
> >> STAGING_KERNEL_DIR, resulting in build failure of live images.
> >>
> >> | install: cannot stat `/usr/local/dev/yocto/fishriver-test/build/tmp/sysroots/fishriver/kernel/bzImage': No such file or directory
> >>
> >> Replace it with STAGING_KERNEL_DIR.
> >>
> >> UNTESTED - PLEASE TEST PRIOR TO PULL.
> > 
> > Fixed the build problem here.
> > 
> > Tested-by: Tom Zanussi <tom.zanussi@intel.com>
> 
> Great. I'm getting bags packed and kids ready to go. Can someone please
> pull this one in and clean up the commit log to remove the UNTESTED line
> and add Tom's Tested-by?

Done, thanks!

Richard

Patch

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 370b378..a4c0e8d 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -63,7 +63,7 @@  populate() {
 	install -d ${DEST}
 
 	# Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
-	install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz
+	install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz
 
 	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
 		install -m 0644 ${INITRD} ${DEST}/initrd