| Submitter | chase maupin |
|---|---|
| Date | March 18, 2013, 5:39 p.m. |
| Message ID | <1363628359-18023-1-git-send-email-Chase.Maupin@ti.com> |
| Download | mbox | patch |
| Permalink | /patch/46405/ |
| State | New |
| Headers | show |
Comments
Ping. Ross, is it in your queue for your next danny merge?
> -----Original Message----- > From: Denys Dmytriyenko [mailto:denis@denix.org] > Sent: Wednesday, April 10, 2013 6:02 PM > To: Maupin, Chase > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: return > to original directory in do_deploy > > Ping. > > Ross, is it in your queue for your next danny merge? I see that one as already being commited to danny > > -- > Denys > > > On Mon, Mar 18, 2013 at 12:39:19PM -0500, Chase Maupin wrote: > > * During the base kernel_do_deploy function the directory is > > changed to DEPLOYDIR in order to do some cleanup and > symlinking. > > However, the directory is not changed back to the original > > starting directory ${S} at the end. For append functions > this > > means that the starting directory is not ${S} as expected but > > instead ${DEPLOYDIR}. > > > > For functions like the do_deploy_append in > > recipes-kernel/linux/linux-dtb.inc there is an assumption > that > > you are still in the source directory and not the DEPLOYDIR. > > Without this change the .dtb files are not copied because the > > check for the existence of ${DTS_FILE} which is a relative > > path from the ${S} directory fails. This means that the .dtb > > files are not copied into the deploy directory and > subsequently > > the deploy/images directory. > > > > In the log.do_deploy file you will see lines like: > > > > Warning: arch/arm/boot/dts/xxxxx.dts is not available! > > > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> > > --- > > meta/classes/kernel.bbclass | 1 + > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > diff --git a/meta/classes/kernel.bbclass > b/meta/classes/kernel.bbclass > > index 88ce561..9691c25 100644 > > --- a/meta/classes/kernel.bbclass > > +++ b/meta/classes/kernel.bbclass > > @@ -529,6 +529,7 @@ kernel_do_deploy() { > > ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} > > > > cp ${COREBASE}/meta/files/deploydir_readme.txt > ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt > > + cd - > > } > > do_deploy[dirs] = "${DEPLOYDIR} ${B}" > > > > -- > > 1.7.0.4 > > > > > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi- > bin/mailman/listinfo/openembedded-core
On Thu, Apr 11, 2013 at 12:43:30PM +0000, Maupin, Chase wrote: > > -----Original Message----- > > From: Denys Dmytriyenko [mailto:denis@denix.org] > > Sent: Wednesday, April 10, 2013 6:02 PM > > To: Maupin, Chase > > Cc: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: return > > to original directory in do_deploy > > > > Ping. > > > > Ross, is it in your queue for your next danny merge? > > I see that one as already being commited to danny Hmm, where? I don't see it here: http://cgit.openembedded.org/openembedded-core/log/?h=danny > > On Mon, Mar 18, 2013 at 12:39:19PM -0500, Chase Maupin wrote: > > > * During the base kernel_do_deploy function the directory is > > > changed to DEPLOYDIR in order to do some cleanup and > > symlinking. > > > However, the directory is not changed back to the original > > > starting directory ${S} at the end. For append functions > > this > > > means that the starting directory is not ${S} as expected but > > > instead ${DEPLOYDIR}. > > > > > > For functions like the do_deploy_append in > > > recipes-kernel/linux/linux-dtb.inc there is an assumption > > that > > > you are still in the source directory and not the DEPLOYDIR. > > > Without this change the .dtb files are not copied because the > > > check for the existence of ${DTS_FILE} which is a relative > > > path from the ${S} directory fails. This means that the .dtb > > > files are not copied into the deploy directory and > > subsequently > > > the deploy/images directory. > > > > > > In the log.do_deploy file you will see lines like: > > > > > > Warning: arch/arm/boot/dts/xxxxx.dts is not available! > > > > > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> > > > --- > > > meta/classes/kernel.bbclass | 1 + > > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > > > diff --git a/meta/classes/kernel.bbclass > > b/meta/classes/kernel.bbclass > > > index 88ce561..9691c25 100644 > > > --- a/meta/classes/kernel.bbclass > > > +++ b/meta/classes/kernel.bbclass > > > @@ -529,6 +529,7 @@ kernel_do_deploy() { > > > ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} > > > > > > cp ${COREBASE}/meta/files/deploydir_readme.txt > > ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt > > > + cd - > > > } > > > do_deploy[dirs] = "${DEPLOYDIR} ${B}" > > > > > > -- > > > 1.7.0.4 > > > > > > > > > _______________________________________________ > > > Openembedded-core mailing list > > > Openembedded-core@lists.openembedded.org > > > http://lists.linuxtogo.org/cgi- > > bin/mailman/listinfo/openembedded-core >
> -----Original Message----- > From: Denys Dmytriyenko [mailto:denis@denix.org] > Sent: Thursday, April 11, 2013 8:14 AM > To: Maupin, Chase > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: return > to original directory in do_deploy > > On Thu, Apr 11, 2013 at 12:43:30PM +0000, Maupin, Chase wrote: > > > -----Original Message----- > > > From: Denys Dmytriyenko [mailto:denis@denix.org] > > > Sent: Wednesday, April 10, 2013 6:02 PM > > > To: Maupin, Chase > > > Cc: openembedded-core@lists.openembedded.org > > > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: > return > > > to original directory in do_deploy > > > > > > Ping. > > > > > > Ross, is it in your queue for your next danny merge? > > > > I see that one as already being commited to danny > > Hmm, where? I don't see it here: > > http://cgit.openembedded.org/openembedded-core/log/?h=danny http://cgit.openembedded.org/meta-openembedded/commit/?id=0738c3c8089480dec9e26d7de08c35ba8106b15a > > > > > On Mon, Mar 18, 2013 at 12:39:19PM -0500, Chase Maupin wrote: > > > > * During the base kernel_do_deploy function the directory > is > > > > changed to DEPLOYDIR in order to do some cleanup and > > > symlinking. > > > > However, the directory is not changed back to the > original > > > > starting directory ${S} at the end. For append functions > > > this > > > > means that the starting directory is not ${S} as expected > but > > > > instead ${DEPLOYDIR}. > > > > > > > > For functions like the do_deploy_append in > > > > recipes-kernel/linux/linux-dtb.inc there is an assumption > > > that > > > > you are still in the source directory and not the > DEPLOYDIR. > > > > Without this change the .dtb files are not copied because > the > > > > check for the existence of ${DTS_FILE} which is a > relative > > > > path from the ${S} directory fails. This means that the > .dtb > > > > files are not copied into the deploy directory and > > > subsequently > > > > the deploy/images directory. > > > > > > > > In the log.do_deploy file you will see lines like: > > > > > > > > Warning: arch/arm/boot/dts/xxxxx.dts is not available! > > > > > > > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> > > > > --- > > > > meta/classes/kernel.bbclass | 1 + > > > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > > > > > diff --git a/meta/classes/kernel.bbclass > > > b/meta/classes/kernel.bbclass > > > > index 88ce561..9691c25 100644 > > > > --- a/meta/classes/kernel.bbclass > > > > +++ b/meta/classes/kernel.bbclass > > > > @@ -529,6 +529,7 @@ kernel_do_deploy() { > > > > ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin > ${KERNEL_IMAGETYPE} > > > > > > > > cp ${COREBASE}/meta/files/deploydir_readme.txt > > > ${DEPLOYDIR}/README_- > _DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt > > > > + cd - > > > > } > > > > do_deploy[dirs] = "${DEPLOYDIR} ${B}" > > > > > > > > -- > > > > 1.7.0.4 > > > > > > > > > > > > _______________________________________________ > > > > Openembedded-core mailing list > > > > Openembedded-core@lists.openembedded.org > > > > http://lists.linuxtogo.org/cgi- > > > bin/mailman/listinfo/openembedded-core > >
> -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org > [mailto:openembedded-core-bounces@lists.openembedded.org] On > Behalf Of Maupin, Chase > Sent: Thursday, April 11, 2013 8:41 AM > To: Denys Dmytriyenko > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: return > to original directory in do_deploy > > > -----Original Message----- > > From: Denys Dmytriyenko [mailto:denis@denix.org] > > Sent: Thursday, April 11, 2013 8:14 AM > > To: Maupin, Chase > > Cc: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: > return > > to original directory in do_deploy > > > > On Thu, Apr 11, 2013 at 12:43:30PM +0000, Maupin, Chase wrote: > > > > -----Original Message----- > > > > From: Denys Dmytriyenko [mailto:denis@denix.org] > > > > Sent: Wednesday, April 10, 2013 6:02 PM > > > > To: Maupin, Chase > > > > Cc: openembedded-core@lists.openembedded.org > > > > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: > > return > > > > to original directory in do_deploy > > > > > > > > Ping. > > > > > > > > Ross, is it in your queue for your next danny merge? > > > > > > I see that one as already being commited to danny > > > > Hmm, where? I don't see it here: > > > > http://cgit.openembedded.org/openembedded-core/log/?h=danny > > http://cgit.openembedded.org/meta- > openembedded/commit/?id=0738c3c8089480dec9e26d7de08c35ba8106b15a Nevermind. I remember now that this was in 3 places. Oe-core master Oe-core danny Meta-openembedded danny So you are right that the oe-core danny commit seems to be missing. > > > > > > > > > On Mon, Mar 18, 2013 at 12:39:19PM -0500, Chase Maupin > wrote: > > > > > * During the base kernel_do_deploy function the directory > > is > > > > > changed to DEPLOYDIR in order to do some cleanup and > > > > symlinking. > > > > > However, the directory is not changed back to the > > original > > > > > starting directory ${S} at the end. For append > functions > > > > this > > > > > means that the starting directory is not ${S} as > expected > > but > > > > > instead ${DEPLOYDIR}. > > > > > > > > > > For functions like the do_deploy_append in > > > > > recipes-kernel/linux/linux-dtb.inc there is an > assumption > > > > that > > > > > you are still in the source directory and not the > > DEPLOYDIR. > > > > > Without this change the .dtb files are not copied > because > > the > > > > > check for the existence of ${DTS_FILE} which is a > > relative > > > > > path from the ${S} directory fails. This means that > the > > .dtb > > > > > files are not copied into the deploy directory and > > > > subsequently > > > > > the deploy/images directory. > > > > > > > > > > In the log.do_deploy file you will see lines like: > > > > > > > > > > Warning: arch/arm/boot/dts/xxxxx.dts is not > available! > > > > > > > > > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> > > > > > --- > > > > > meta/classes/kernel.bbclass | 1 + > > > > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > > > > > > > diff --git a/meta/classes/kernel.bbclass > > > > b/meta/classes/kernel.bbclass > > > > > index 88ce561..9691c25 100644 > > > > > --- a/meta/classes/kernel.bbclass > > > > > +++ b/meta/classes/kernel.bbclass > > > > > @@ -529,6 +529,7 @@ kernel_do_deploy() { > > > > > ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin > > ${KERNEL_IMAGETYPE} > > > > > > > > > > cp ${COREBASE}/meta/files/deploydir_readme.txt > > > > ${DEPLOYDIR}/README_- > > _DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt > > > > > + cd - > > > > > } > > > > > do_deploy[dirs] = "${DEPLOYDIR} ${B}" > > > > > > > > > > -- > > > > > 1.7.0.4 > > > > > > > > > > > > > > > _______________________________________________ > > > > > Openembedded-core mailing list > > > > > Openembedded-core@lists.openembedded.org > > > > > http://lists.linuxtogo.org/cgi- > > > > bin/mailman/listinfo/openembedded-core > > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded- > core
> -----Original Message----- > From: Maupin, Chase > Sent: Thursday, April 11, 2013 8:44 AM > To: Maupin, Chase; Denys Dmytriyenko > Cc: openembedded-core@lists.openembedded.org > Subject: RE: [OE-core] [PATCH][for-danny] kernel bbclass: return > to original directory in do_deploy > > > -----Original Message----- > > From: openembedded-core-bounces@lists.openembedded.org > > [mailto:openembedded-core-bounces@lists.openembedded.org] On > > Behalf Of Maupin, Chase > > Sent: Thursday, April 11, 2013 8:41 AM > > To: Denys Dmytriyenko > > Cc: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: > return > > to original directory in do_deploy > > > > > -----Original Message----- > > > From: Denys Dmytriyenko [mailto:denis@denix.org] > > > Sent: Thursday, April 11, 2013 8:14 AM > > > To: Maupin, Chase > > > Cc: openembedded-core@lists.openembedded.org > > > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: > > return > > > to original directory in do_deploy > > > > > > On Thu, Apr 11, 2013 at 12:43:30PM +0000, Maupin, Chase > wrote: > > > > > -----Original Message----- > > > > > From: Denys Dmytriyenko [mailto:denis@denix.org] > > > > > Sent: Wednesday, April 10, 2013 6:02 PM > > > > > To: Maupin, Chase > > > > > Cc: openembedded-core@lists.openembedded.org > > > > > Subject: Re: [OE-core] [PATCH][for-danny] kernel bbclass: > > > return > > > > > to original directory in do_deploy > > > > > > > > > > Ping. > > > > > > > > > > Ross, is it in your queue for your next danny merge? > > > > > > > > I see that one as already being commited to danny > > > > > > Hmm, where? I don't see it here: > > > > > > http://cgit.openembedded.org/openembedded-core/log/?h=danny > > > > http://cgit.openembedded.org/meta- > > > openembedded/commit/?id=0738c3c8089480dec9e26d7de08c35ba8106b15a > > Nevermind. I remember now that this was in 3 places. > > Oe-core master > Oe-core danny > Meta-openembedded danny > > So you are right that the oe-core danny commit seems to be > missing. So the ping from Denys stands. Any update on this? > > > > > > > > > > > > > > On Mon, Mar 18, 2013 at 12:39:19PM -0500, Chase Maupin > > wrote: > > > > > > * During the base kernel_do_deploy function the > directory > > > is > > > > > > changed to DEPLOYDIR in order to do some cleanup and > > > > > symlinking. > > > > > > However, the directory is not changed back to the > > > original > > > > > > starting directory ${S} at the end. For append > > functions > > > > > this > > > > > > means that the starting directory is not ${S} as > > expected > > > but > > > > > > instead ${DEPLOYDIR}. > > > > > > > > > > > > For functions like the do_deploy_append in > > > > > > recipes-kernel/linux/linux-dtb.inc there is an > > assumption > > > > > that > > > > > > you are still in the source directory and not the > > > DEPLOYDIR. > > > > > > Without this change the .dtb files are not copied > > because > > > the > > > > > > check for the existence of ${DTS_FILE} which is a > > > relative > > > > > > path from the ${S} directory fails. This means that > > the > > > .dtb > > > > > > files are not copied into the deploy directory and > > > > > subsequently > > > > > > the deploy/images directory. > > > > > > > > > > > > In the log.do_deploy file you will see lines like: > > > > > > > > > > > > Warning: arch/arm/boot/dts/xxxxx.dts is not > > available! > > > > > > > > > > > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> > > > > > > --- > > > > > > meta/classes/kernel.bbclass | 1 + > > > > > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > > > > > > > > > diff --git a/meta/classes/kernel.bbclass > > > > > b/meta/classes/kernel.bbclass > > > > > > index 88ce561..9691c25 100644 > > > > > > --- a/meta/classes/kernel.bbclass > > > > > > +++ b/meta/classes/kernel.bbclass > > > > > > @@ -529,6 +529,7 @@ kernel_do_deploy() { > > > > > > ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin > > > ${KERNEL_IMAGETYPE} > > > > > > > > > > > > cp ${COREBASE}/meta/files/deploydir_readme.txt > > > > > ${DEPLOYDIR}/README_- > > > _DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt > > > > > > + cd - > > > > > > } > > > > > > do_deploy[dirs] = "${DEPLOYDIR} ${B}" > > > > > > > > > > > > -- > > > > > > 1.7.0.4 > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > > Openembedded-core mailing list > > > > > > Openembedded-core@lists.openembedded.org > > > > > > http://lists.linuxtogo.org/cgi- > > > > > bin/mailman/listinfo/openembedded-core > > > > > > > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi- > bin/mailman/listinfo/openembedded- > > core
Patch
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 88ce561..9691c25 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -529,6 +529,7 @@ kernel_do_deploy() { ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt + cd - } do_deploy[dirs] = "${DEPLOYDIR} ${B}"
* During the base kernel_do_deploy function the directory is changed to DEPLOYDIR in order to do some cleanup and symlinking. However, the directory is not changed back to the original starting directory ${S} at the end. For append functions this means that the starting directory is not ${S} as expected but instead ${DEPLOYDIR}. For functions like the do_deploy_append in recipes-kernel/linux/linux-dtb.inc there is an assumption that you are still in the source directory and not the DEPLOYDIR. Without this change the .dtb files are not copied because the check for the existence of ${DTS_FILE} which is a relative path from the ${S} directory fails. This means that the .dtb files are not copied into the deploy directory and subsequently the deploy/images directory. In the log.do_deploy file you will see lines like: Warning: arch/arm/boot/dts/xxxxx.dts is not available! Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> --- meta/classes/kernel.bbclass | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)