Patchwork [meta-oe,for-danny] kernel bbclass: return to original directory in do_deploy

login
register
mail settings
Submitter chase maupin
Date March 18, 2013, 5:50 p.m.
Message ID <1363629028-6920-1-git-send-email-Chase.Maupin@ti.com>
Download mbox | patch
Permalink /patch/46407/
State Accepted, archived
Headers show

Comments

chase maupin - March 18, 2013, 5:50 p.m.
* 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!

  This fix has also been picked up in the oe-core kernel.bbclass:

  http://cgit.openembedded.org/openembedded-core/commit/?id=fd5d80ab1a405cb4ef94f2cde25f8c251da490f0

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
 meta-oe/classes/kernel.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
chase maupin - March 22, 2013, 1:23 p.m.
Ping on this patch.  I did not submit for master since the master branch has already removed the kernel.bbclass.


> -----Original Message-----
> From: Maupin, Chase
> Sent: Monday, March 18, 2013 12:50 PM
> To: openembedded-devel@lists.openembedded.org
> Cc: Maupin, Chase
> Subject: [oe][meta-oe][PATCH][for-danny] kernel bbclass: return
> to original directory in do_deploy
> 
> * 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!
> 
>   This fix has also been picked up in the oe-core kernel.bbclass:
> 
>   http://cgit.openembedded.org/openembedded-
> core/commit/?id=fd5d80ab1a405cb4ef94f2cde25f8c251da490f0
> 
> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> ---
>  meta-oe/classes/kernel.bbclass |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/meta-oe/classes/kernel.bbclass b/meta-
> oe/classes/kernel.bbclass
> index 25c5f64..a0f67f9 100644
> --- a/meta-oe/classes/kernel.bbclass
> +++ b/meta-oe/classes/kernel.bbclass
> @@ -546,6 +546,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
chase maupin - March 28, 2013, 7:18 p.m.
Ping again.  Is this patch OK for danny?

> -----Original Message-----
> From: Maupin, Chase
> Sent: Friday, March 22, 2013 8:24 AM
> To: Maupin, Chase; openembedded-devel@lists.openembedded.org
> Subject: RE: [oe][meta-oe][PATCH][for-danny] kernel bbclass:
> return to original directory in do_deploy
> 
> Ping on this patch.  I did not submit for master since the master
> branch has already removed the kernel.bbclass.
> 
> 
> > -----Original Message-----
> > From: Maupin, Chase
> > Sent: Monday, March 18, 2013 12:50 PM
> > To: openembedded-devel@lists.openembedded.org
> > Cc: Maupin, Chase
> > Subject: [oe][meta-oe][PATCH][for-danny] kernel bbclass: return
> > to original directory in do_deploy
> >
> > * 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!
> >
> >   This fix has also been picked up in the oe-core
> kernel.bbclass:
> >
> >   http://cgit.openembedded.org/openembedded-
> > core/commit/?id=fd5d80ab1a405cb4ef94f2cde25f8c251da490f0
> >
> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> > ---
> >  meta-oe/classes/kernel.bbclass |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/meta-oe/classes/kernel.bbclass b/meta-
> > oe/classes/kernel.bbclass
> > index 25c5f64..a0f67f9 100644
> > --- a/meta-oe/classes/kernel.bbclass
> > +++ b/meta-oe/classes/kernel.bbclass
> > @@ -546,6 +546,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
Eric BENARD - March 28, 2013, 8:50 p.m.
Le Thu, 28 Mar 2013 19:18:52 +0000,
"Maupin, Chase" <chase.maupin@ti.com> a écrit :

> Ping again.  Is this patch OK for danny?
> 
pushed to danny-next.

Eric
chase maupin - March 28, 2013, 9:33 p.m.
> -----Original Message-----

> From: Eric Bénard [mailto:eric@eukrea.com]

> Sent: Thursday, March 28, 2013 3:51 PM

> To: openembedded-devel@lists.openembedded.org

> Cc: Maupin, Chase

> Subject: Re: [oe] [meta-oe][PATCH][for-danny] kernel bbclass:

> return to original directory in do_deploy

> 

> Le Thu, 28 Mar 2013 19:18:52 +0000,

> "Maupin, Chase" <chase.maupin@ti.com> a écrit :

> 

> > Ping again.  Is this patch OK for danny?

> >

> pushed to danny-next.


Thanks Eric

> 

> Eric

Patch

diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 25c5f64..a0f67f9 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -546,6 +546,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}"