* [PATCH] image_types: fix default location of kernel when generating elf images
@ 2013-05-01 20:24 tf+lists.yocto
2013-05-01 20:29 ` Darren Hart
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: tf+lists.yocto @ 2013-05-01 20:24 UTC (permalink / raw)
To: openembedded-core; +Cc: Tomas Frydrych
From: Tomas Frydrych <tomas@sleepfive.com>
The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/classes/image_types.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 98d31f5..0e1ad3a 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -185,7 +185,7 @@ IMAGE_CMD_cpio () {
cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
}
-ELF_KERNEL ?= "${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE}"
+ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin"
ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console="
IMAGE_CMD_elf () {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] image_types: fix default location of kernel when generating elf images 2013-05-01 20:24 [PATCH] image_types: fix default location of kernel when generating elf images tf+lists.yocto @ 2013-05-01 20:29 ` Darren Hart 2013-05-01 20:51 ` Tomas Frydrych 2013-05-03 11:39 ` [Patch v2] " tf+lists.yocto 2013-05-03 12:18 ` [Patch v3] " Tomas Frydrych 2 siblings, 1 reply; 7+ messages in thread From: Darren Hart @ 2013-05-01 20:29 UTC (permalink / raw) To: tf+lists.yocto; +Cc: Tomas Frydrych, openembedded-core On 05/01/2013 01:24 PM, tf+lists.yocto@r-finger.com wrote: > From: Tomas Frydrych <tomas@sleepfive.com> > > The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. > > Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> > --- > meta/classes/image_types.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass > index 98d31f5..0e1ad3a 100644 > --- a/meta/classes/image_types.bbclass > +++ b/meta/classes/image_types.bbclass > @@ -185,7 +185,7 @@ IMAGE_CMD_cpio () { > cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) > } > > -ELF_KERNEL ?= "${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE}" > +ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" Looks correct, how did this fail before? What was the symptom? > ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" > > IMAGE_CMD_elf () { > -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] image_types: fix default location of kernel when generating elf images 2013-05-01 20:29 ` Darren Hart @ 2013-05-01 20:51 ` Tomas Frydrych 2013-05-03 11:50 ` Richard Purdie 0 siblings, 1 reply; 7+ messages in thread From: Tomas Frydrych @ 2013-05-01 20:51 UTC (permalink / raw) To: Darren Hart; +Cc: openembedded-core On 01/05/13 21:29, Darren Hart wrote: > > > On 05/01/2013 01:24 PM, tf+lists.yocto@r-finger.com wrote: >> From: Tomas Frydrych <tomas@sleepfive.com> >> >> The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. >> >> Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> >> --- >> meta/classes/image_types.bbclass | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass >> index 98d31f5..0e1ad3a 100644 >> --- a/meta/classes/image_types.bbclass >> +++ b/meta/classes/image_types.bbclass >> @@ -185,7 +185,7 @@ IMAGE_CMD_cpio () { >> cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) >> } >> >> -ELF_KERNEL ?= "${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE}" >> +ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" > > > Looks correct, how did this fail before? What was the symptom? e.g., | Cannot open `...../tmp/sysroots/nuc/kernel/bzImage': (null) Two bugs really, the location has changed, and it was using a kernel that is not machine-specific. I'll make a patch with better commit message tomorrow. Tomas -- http://sleepfive.com ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] image_types: fix default location of kernel when generating elf images 2013-05-01 20:51 ` Tomas Frydrych @ 2013-05-03 11:50 ` Richard Purdie 2013-05-03 12:09 ` Tomas Frydrych 0 siblings, 1 reply; 7+ messages in thread From: Richard Purdie @ 2013-05-03 11:50 UTC (permalink / raw) To: Tomas Frydrych; +Cc: Darren Hart, openembedded-core On Wed, 2013-05-01 at 21:51 +0100, Tomas Frydrych wrote: > On 01/05/13 21:29, Darren Hart wrote: > > > > > > On 05/01/2013 01:24 PM, tf+lists.yocto@r-finger.com wrote: > >> From: Tomas Frydrych <tomas@sleepfive.com> > >> > >> The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. > >> > >> Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> > >> --- > >> meta/classes/image_types.bbclass | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass > >> index 98d31f5..0e1ad3a 100644 > >> --- a/meta/classes/image_types.bbclass > >> +++ b/meta/classes/image_types.bbclass > >> @@ -185,7 +185,7 @@ IMAGE_CMD_cpio () { > >> cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) > >> } > >> > >> -ELF_KERNEL ?= "${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE}" > >> +ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" > > > > > > Looks correct, how did this fail before? What was the symptom? > > e.g., > > | Cannot open `...../tmp/sysroots/nuc/kernel/bzImage': (null) > > Two bugs really, the location has changed, and it was using a kernel > that is not machine-specific. I'll make a patch with better commit > message tomorrow. Just for reference, STAGING_DIR_HOST is machine specific these days. This patch also changes the dependency from do_populate_sysroot (which is encapsulated by DEPENDS) to do_deploy (which is not). Did you account for that? I suspect that fixing the path might be safer than this change... Cheers, Richard ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] image_types: fix default location of kernel when generating elf images 2013-05-03 11:50 ` Richard Purdie @ 2013-05-03 12:09 ` Tomas Frydrych 0 siblings, 0 replies; 7+ messages in thread From: Tomas Frydrych @ 2013-05-03 12:09 UTC (permalink / raw) To: Richard Purdie; +Cc: Darren Hart, openembedded-core On 03/05/13 12:50, Richard Purdie wrote: > On Wed, 2013-05-01 at 21:51 +0100, Tomas Frydrych wrote: >> On 01/05/13 21:29, Darren Hart wrote: >>> >>> >>> On 05/01/2013 01:24 PM, tf+lists.yocto@r-finger.com wrote: >>>> From: Tomas Frydrych <tomas@sleepfive.com> >>>> >>>> The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. >>>> >>>> Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> >>>> --- >>>> meta/classes/image_types.bbclass | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass >>>> index 98d31f5..0e1ad3a 100644 >>>> --- a/meta/classes/image_types.bbclass >>>> +++ b/meta/classes/image_types.bbclass >>>> @@ -185,7 +185,7 @@ IMAGE_CMD_cpio () { >>>> cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) >>>> } >>>> >>>> -ELF_KERNEL ?= "${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE}" >>>> +ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" >>> >>> >>> Looks correct, how did this fail before? What was the symptom? >> >> e.g., >> >> | Cannot open `...../tmp/sysroots/nuc/kernel/bzImage': (null) >> >> Two bugs really, the location has changed, and it was using a kernel >> that is not machine-specific. I'll make a patch with better commit >> message tomorrow. > > Just for reference, STAGING_DIR_HOST is machine specific these days. > > This patch also changes the dependency from do_populate_sysroot (which > is encapsulated by DEPENDS) to do_deploy (which is not). Did you account > for that? > > I suspect that fixing the path might be safer than this change... Right, I see it now, the bzImage is under STAGING_DIR_HOST/usr/src/kernel I shall make another patch. Tomas -- http://sleepfive.com ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Patch v2] image_types: fix default location of kernel when generating elf images 2013-05-01 20:24 [PATCH] image_types: fix default location of kernel when generating elf images tf+lists.yocto 2013-05-01 20:29 ` Darren Hart @ 2013-05-03 11:39 ` tf+lists.yocto 2013-05-03 12:18 ` [Patch v3] " Tomas Frydrych 2 siblings, 0 replies; 7+ messages in thread From: tf+lists.yocto @ 2013-05-03 11:39 UTC (permalink / raw) To: openembedded-core From: Tomas Frydrych <tomas@sleepfive.com> The kernel image is no longer staged into sysroot, so building of elf images fails due to the kernel not being found. Thi commit fixes this by locating the appropriate (i.e., machine-specific) kernel in the DEPLOY_DIR_IMAGE directory instead. Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> --- meta/classes/image_types.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 98d31f5..0e1ad3a 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -185,7 +185,7 @@ IMAGE_CMD_cpio () { cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) } -ELF_KERNEL ?= "${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE}" +ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" IMAGE_CMD_elf () { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Patch v3] image_types: fix default location of kernel when generating elf images 2013-05-01 20:24 [PATCH] image_types: fix default location of kernel when generating elf images tf+lists.yocto 2013-05-01 20:29 ` Darren Hart 2013-05-03 11:39 ` [Patch v2] " tf+lists.yocto @ 2013-05-03 12:18 ` Tomas Frydrych 2 siblings, 0 replies; 7+ messages in thread From: Tomas Frydrych @ 2013-05-03 12:18 UTC (permalink / raw) To: openembedded-core From: Tomas Frydrych <tomas@sleepfive.com> Generation of elf images fails because kernel images are no longer staged under ${STAGING_DIR_HOST}/kernel, but rather ${STAGING_DIR_HOST}/usr/src/kernel. This patch fixes the path to point to the correct location. Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> --- meta/classes/image_types.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 98d31f5..94837ae 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -185,7 +185,7 @@ IMAGE_CMD_cpio () { cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) } -ELF_KERNEL ?= "${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE}" +ELF_KERNEL ?= "${STAGING_DIR_HOST}/usr/src/kernel/${KERNEL_IMAGETYPE}" ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" IMAGE_CMD_elf () { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-05-03 12:36 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-01 20:24 [PATCH] image_types: fix default location of kernel when generating elf images tf+lists.yocto 2013-05-01 20:29 ` Darren Hart 2013-05-01 20:51 ` Tomas Frydrych 2013-05-03 11:50 ` Richard Purdie 2013-05-03 12:09 ` Tomas Frydrych 2013-05-03 11:39 ` [Patch v2] " tf+lists.yocto 2013-05-03 12:18 ` [Patch v3] " Tomas Frydrych
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox