Re: [OE-core] [PATCH] image_types: fix default location of kernel when generating elf images
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.yo...@r-finger.com wrote: From: Tomas Frydrych The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. Signed-off-by: Tomas Frydrych --- 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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: fix default location of kernel when generating elf images
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.yo...@r-finger.com wrote: > >> From: Tomas Frydrych > >> > >> The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. > >> > >> Signed-off-by: Tomas Frydrych > >> --- > >> 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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: fix default location of kernel when generating elf images
On 01/05/13 21:29, Darren Hart wrote: > > > On 05/01/2013 01:24 PM, tf+lists.yo...@r-finger.com wrote: >> From: Tomas Frydrych >> >> The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. >> >> Signed-off-by: Tomas Frydrych >> --- >> 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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: fix default location of kernel when generating elf images
On 05/01/2013 01:24 PM, tf+lists.yo...@r-finger.com wrote: > From: Tomas Frydrych > > The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. > > Signed-off-by: Tomas Frydrych > --- > 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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image_types: fix default location of kernel when generating elf images
From: Tomas Frydrych The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. Signed-off-by: Tomas Frydrych --- 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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core