[PATCH] kernel.bbclass: avoid NOTE messages for files that are staged but not packaged

[PATCH] kernel.bbclass: avoid NOTE messages for files that are staged but not packaged

[Frans Meulenbroeks]

copy the files directly from the work area to staging. That way
there are no unpackaged files in image/ so no NOTE messages.
Additional advantage is that it is faster as we save the copy to the image dir.

See also http://thread.gmane.org/gmane.comp.handhelds.openembedded/37487

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Roman I Khimov <khimov@altell.ru>
Tested-by: Petr ?tetiar <ynezz@true.cz>
Acked-by: Eric B?nard <eric@eukrea.com>
---

This is the formal patch, following up the discussion mentioned above
It really works like a charm. Kernel build time is greatly reduced.

If there are no objections, and since there are already 2 acks,
I will push tomorrow my evening (20 hrs or so after posting)
Feel free to add additional acks.

Frans

 classes/kernel.bbclass |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 5f8bc8a..cfb4ad8 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -121,7 +121,12 @@ kernel_do_install() {
                 oe_runmake SUBDIRS="scripts/genksyms"
         fi
 
-	kerneldir=${D}/kernel/
+
+}
+
+sysroot_stage_all_append() {
+
+	kerneldir=${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
 
 	if [ -e include/asm ] ; then
 		# This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels
@@ -200,11 +205,6 @@ kernel_do_install() {
 	cp -fR scripts $kerneldir/
 }
 
-sysroot_stage_all_append() {
-	sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
-	cp -fpPR ${D}/kernel/.config ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
-}
-
 kernel_do_configure() {
 	yes '' | oe_runmake oldconfig
 	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
-- 
1.6.4.2

Re: [PATCH] kernel.bbclass: avoid NOTE messages for files that are staged but not packaged

[Denys Dmytriyenko]

On Wed, Sep 29, 2010 at 10:39:58PM +0200, Frans Meulenbroeks wrote:
> copy the files directly from the work area to staging. That way
> there are no unpackaged files in image/ so no NOTE messages.
> Additional advantage is that it is faster as we save the copy to the image dir.
> 
> See also http://thread.gmane.org/gmane.comp.handhelds.openembedded/37487
> 
> Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
> Acked-by: Roman I Khimov <khimov@altell.ru>
> Tested-by: Petr ?tetiar <ynezz@true.cz>
> Acked-by: Eric B?nard <eric@eukrea.com>

Acked-by: Denys Dmytriyenko <denis@denix.org>

> ---
> 
> This is the formal patch, following up the discussion mentioned above
> It really works like a charm. Kernel build time is greatly reduced.
> 
> If there are no objections, and since there are already 2 acks,
> I will push tomorrow my evening (20 hrs or so after posting)
> Feel free to add additional acks.
> 
> Frans
> 
>  classes/kernel.bbclass |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
> index 5f8bc8a..cfb4ad8 100644
> --- a/classes/kernel.bbclass
> +++ b/classes/kernel.bbclass
> @@ -121,7 +121,12 @@ kernel_do_install() {
>                  oe_runmake SUBDIRS="scripts/genksyms"
>          fi
>  
> -	kerneldir=${D}/kernel/
> +
> +}
> +
> +sysroot_stage_all_append() {
> +
> +	kerneldir=${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
>  
>  	if [ -e include/asm ] ; then
>  		# This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels
> @@ -200,11 +205,6 @@ kernel_do_install() {
>  	cp -fR scripts $kerneldir/
>  }
>  
> -sysroot_stage_all_append() {
> -	sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
> -	cp -fpPR ${D}/kernel/.config ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
> -}
> -
>  kernel_do_configure() {
>  	yes '' | oe_runmake oldconfig
>  	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
> -- 
> 1.6.4.2
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH] kernel.bbclass: avoid NOTE messages for files that are staged but not packaged

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]

Dear Frans,


Am Mittwoch, den 29.09.2010, 22:39 +0200 schrieb Frans Meulenbroeks:
> copy the files directly from the work area to staging. That way
> there are no unpackaged files in image/ so no NOTE messages.
> Additional advantage is that it is faster as we save the copy to the image dir.
> 
> See also http://thread.gmane.org/gmane.comp.handhelds.openembedded/37487
> 
> Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
> Acked-by: Roman I Khimov <khimov@altell.ru>
> Tested-by: Petr ?tetiar <ynezz@true.cz>
> Acked-by: Eric B?nard <eric@eukrea.com>

please fix the special characters when you commit this.

I tried to apply your patch using `pwam.sh 3097` and saw that you
already accidentally had commited this patch in
9a5382aad4e5a3e52fa52722cf5587fdba958e9f [1].

        wpa-supplicant : moved unused files to obsolete dir

Please revert that commit and commit appropriately.

[…]


Thanks,

Paul


[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=9a5382aad4e5a3e52fa52722cf5587fdba958e9f

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] kernel.bbclass: avoid NOTE messages for files that are staged but not packaged

[Frans Meulenbroeks]

2010/9/29 Paul Menzel <paulepanter@users.sourceforge.net>:
> Dear Frans,
>
>
> Am Mittwoch, den 29.09.2010, 22:39 +0200 schrieb Frans Meulenbroeks:
>> copy the files directly from the work area to staging. That way
>> there are no unpackaged files in image/ so no NOTE messages.
>> Additional advantage is that it is faster as we save the copy to the image dir.
>>
>> See also http://thread.gmane.org/gmane.comp.handhelds.openembedded/37487
>>
>> Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
>> Acked-by: Roman I Khimov <khimov@altell.ru>
>> Tested-by: Petr ?tetiar <ynezz@true.cz>
>> Acked-by: Eric B?nard <eric@eukrea.com>
>
> please fix the special characters when you commit this.

Will do, I have just cut'n'pasted the lines. but I agree I was lazy
and it was better to fix this.
>
> I tried to apply your patch using `pwam.sh 3097` and saw that you
> already accidentally had commited this patch in
> 9a5382aad4e5a3e52fa52722cf5587fdba958e9f [1].
>
>        wpa-supplicant : moved unused files to obsolete dir
>
> Please revert that commit and commit appropriately.

Thanks for spotting this. I have already reverted the commit.
Will make a new patch for it.
Guess this accidently got picked up by the wpa-supplicant commit and
went unnoticed.
I'll try to take some more care next time.
apologies for any inconvenience.

Frans

Re: [PATCH] kernel.bbclass: avoid NOTE messages for files that are staged but not packaged

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1953 bytes --]

Am Donnerstag, den 30.09.2010, 08:30 +0200 schrieb Frans Meulenbroeks:
> 2010/9/29 Paul Menzel <paulepanter@users.sourceforge.net>:

> > Am Mittwoch, den 29.09.2010, 22:39 +0200 schrieb Frans Meulenbroeks:
> >> copy the files directly from the work area to staging. That way
> >> there are no unpackaged files in image/ so no NOTE messages.
> >> Additional advantage is that it is faster as we save the copy to the image dir.
> >>
> >> See also http://thread.gmane.org/gmane.comp.handhelds.openembedded/37487
> >>
> >> Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
> >> Acked-by: Roman I Khimov <khimov@altell.ru>
> >> Tested-by: Petr ?tetiar <ynezz@true.cz>
> >> Acked-by: Eric B?nard <eric@eukrea.com>
> >
> > please fix the special characters when you commit this.
> 
> Will do, I have just cut'n'pasted the lines. but I agree I was lazy
> and it was better to fix this.
>
> > I tried to apply your patch using `pwam.sh 3097` and saw that you
> > already accidentally had commited this patch in
> > 9a5382aad4e5a3e52fa52722cf5587fdba958e9f [1].
> >
> >        wpa-supplicant : moved unused files to obsolete dir
> >
> > Please revert that commit and commit appropriately.
> 
> Thanks for spotting this. I have already reverted the commit.

Thank you! The commit ID 285f58b3a48df7c4891afd02c7d9ca041675b41d [2].

> Will make a new patch for it.
> Guess this accidently got picked up by the wpa-supplicant commit and
> went unnoticed.
> I'll try to take some more care next time.
> apologies for any inconvenience.

No apologies needed. It is good to see that you professionals are human
nonetheless.

On the positive side I could still build test the kernel.bbclass change
and it worked for me.

Tested-by: Paul Menzel <paulepanter@users.sourceforge.net>


Thanks,

Paul


[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=285f58b3a48df7c4891afd02c7d9ca041675b41d

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] kernel.bbclass: avoid NOTE messages for files that are staged but not packaged

[Frans Meulenbroeks]

I discovered an issue with this patch.
kerneldir was moved (and modified) from kernel_do_install to
sysroot_stage_all_append.
as the assignment to kerneldir was not used in kernel_do_install it
went unnoticed that some kernel recipes have a do_install_append which
references kerneldir.
I authored a small patch for this, setting kerneldir at the end of
kernel_do_install (with the original value).

I've already pushed it
http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=98037f10625acdc68d35d94dfbce6cafff9fbe99
without the patch at least one of my testing targets would have failed.

Frans