Skip to contentSkip to conversation

kernel: consolidated pull request

PATCH Superseded Bruce Ashfield 6 participants 22 messages Feb 4, 2014 – Feb 10, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover kernel: consolidated pull request

Richard/Saul,

Consolidated is a bit of a strong word here, since there are only two patches .. but I'd rather send them as a series of my pending changes versus two separate pulls.

Once is an update of the 3.10 tree to include the 3.10 LTSI content, this gets us new BSP support and a few features. The merge was smooth, but I did build and boot all qemu boards to be sure.

The second change is a tweak I made to speed up the kernel installation phase. It's a simple change that saves nearly a minute on my local tests. As the patch states, I kept things simple instead of getting really arcane with find and mixing multiple options (it is already getting unreadible, and I didn't want to make it worse).

From the patch:

    Time for install before this change:

     real    2m48.563s
     user    0m35.220s
     sys     0m33.036s

    Time for install after this change:

     real    1m21.301s
     user    0m33.160s
     sys     0m28.388s

I've been running with the install change for quite some time now, and haven't seen any breakage.

Bruce

The following changes since commit 82f9c2bcff3e977beefde6048d2ba32d17acbbd0:

  wic: Hook up --debug option (2014-02-04 12:57:36 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (2):
kernel: stop using -exec rm for deleting files
linux-yocto/3.10: integrate LTSI

 meta/classes/kernel.bbclass                        | 18 +++++++++++++++---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14 +++++++-------
 4 files changed, 25 insertions(+), 13 deletions(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/2 kernel: stop using -exec rm for deleting files

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

 real    2m48.563s
 user    0m35.220s
 sys     0m33.036s

Time for install after this change:

 real    1m21.301s
 user    0m33.160s
 sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
 meta/classes/kernel.bbclass | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +15 -3
index 51626b03f824..b76a65699755 100644
@@ -260,9 +260,21 @@ kernel_do_install() {
 	# we clean the scripts dir while leaving the generated config
 	# and include files.
 	#
-	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-	make -C $kerneldir _mrproper_scripts
-	find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;
+	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts 
+
+	# hide directories that shouldn't have their .c, s and S files deleted
+	for d in tools scripts lib; do
+		mv $kerneldir/$d $kerneldir/.$d
+	done
+
+	# delete .c, .s and .S files, unless we hid a directory as .<dir>. This technique is 
+	# much faster than find -prune and -exec
+	find . -not -path '*/\.*' -type f -name "*.[csS]" -delete
+
+	# put the hidden dirs back
+	for d in tools scripts lib; do
+		mv $kerneldir/.$d $kerneldir/$d
+	done
 
 	# As of Linux kernel version 3.0.1, the clean target removes
 	# arch/powerpc/lib/crtsavres.o which is present in
Signature · 1 line
1.8.1.2
#2 lore raw

Re: [PATCH 1/2] kernel: stop using -exec rm for deleting files

Quoted 34 lines · Bruce Ashfield

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

 real    2m48.563s
 user    0m35.220s
 sys     0m33.036s

Time for install after this change:

 real    1m21.301s
 user    0m33.160s
 sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
 meta/classes/kernel.bbclass | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +0 -0
index 51626b03f824..b76a65699755 100644

meta/classes/kernel.bbclass kernel_do_install() { · line 265

Quoted 6 lines
meta/classes/kernel.bbclass +0 -3
@@ -260,9 +260,21 @@ kernel_do_install() {
 	# we clean the scripts dir while leaving the generated config
 	# and include files.
 	#
-	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-	make -C $kerneldir _mrproper_scripts
-	find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;

If we wanted to keep the single expression like this, we could do something like:

find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -print0 | xargs -0 rm -f

?

I don't have strong feelings about it, I'm just curious if you tried it really. The xargs should batch things up enough that the fork overhead is much less.

Cheers,

Richard

Quoted 18 lines
meta/classes/kernel.bbclass +15 -0
+	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts 
+
+	# hide directories that shouldn't have their .c, s and S files deleted
+	for d in tools scripts lib; do
+		mv $kerneldir/$d $kerneldir/.$d
+	done
+
+	# delete .c, .s and .S files, unless we hid a directory as .<dir>. This technique is 
+	# much faster than find -prune and -exec
+	find . -not -path '*/\.*' -type f -name "*.[csS]" -delete
+
+	# put the hidden dirs back
+	for d in tools scripts lib; do
+		mv $kerneldir/.$d $kerneldir/$d
+	done
 
 	# As of Linux kernel version 3.0.1, the clean target removes
 	# arch/powerpc/lib/crtsavres.o which is present in
#3 lore raw

Re: [PATCH 1/2] kernel: stop using -exec rm for deleting files

Quoted 45 lines · Richard Purdie
Quoted 34 lines · Bruce Ashfield

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

 real    2m48.563s
 user    0m35.220s
 sys     0m33.036s

Time for install after this change:

 real    1m21.301s
 user    0m33.160s
 sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
 meta/classes/kernel.bbclass | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +0 -0
index 51626b03f824..b76a65699755 100644

meta/classes/kernel.bbclass kernel_do_install() { · line 265

Quoted 6 lines
meta/classes/kernel.bbclass +0 -3
@@ -260,9 +260,21 @@ kernel_do_install() {
      # we clean the scripts dir while leaving the generated config
      # and include files.
      #
-     oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-     make -C $kerneldir _mrproper_scripts
-     find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;

If we wanted to keep the single expression like this, we could do something like:

Quoted 7 lines

find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -print0 | xargs -0 rm -f

?

I don't have strong feelings about it, I'm just curious if you tried it really. The xargs should batch things up enough that the fork overhead is much less.

I did try xargs, and a few other things in between. I had a 7 hour plane flight to look into this (and packaging overhead .. that's next) and I tried a few other
techniques. As I hinted in my commit message, the fastest is to actually locate the files with perl and calling unlink() directly .. but that's even more of
a departure from what we had before :)

find, prune and friends get so unreadable, that when I found the faster way, I tossed them in the bin and didn't look back!

Cheers,

Bruce

Quoted 30 lines

Cheers,

Richard

Quoted 8 lines
meta/classes/kernel.bbclass +8 -0
+     oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts
+
+     # hide directories that shouldn't have their .c, s and S files deleted
+     for d in tools scripts lib; do
+             mv $kerneldir/$d $kerneldir/.$d
+     done
+
+     # delete .c, .s and .S files, unless we hid a directory as .<dir>. This technique is

meta/classes/kernel.bbclass kernel_do_install() { · line 280

Quoted 10 lines
meta/classes/kernel.bbclass +7 -0
+     # much faster than find -prune and -exec
+     find . -not -path '*/\.*' -type f -name "*.[csS]" -delete
+
+     # put the hidden dirs back
+     for d in tools scripts lib; do
+             mv $kerneldir/.$d $kerneldir/$d
+     done
 
      # As of Linux kernel version 3.0.1, the clean target removes
      # arch/powerpc/lib/crtsavres.o which is present in

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#4 lore raw

Re: [PATCH 1/2] kernel: stop using -exec rm for deleting files

Quoted 63 lines · Bruce Ashfield
Quoted 45 lines · Richard Purdie
Quoted 34 lines · Bruce Ashfield

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

 real    2m48.563s
 user    0m35.220s
 sys     0m33.036s

Time for install after this change:

 real    1m21.301s
 user    0m33.160s
 sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
 meta/classes/kernel.bbclass | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +0 -0
index 51626b03f824..b76a65699755 100644

meta/classes/kernel.bbclass kernel_do_install() { · line 265

Quoted 6 lines
meta/classes/kernel.bbclass +0 -3
@@ -260,9 +260,21 @@ kernel_do_install() {
      # we clean the scripts dir while leaving the generated config
      # and include files.
      #
-     oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-     make -C $kerneldir _mrproper_scripts
-     find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;

If we wanted to keep the single expression like this, we could do something like:

Quoted 7 lines

find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -print0 | xargs -0 rm -f

?

I don't have strong feelings about it, I'm just curious if you tried it really. The xargs should batch things up enough that the fork overhead is much less.

I did try xargs, and a few other things in between. I had a 7 hour plane flight to look into this (and packaging overhead .. that's next) and I tried a few other
techniques. As I hinted in my commit message, the fastest is to actually locate the files with perl and calling unlink() directly .. but that's even more of
a departure from what we had before :)

Quoted 3 lines

find, prune and friends get so unreadable, that when I found the faster way, I tossed them in the bin and didn't look back!

How does """find $kerneldir -not -regex $kerneldir'/\(lib\|tools\|scripts)/.*' -type f -name "*.[csS]" -delete""" stack up?

Signature · 4 lines
Paul Barker

Email: [email protected]
http://www.paulbarker.me.uk
#5 lore raw

Re: [PATCH 1/2] kernel: stop using -exec rm for deleting files

Quoted 64 lines · Paul Barker
Quoted 63 lines · Bruce Ashfield
Quoted 45 lines · Richard Purdie
Quoted 34 lines · Bruce Ashfield

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

 real    2m48.563s
 user    0m35.220s
 sys     0m33.036s

Time for install after this change:

 real    1m21.301s
 user    0m33.160s
 sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
 meta/classes/kernel.bbclass | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +0 -0
index 51626b03f824..b76a65699755 100644

meta/classes/kernel.bbclass kernel_do_install() { · line 265

Quoted 6 lines
meta/classes/kernel.bbclass +0 -3
@@ -260,9 +260,21 @@ kernel_do_install() {
      # we clean the scripts dir while leaving the generated config
      # and include files.
      #
-     oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-     make -C $kerneldir _mrproper_scripts
-     find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;

If we wanted to keep the single expression like this, we could do something like:

Quoted 7 lines

find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -print0 | xargs -0 rm -f

?

I don't have strong feelings about it, I'm just curious if you tried it really. The xargs should batch things up enough that the fork overhead is much less.

I did try xargs, and a few other things in between. I had a 7 hour plane flight to look into this (and packaging overhead .. that's next) and I tried a few other
techniques. As I hinted in my commit message, the fastest is to actually locate the files with perl and calling unlink() directly .. but that's even more of
a departure from what we had before :)

Quoted 7 lines
Quoted 3 lines

find, prune and friends get so unreadable, that when I found the faster way, I tossed them in the bin and didn't look back!

How does """find $kerneldir -not -regex $kerneldir'/\(lib\|tools\|scripts)/.*' -type f -name "*.[csS]" -delete""" stack up?

timewise it is similar, but I could have cooked that up myself .. I just don't like incantations of find and its arcane options.

Bruce

Quoted 6 lines

--
Paul Barker

Email: [email protected]
http://www.paulbarker.me.uk

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#6 lore raw

Re: [PATCH 1/2] kernel: stop using -exec rm for deleting files

In reply to Bruce Ashfield
Quoted 48 lines · Bruce Ashfield

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

 real    2m48.563s
 user    0m35.220s
 sys     0m33.036s

Time for install after this change:

 real    1m21.301s
 user    0m33.160s
 sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
 meta/classes/kernel.bbclass | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +8 -3
index 51626b03f824..b76a65699755 100644
@@ -260,9 +260,21 @@ kernel_do_install() {
 	# we clean the scripts dir while leaving the generated config
 	# and include files.
 	#
-	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-	make -C $kerneldir _mrproper_scripts
-	find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;
+	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts 
+
+	# hide directories that shouldn't have their .c, s and S files deleted
+	for d in tools scripts lib; do
+		mv $kerneldir/$d $kerneldir/.$d
+	done
+
+	# delete .c, .s and .S files, unless we hid a directory as .<dir>. This technique is 

meta/classes/kernel.bbclass kernel_do_install() { · line 280

Quoted 10 lines
meta/classes/kernel.bbclass +7 -0
+	# much faster than find -prune and -exec
+	find . -not -path '*/\.*' -type f -name "*.[csS]" -delete
+
+	# put the hidden dirs back
+	for d in tools scripts lib; do
+		mv $kerneldir/.$d $kerneldir/$d
+	done
 
 	# As of Linux kernel version 3.0.1, the clean target removes
 	# arch/powerpc/lib/crtsavres.o which is present in

I think this patch is resulting in:

http://autobuilder.yoctoproject.org/main/builders/nightly-fsl-ppc-lsb/builds/22/steps/BuildImages/logs/stdio

Cheers,

Richard

#7 lore raw

Re: [PATCH 1/2] kernel: stop using -exec rm for deleting files

Quoted 57 lines · Richard Purdie
Quoted 56 lines · Bruce Ashfield

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

 real    2m48.563s
 user    0m35.220s
 sys     0m33.036s

Time for install after this change:

 real    1m21.301s
 user    0m33.160s
 sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
 meta/classes/kernel.bbclass | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +15 -3
index 51626b03f824..b76a65699755 100644
@@ -260,9 +260,21 @@ kernel_do_install() {
      # we clean the scripts dir while leaving the generated config
      # and include files.
      #
-     oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-     make -C $kerneldir _mrproper_scripts
-     find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;
+     oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts
+
+     # hide directories that shouldn't have their .c, s and S files deleted
+     for d in tools scripts lib; do
+             mv $kerneldir/$d $kerneldir/.$d
+     done
+
+     # delete .c, .s and .S files, unless we hid a directory as .<dir>. This technique is
+     # much faster than find -prune and -exec
+     find . -not -path '*/\.*' -type f -name "*.[csS]" -delete
+
+     # put the hidden dirs back
+     for d in tools scripts lib; do
+             mv $kerneldir/.$d $kerneldir/$d
+     done
 
Quoted 8 lines

meta/classes/kernel.bbclass kernel_do_install() { · line 280

Quoted 2 lines
meta/classes/kernel.bbclass +0 -0
      # As of Linux kernel version 3.0.1, the clean target removes
      # arch/powerpc/lib/crtsavres.o which is present in

I think this patch is resulting in:

http://autobuilder.yoctoproject.org/main/builders/nightly-fsl-ppc-lsb/builds/22/steps/BuildImages/logs/stdio

Could be. I'll launch a build and see if it happens here as well.

Bruce

Quoted 10 lines

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#8 lore raw

Re: [PATCH 1/2] kernel: stop using -exec rm for deleting files

In reply to Richard Purdie
Quoted 57 lines · Richard Purdie
Quoted 56 lines · Bruce Ashfield

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

  real    2m48.563s
  user    0m35.220s
  sys     0m33.036s

Time for install after this change:

  real    1m21.301s
  user    0m33.160s
  sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
  meta/classes/kernel.bbclass | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +15 -3
index 51626b03f824..b76a65699755 100644
@@ -260,9 +260,21 @@ kernel_do_install() {
  	# we clean the scripts dir while leaving the generated config
  	# and include files.
  	#
-	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-	make -C $kerneldir _mrproper_scripts
-	find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;
+	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts
+
+	# hide directories that shouldn't have their .c, s and S files deleted
+	for d in tools scripts lib; do
+		mv $kerneldir/$d $kerneldir/.$d
+	done
+
+	# delete .c, .s and .S files, unless we hid a directory as .<dir>. This technique is
+	# much faster than find -prune and -exec
+	find . -not -path '*/\.*' -type f -name "*.[csS]" -delete
+
+	# put the hidden dirs back
+	for d in tools scripts lib; do
+		mv $kerneldir/.$d $kerneldir/$d
+	done
 
Quoted 7 lines

meta/classes/kernel.bbclass kernel_do_install() { · line 280

Quoted 2 lines
meta/classes/kernel.bbclass +0 -0
  	# As of Linux kernel version 3.0.1, the clean target removes
  	# arch/powerpc/lib/crtsavres.o which is present in

I think this patch is resulting in:

http://autobuilder.yoctoproject.org/main/builders/nightly-fsl-ppc-lsb/builds/22/steps/BuildImages/logs/stdio

I've reproduced the issue locally, patch should be incoming shortly.

Bruce

Quoted 7 lines

Cheers,

Richard

#9 lore raw

Re: [PATCH 1/2] kernel: stop using -exec rm for deleting files

In reply to Richard Purdie
Quoted 57 lines · Richard Purdie
Quoted 56 lines · Bruce Ashfield

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

  real    2m48.563s
  user    0m35.220s
  sys     0m33.036s

Time for install after this change:

  real    1m21.301s
  user    0m33.160s
  sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
  meta/classes/kernel.bbclass | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +15 -3
index 51626b03f824..b76a65699755 100644
@@ -260,9 +260,21 @@ kernel_do_install() {
  	# we clean the scripts dir while leaving the generated config
  	# and include files.
  	#
-	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-	make -C $kerneldir _mrproper_scripts
-	find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;
+	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts
+
+	# hide directories that shouldn't have their .c, s and S files deleted
+	for d in tools scripts lib; do
+		mv $kerneldir/$d $kerneldir/.$d
+	done
+
+	# delete .c, .s and .S files, unless we hid a directory as .<dir>. This technique is
+	# much faster than find -prune and -exec
+	find . -not -path '*/\.*' -type f -name "*.[csS]" -delete
+
+	# put the hidden dirs back
+	for d in tools scripts lib; do
+		mv $kerneldir/.$d $kerneldir/$d
+	done
 
Quoted 7 lines

meta/classes/kernel.bbclass kernel_do_install() { · line 280

Quoted 2 lines
meta/classes/kernel.bbclass +0 -0
  	# As of Linux kernel version 3.0.1, the clean target removes
  	# arch/powerpc/lib/crtsavres.o which is present in

I think this patch is resulting in:

http://autobuilder.yoctoproject.org/main/builders/nightly-fsl-ppc-lsb/builds/22/steps/BuildImages/logs/stdio

I've fixed this now.

For staged patches, do you prefer a resend or an incremental update patch ?

Bruce

Quoted 7 lines

Cheers,

Richard

#10 lore raw

Re: [PATCH 1/2] kernel: stop using -exec rm for deleting files

Quoted 64 lines · Bruce Ashfield
Quoted 63 lines · Richard Purdie
Quoted 48 lines · Bruce Ashfield

Removing files from the source tree via find, exec and rm is not the most efficient operation, due to (among other things) the many forked processes.

If we use -delete, it saves a significant amount of time. But -delete does not work with -prune (since it forces -depth). To maintain the lib, tools and scripts source files, we can hide them temporarily, skip their hidden directories and then finally restore them.

Time for install before this change:

  real    2m48.563s
  user    0m35.220s
  sys     0m33.036s

Time for install after this change:

  real    1m21.301s
  user    0m33.160s
  sys     0m28.388s

We could further speed this up by using inline perl to delete the files, but that complexity is avoided for now.

---
  meta/classes/kernel.bbclass | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +8 -3
index 51626b03f824..b76a65699755 100644
@@ -260,9 +260,21 @@ kernel_do_install() {
  	# we clean the scripts dir while leaving the generated config
  	# and include files.
  	#
-	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
-	make -C $kerneldir _mrproper_scripts
-	find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;
+	oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts
+
+	# hide directories that shouldn't have their .c, s and S files deleted
+	for d in tools scripts lib; do
+		mv $kerneldir/$d $kerneldir/.$d
+	done
+
+	# delete .c, .s and .S files, unless we hid a directory as .<dir>. This technique is

meta/classes/kernel.bbclass kernel_do_install() { · line 280

Quoted 10 lines
meta/classes/kernel.bbclass +7 -0
+	# much faster than find -prune and -exec
+	find . -not -path '*/\.*' -type f -name "*.[csS]" -delete
+
+	# put the hidden dirs back
+	for d in tools scripts lib; do
+		mv $kerneldir/.$d $kerneldir/$d
+	done
 
  	# As of Linux kernel version 3.0.1, the clean target removes
  	# arch/powerpc/lib/crtsavres.o which is present in

I think this patch is resulting in:

Quoted 5 lines
Quoted 1 line

http://autobuilder.yoctoproject.org/main/builders/nightly-fsl-ppc-lsb/builds/22/steps/BuildImages/logs/stdio

I've fixed this now.

For staged patches, do you prefer a resend or an incremental update patch ?

A resend is fine thanks.

Cheers,

Richard

#11 lore raw

PATCH 2/2 linux-yocto/3.10: integrate LTSI

In reply to Bruce Ashfield

Updating the SRCREVs of the 3.10 tree to reflect the integration of of commit 68054859 from:

git://git.linuxfoundation.org/ltsi-kernegit://git.linuxfoundation.org/ltsi-kernel.git

Build and boot tested on all qemu architectures.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +2 -2
index 9bdd47ecbf65..dd1ec52626d1 100644
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
-SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
+SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
 SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 6defed1c9464..a852f75ff443 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.25"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
 SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +7 -7
index d0772fddc5f1..f7f4dabea8d5 100644
@@ -11,13 +11,13 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e3163012f3e09fe48374ef22bc676f8b19aeec1a"
-SRCREV_machine_qemumips ?= "01a71aaf8e545c3ef88da1fe02f53d1b96a2640e"
-SRCREV_machine_qemuppc ?= "ae1b9115975ff235038d5da22b4cc984b4d76aae"
-SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemux86-64 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemumips64 ?= "67efb2993ec7726df5567e2572fd64e34e29b46d"
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine_qemuarm ?= "2a4d8c0884c8d08896c052a6e42c51e861cf48b5"
+SRCREV_machine_qemumips ?= "08872a160571b9bf45b6cd262b977063f12aca46"
+SRCREV_machine_qemuppc ?= "eba0c4fcc962ffddd384251b5b6ee0c61bd5ea4d"
+SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemux86-64 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
 SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.8.1.2
#12 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

Quoted 58 lines · Bruce Ashfield

Updating the SRCREVs of the 3.10 tree to reflect the integration of of commit 68054859 from:

git://git.linuxfoundation.org/ltsi-kernegit://git.linuxfoundation.org/ltsi-kernel.git

Build and boot tested on all qemu architectures.

---
  meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
  meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
  meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14 +++++++-------
  3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +2 -2
index 9bdd47ecbf65..dd1ec52626d1 100644
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
  KBRANCH = "standard/preempt-rt/base"
  KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
-SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
+SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 6defed1c9464..a852f75ff443 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.25"
 
  KMETA = "meta"
 
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +0 -7
index d0772fddc5f1..f7f4dabea8d5 100644
@@ -11,13 +11,13 @@ KBRANCH_qemux86  = "standard/common-pc/base"
  KBRANCH_qemux86-64  = "standard/common-pc-64/base"
  KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e3163012f3e09fe48374ef22bc676f8b19aeec1a"
-SRCREV_machine_qemumips ?= "01a71aaf8e545c3ef88da1fe02f53d1b96a2640e"
-SRCREV_machine_qemuppc ?= "ae1b9115975ff235038d5da22b4cc984b4d76aae"
-SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemux86-64 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemumips64 ?= "67efb2993ec7726df5567e2572fd64e34e29b46d"
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"

meta/recipes-kernel/linux/linux-yocto_3.10.bb KBRANCH_qemux86 = "standard/common-pc/base" · line 23

Quoted 10 lines
meta/recipes-kernel/linux/linux-yocto_3.10.bb +7 -0
+SRCREV_machine_qemuarm ?= "2a4d8c0884c8d08896c052a6e42c51e861cf48b5"
+SRCREV_machine_qemumips ?= "08872a160571b9bf45b6cd262b977063f12aca46"
+SRCREV_machine_qemuppc ?= "eba0c4fcc962ffddd384251b5b6ee0c61bd5ea4d"
+SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemux86-64 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

This change seems to have introduced an issue with the x86* builds as follows:

Quoted 10 lines
| drivers/built-in.o: In function `gen6_update_ring_freq':
| /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3876: undefined reference to `cpufreq_cpu_get'
| /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3879: undefined reference to `cpufreq_cpu_put'
| make[2]: *** [vmlinux] Error 1
| make[1]: *** [sub-make] Error 2
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| WARNING: /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/temp/run.do_compile.1426:1 exit 1 from
|   exit 1
| ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/temp/log.do_compile.1426)
Quoted 3 lines

NOTE: recipe linux-yocto-3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0: task do_compile: Failed
ERROR: Task 149 (/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/meta/recipes-kernel/linux/linux-yocto_3.10.bb, do_compile) failed with exit code '1'
NOTE: recipe gcc-runtime-4.8.2-r0: task do_compile: Succeeded

This can be seen on the AB http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/20/steps/BuildImages/logs/stdio

This is one example.

Thanks
Sau!

#13 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

Quoted 74 lines · Saul Wold
Quoted 73 lines · Bruce Ashfield

Updating the SRCREVs of the 3.10 tree to reflect the integration of of commit 68054859 from:

git://git.linuxfoundation.org/ltsi-kernegit://git.linuxfoundation.org/ltsi-kernel.git

Build and boot tested on all qemu architectures.

---
  meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
  meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
  meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14 +++++++-------
  3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +2 -2
index 9bdd47ecbf65..dd1ec52626d1 100644
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
  KBRANCH = "standard/preempt-rt/base"
  KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
-SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
+SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 6defed1c9464..a852f75ff443 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.25"
 
  KMETA = "meta"
 
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +7 -7
index d0772fddc5f1..f7f4dabea8d5 100644
@@ -11,13 +11,13 @@ KBRANCH_qemux86  = "standard/common-pc/base"
  KBRANCH_qemux86-64  = "standard/common-pc-64/base"
  KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e3163012f3e09fe48374ef22bc676f8b19aeec1a"
-SRCREV_machine_qemumips ?= "01a71aaf8e545c3ef88da1fe02f53d1b96a2640e"
-SRCREV_machine_qemuppc ?= "ae1b9115975ff235038d5da22b4cc984b4d76aae"
-SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemux86-64 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemumips64 ?= "67efb2993ec7726df5567e2572fd64e34e29b46d"
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine_qemuarm ?= "2a4d8c0884c8d08896c052a6e42c51e861cf48b5"
+SRCREV_machine_qemumips ?= "08872a160571b9bf45b6cd262b977063f12aca46"
+SRCREV_machine_qemuppc ?= "eba0c4fcc962ffddd384251b5b6ee0c61bd5ea4d"
+SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemux86-64 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
Quoted 6 lines
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto_3.10.bb +0 -0
  SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

This change seems to have introduced an issue with the x86* builds as

Adding Darren, since qemux86 builds just fine. We'll need his eyes on the actual failure and fix.

Bruce

Quoted 36 lines

follows:

Quoted 18 lines

| drivers/built-in.o: In function `gen6_update_ring_freq':
| /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3876:
undefined reference to `cpufreq_cpu_get'
| /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3879:
undefined reference to `cpufreq_cpu_put'

| make[2]: *** [vmlinux] Error 1
| make[1]: *** [sub-make] Error 2
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| WARNING:

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/temp/run.do_compile.1426:1 exit 1 from
| exit 1
| ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/temp/log.do_compile.1426)

Quoted 6 lines

NOTE: recipe linux-yocto-3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0:
task do_compile: Failed
ERROR: Task 149 (/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/meta/recipes-kernel/linux/linux-yocto_3.10.bb, do_compile) failed with exit code '1'
NOTE: recipe gcc-runtime-4.8.2-r0: task do_compile: Succeeded

This can be seen on the AB
http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/20/steps/BuildImages/logs/stdio

This is one example.

Thanks
Sau!

#14 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

Nitin - please join me in looking into what's happening here.

Quoted 152 lines · Bruce Ashfield
Quoted 83 lines · Saul Wold
Quoted 82 lines · Bruce Ashfield

Updating the SRCREVs of the 3.10 tree to reflect the integration of of commit 68054859 from:

git://git.linuxfoundation.org/ltsi-kernegit://git.linuxfoundation.org/lt
si-kernel.git

Build and boot tested on all qemu architectures.

---
  meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
  meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
  meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14
+++++++-------
  3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +2 -2
index 9bdd47ecbf65..dd1ec52626d1 100644
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
  KBRANCH = "standard/preempt-rt/base"
  KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
-SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
+SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KB RANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 6defed1c9464..a852f75ff443 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.25"
 
  KMETA = "meta"
 
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +0 -5
index d0772fddc5f1..f7f4dabea8d5 100644
@@ -11,13 +11,13 @@ KBRANCH_qemux86  = "standard/common-pc/base"
  KBRANCH_qemux86-64  = "standard/common-pc-64/base"
  KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e3163012f3e09fe48374ef22bc676f8b19aeec1a"
-SRCREV_machine_qemumips ?= "01a71aaf8e545c3ef88da1fe02f53d1b96a2640e"
-SRCREV_machine_qemuppc ?= "ae1b9115975ff235038d5da22b4cc984b4d76aae"
-SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemux86-64 ?=

"79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemumips64 ?=
"67efb2993ec7726df5567e2572fd64e34e29b46d"

meta/recipes-kernel/linux/linux-yocto_3.10.bb +5 -1
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine_qemuarm ?= "2a4d8c0884c8d08896c052a6e42c51e861cf48b5"
+SRCREV_machine_qemumips ?= "08872a160571b9bf45b6cd262b977063f12aca46"
+SRCREV_machine_qemuppc ?= "eba0c4fcc962ffddd384251b5b6ee0c61bd5ea4d"
+SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemux86-64 ?=

"78d2a615b13a1c307d482eaa9499c1b2dee40599" +SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b" +SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"

Quoted 8 lines
Quoted 6 lines

SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KB RANCH},${KMETA};name=machine,meta"

This change seems to have introduced an issue with the x86* builds as

Adding Darren, since qemux86 builds just fine. We'll need his eyes on the actual failure and fix.

Bruce

Quoted 52 lines

follows:

Quoted 30 lines

| drivers/built-in.o: In function `gen6_update_ring_freq':
|

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/buil d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_ 78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3876:
undefined reference to `cpufreq_cpu_get'
|

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/buil d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_ 78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3879:
undefined reference to `cpufreq_cpu_put'

| make[2]: *** [vmlinux] Error 1
| make[1]: *** [sub-make] Error 2
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| WARNING:

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/buil d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_ 78d2a615b1-r0/temp/run.do_compile.1426:1
exit 1 from
| exit 1
| ERROR: Function failed: do_compile (log file is located at

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/buil d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_ 78d2a615b1-r0/temp/log.do_compile.1426)

Quoted 8 lines

NOTE: recipe linux-yocto-3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0:
task do_compile: Failed
ERROR: Task 149

(/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/met a/recipes-kernel/linux/linux-yocto_3.10.bb,
do_compile) failed with exit code '1'
NOTE: recipe gcc-runtime-4.8.2-r0: task do_compile: Succeeded

This can be seen on the AB

http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/20/s
teps/BuildImages/logs/stdio

This is one example.

Thanks
Sau!

#15 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

Erm, and Nitin Cc'd this time. Sigh. Always a hoot.

Quoted 171 lines · Darren Hart

Nitin - please join me in looking into what's happening here.

Quoted 165 lines · Bruce Ashfield
Quoted 87 lines · Saul Wold
Quoted 86 lines · Bruce Ashfield

Updating the SRCREVs of the 3.10 tree to reflect the integration of of commit 68054859 from:

git://git.linuxfoundation.org/ltsi-kernegit://git.linuxfoundation.org/l
t
si-kernel.git

Build and boot tested on all qemu architectures.

---
  meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
  meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
  meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14
+++++++-------
  3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +2 -2
index 9bdd47ecbf65..dd1ec52626d1 100644
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
  KBRANCH = "standard/preempt-rt/base"
  KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
-SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
+SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${K B
RANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 6defed1c9464..a852f75ff443 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.25"
 
  KMETA = "meta"
 
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +0 -5
index d0772fddc5f1..f7f4dabea8d5 100644
@@ -11,13 +11,13 @@ KBRANCH_qemux86  = "standard/common-pc/base"
  KBRANCH_qemux86-64  = "standard/common-pc-64/base"
  KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e3163012f3e09fe48374ef22bc676f8b19aeec1a"
-SRCREV_machine_qemumips ?= "01a71aaf8e545c3ef88da1fe02f53d1b96a2640e"
-SRCREV_machine_qemuppc ?= "ae1b9115975ff235038d5da22b4cc984b4d76aae"
-SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemux86-64 ?=

"79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemumips64 ?=
"67efb2993ec7726df5567e2572fd64e34e29b46d"

meta/recipes-kernel/linux/linux-yocto_3.10.bb +5 -1
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine_qemuarm ?= "2a4d8c0884c8d08896c052a6e42c51e861cf48b5"
+SRCREV_machine_qemumips ?= "08872a160571b9bf45b6cd262b977063f12aca46"
+SRCREV_machine_qemuppc ?= "eba0c4fcc962ffddd384251b5b6ee0c61bd5ea4d"
+SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemux86-64 ?=

"78d2a615b13a1c307d482eaa9499c1b2dee40599" +SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b" +SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"

SRC_URI =

Quoted 7 lines
Quoted 5 lines

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${K B
RANCH},${KMETA};name=machine,meta"

This change seems to have introduced an issue with the x86* builds as

Adding Darren, since qemux86 builds just fine. We'll need his eyes on the actual failure and fix.

Bruce

Quoted 62 lines

follows:

Quoted 42 lines

| drivers/built-in.o: In function `gen6_update_ring_freq':
|

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/bui l d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580 _
78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3876:
undefined reference to `cpufreq_cpu_get'
|

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/bui l d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580 _
78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3879:
undefined reference to `cpufreq_cpu_put'

| make[2]: *** [vmlinux] Error 1
| make[1]: *** [sub-make] Error 2
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| WARNING:

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/bui l d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580 _
78d2a615b1-r0/temp/run.do_compile.1426:1
exit 1 from
| exit 1
| ERROR: Function failed: do_compile (log file is located at

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/bui l d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580 _
78d2a615b1-r0/temp/log.do_compile.1426)

NOTE: recipe linux-yocto-3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0:
task do_compile: Failed
ERROR: Task 149

Quoted 5 lines

(/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/me t
a/recipes-kernel/linux/linux-yocto_3.10.bb,
do_compile) failed with exit code '1'
NOTE: recipe gcc-runtime-4.8.2-r0: task do_compile: Succeeded

This can be seen on the AB

http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/20/
s
teps/BuildImages/logs/stdio

This is one example.

Thanks
Sau!

#16 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

Quoted 1 line · Darren Hart

Erm, and Nitin Cc'd this time. Sigh. Always a hoot.\

:). I've booted all the qemu boards, so the general code is sane. But obviously there's a config in here that is hitting a bad merge, or just a condition that is otherwise not exercised by qemu.

I'm starting my own builds as well, but wanted more eyes on things.

Bruce

Quoted 177 lines · Darren Hart
Quoted 172 lines

Nitin - please join me in looking into what's happening here.

Quoted 165 lines · Bruce Ashfield
Quoted 87 lines · Saul Wold
Quoted 86 lines · Bruce Ashfield

Updating the SRCREVs of the 3.10 tree to reflect the integration of of commit 68054859 from:

git://git.linuxfoundation.org/ltsi-kernegit://git.linuxfoundation.org/l
t
si-kernel.git

Build and boot tested on all qemu architectures.

---
   meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
   meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
   meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14
+++++++-------
   3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +2 -2
index 9bdd47ecbf65..dd1ec52626d1 100644
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
   KBRANCH = "standard/preempt-rt/base"
   KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
-SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
+SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
   SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
   SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${K B
RANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 6defed1c9464..a852f75ff443 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.25"
 
   KMETA = "meta"
 
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
   SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
   PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +0 -5
index d0772fddc5f1..f7f4dabea8d5 100644
@@ -11,13 +11,13 @@ KBRANCH_qemux86  = "standard/common-pc/base"
   KBRANCH_qemux86-64  = "standard/common-pc-64/base"
   KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e3163012f3e09fe48374ef22bc676f8b19aeec1a"
-SRCREV_machine_qemumips ?= "01a71aaf8e545c3ef88da1fe02f53d1b96a2640e"
-SRCREV_machine_qemuppc ?= "ae1b9115975ff235038d5da22b4cc984b4d76aae"
-SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemux86-64 ?=

"79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemumips64 ?=
"67efb2993ec7726df5567e2572fd64e34e29b46d"

meta/recipes-kernel/linux/linux-yocto_3.10.bb +5 -1
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine_qemuarm ?= "2a4d8c0884c8d08896c052a6e42c51e861cf48b5"
+SRCREV_machine_qemumips ?= "08872a160571b9bf45b6cd262b977063f12aca46"
+SRCREV_machine_qemuppc ?= "eba0c4fcc962ffddd384251b5b6ee0c61bd5ea4d"
+SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemux86-64 ?=

"78d2a615b13a1c307d482eaa9499c1b2dee40599" +SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b" +SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"

SRC_URI =

Quoted 7 lines
Quoted 5 lines

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${K B
RANCH},${KMETA};name=machine,meta"

This change seems to have introduced an issue with the x86* builds as

Adding Darren, since qemux86 builds just fine. We'll need his eyes on the actual failure and fix.

Bruce

Quoted 62 lines

follows:

Quoted 42 lines

| drivers/built-in.o: In function `gen6_update_ring_freq':
|

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/bui l d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580 _
78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3876:
undefined reference to `cpufreq_cpu_get'
|

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/bui l d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580 _
78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3879:
undefined reference to `cpufreq_cpu_put'

| make[2]: *** [vmlinux] Error 1
| make[1]: *** [sub-make] Error 2
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| WARNING:

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/bui l d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580 _
78d2a615b1-r0/temp/run.do_compile.1426:1
exit 1 from
| exit 1
| ERROR: Function failed: do_compile (log file is located at

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/bui l d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580 _
78d2a615b1-r0/temp/log.do_compile.1426)

NOTE: recipe linux-yocto-3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0:
task do_compile: Failed
ERROR: Task 149

Quoted 5 lines

(/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/me t
a/recipes-kernel/linux/linux-yocto_3.10.bb,
do_compile) failed with exit code '1'
NOTE: recipe gcc-runtime-4.8.2-r0: task do_compile: Succeeded

This can be seen on the AB

http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/20/
s
teps/BuildImages/logs/stdio

This is one example.

Thanks
Sau!

#17 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

Quoted 11 lines · Bruce Ashfield
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines

| ERROR: Function failed: do_compile (log file is located at

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/b ui
l

d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa5 80
_
78d2a615b1-r0/temp/log.do_compile.1426)

So since this is qemux86 that is failing, and Bruce has run the qemu builds - so are we using the right SRCREVs?

Machine: 78d2a615b1
Meta: 4d658aa580

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

This can be seen on the AB

http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/2
0/
s
teps/BuildImages/logs/stdio

--
Darren

#18 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

Quoted 13 lines · Darren Hart
Quoted 11 lines · Bruce Ashfield
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines

| ERROR: Function failed: do_compile (log file is located at

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/b ui
l

d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa5 80
_
78d2a615b1-r0/temp/log.do_compile.1426)

Quoted 5 lines

So since this is qemux86 that is failing, and Bruce has run the qemu builds - so are we using the right SRCREVs?

Machine: 78d2a615b1
Meta: 4d658aa580

That's exactly what just popped into my mind. I didn't send updates for the meta-yocto BSPs with this first change. But the old SRCREVs should have continued to work .. very odd, I did see generic x86 in the path, so I thought it was something different.

Bruce

Quoted 14 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

This can be seen on the AB

http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/2
0/
s
teps/BuildImages/logs/stdio

--
Darren

#19 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

In reply to Darren Hart
Quoted 13 lines · Darren Hart
Quoted 11 lines · Bruce Ashfield
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines

| ERROR: Function failed: do_compile (log file is located at

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/b ui
l

d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa5 80
_
78d2a615b1-r0/temp/log.do_compile.1426)

Quoted 5 lines

So since this is qemux86 that is failing, and Bruce has run the qemu builds - so are we using the right SRCREVs?

Machine: 78d2a615b1
Meta: 4d658aa580

Sorry for the spam, but is this the same issue that Nitin' fixed upstream that that I integrated this week ? I have another pending commit that updates the SRCREVs again, but I was waiting on LTSI to make it in before sending it.

Bruce

Quoted 14 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

This can be seen on the AB

http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/2
0/
s
teps/BuildImages/logs/stdio

--
Darren

#20 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

Quoted 21 lines · Bruce Ashfield
Quoted 20 lines · Darren Hart
Quoted 10 lines · Bruce Ashfield
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

| ERROR: Function failed: do_compile (log file is located at

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build /b
ui
l

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

d/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658a a5
80
_
78d2a615b1-r0/temp/log.do_compile.1426)

So since this is qemux86 that is failing, and Bruce has run the qemu builds - so are we using the right SRCREVs?

Quoted 7 lines
Quoted 2 lines

Machine: 78d2a615b1
Meta: 4d658aa580

Sorry for the spam, but is this the same issue that Nitin' fixed upstream that that I integrated this week ? I have another pending commit that updates the SRCREVs again, but I was waiting on LTSI to make it in before sending it.

No, this is failing with:

| drivers/built-in.o: In function `gen6_update_ring_freq':
| /build/yocto/master/qemux86_20140207091321/build/tmp/work/qemux86-poky-linu x/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu /drm/i915/intel_pm.c:3876: undefined reference to `cpufreq_cpu_get' | /build/yocto/master/qemux86_20140207091321/build/tmp/work/qemux86-poky-linu x/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu /drm/i915/intel_pm.c:3879: undefined reference to `cpufreq_cpu_put'

The Kconfig fix from Nitin was for generic_chip.c, this is for i915 and pm.

I'll update SRCREVs and see if this resolves itself.

--
Darren

#21 lore raw

Re: [PATCH 2/2] linux-yocto/3.10: integrate LTSI

In reply to Saul Wold

The 32 bit qemu BSP needs powermanagement .. it's a kernel bug, but can fix it via a config change.

I've attached the fix.

Bruce

Quoted 106 lines · Saul Wold
Quoted 74 lines · Bruce Ashfield

Updating the SRCREVs of the 3.10 tree to reflect the integration of of commit 68054859 from:

git://git.linuxfoundation.org/ltsi-kernegit://git.linuxfoundation.org/ltsi-kernel.git

Build and boot tested on all qemu architectures.

---
  meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
  meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
  meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14 +++++++-------
  3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +2 -2
index 9bdd47ecbf65..dd1ec52626d1 100644
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
  KBRANCH = "standard/preempt-rt/base"
  KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
-SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
+SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
+SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 6defed1c9464..a852f75ff443 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.25"
 
  KMETA = "meta"
 
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +7 -7
index d0772fddc5f1..f7f4dabea8d5 100644
@@ -11,13 +11,13 @@ KBRANCH_qemux86  = "standard/common-pc/base"
  KBRANCH_qemux86-64  = "standard/common-pc-64/base"
  KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e3163012f3e09fe48374ef22bc676f8b19aeec1a"
-SRCREV_machine_qemumips ?= "01a71aaf8e545c3ef88da1fe02f53d1b96a2640e"
-SRCREV_machine_qemuppc ?= "ae1b9115975ff235038d5da22b4cc984b4d76aae"
-SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemux86-64 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
-SRCREV_machine_qemumips64 ?= "67efb2993ec7726df5567e2572fd64e34e29b46d"
-SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
+SRCREV_machine_qemuarm ?= "2a4d8c0884c8d08896c052a6e42c51e861cf48b5"
+SRCREV_machine_qemumips ?= "08872a160571b9bf45b6cd262b977063f12aca46"
+SRCREV_machine_qemuppc ?= "eba0c4fcc962ffddd384251b5b6ee0c61bd5ea4d"
+SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemux86-64 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
+SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b"
+SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
  SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
 
  SRC_URI =
Quoted 3 lines

"git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

This change seems to have introduced an issue with the x86* builds as follows:

Quoted 18 lines

| drivers/built-in.o: In function `gen6_update_ring_freq':
| /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3876:
undefined reference to `cpufreq_cpu_get'
| /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3879:
undefined reference to `cpufreq_cpu_put'

| make[2]: *** [vmlinux] Error 1
| make[1]: *** [sub-make] Error 2
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| WARNING:

/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/temp/run.do_compile.1426:1 exit 1 from
| exit 1
| ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/temp/log.do_compile.1426)

Quoted 6 lines

NOTE: recipe linux-yocto-3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0:
task do_compile: Failed
ERROR: Task 149 (/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/meta/recipes-kernel/linux/linux-yocto_3.10.bb, do_compile) failed with exit code '1'
NOTE: recipe gcc-runtime-4.8.2-r0: task do_compile: Succeeded

Quoted 10 lines

This can be seen on the AB
http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/20/steps/BuildImages/logs/stdio

This is one example.

Thanks
Sau!

From 3826d38f8e8fc9a98b321bfda6d8bdfedb26be12 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <[email protected]>
Date: Fri, 7 Feb 2014 14:04:51 -0500
Subject: [PATCH] linux-yocto/3.10: add powermanagement config to 32 bit
common-pc

The introduction of LTSI has exposed a missing dependency on cpufreq being enabled. To fix the build, we enable power management in the 32 bit BSP, which aligns it with 64 bit.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +1 -1
index dd1ec52626d1..fa6415aa4f42 100644
@@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
 SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
-SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
+SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index a852f75ff443..923f9123322b 100644
@@ -10,7 +10,7 @@ LINUX_VERSION ?= "3.10.25"
 KMETA = "meta"
 
 SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
-SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
+SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_3.10.bb +1 -1
index f7f4dabea8d5..8b90d6b5ed5d 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
 SRCREV_machine_qemux86-64 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
 SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b"
 SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
-SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
+SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
Signature · 1 line
1.8.1.2