linux-yocto: consolidated pull request

Richard/Saul,

I'm addressing a couple of bugs in this pull request.

Bug #685: for the mpc8315e-rdb boot issue. I'm going to revisit this one, since changing the entry point shouldn't be making a difference to this board's boot (by me looking at th code), but it does seem to fix the problem according to the reporter.

Bug #692: kernel configuration audit information

After configuration of the kernel and audit is performed, and has been for some time. This updates it to work with the 2.6.37 kernel and makes the output visible. You now get something like this:

------------------------
NOTE: package linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15: task do_kernel_configcheck: Started
NOTE: validating kernel configuration
The following Kconfig files no longer exist in this tree:
drivers/ieee1394/Kconfig
drivers/media/video/zc0301/Kconfig

This BSP sets 1 invalid/obsolete kernel options.
These config options are not offered anywhere within this kernel.
The full list can be found in your workspace at:
/home/bruce/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15/linux/meta/cfg/yocto/standard/common-pc/invalid.cfg

This BSP sets 6 kernel options that are possibly non-hardware related.
The full list can be found in your workspace at:
/home/bruce/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15/linux/meta/cfg/yocto/standard/common-pc/specified_non_hdw.cfg

WARNING: There were 2 hardware options requested that do not
have a corresponding value present in the final ".config" file.
This probably means you aren't getting the config you wanted.
The full list can be found in your workspace at:
/home/bruce/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15/linux/meta/cfg/yocto/standard/common-pc/mismatch.cfg

Waiting a second to make sure you get a chance to see this...
NOTE: package linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15: task do_kernel_configcheck: Succeeded
------------------------

This is actually telling us something useful, and actually is showing me something that need to be fixed in the Kconfig classification for 2.6.37 .. so it has already proven to be useful data to expose to the user!

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

Thanks,
Bruce Ashfield <[email protected]>
---

Bruce Ashfield (2):
mpc8315e-rdb: set UBOOT_ENTRYPOINT
linux-yocto: export kernel configuration audit to the console

 meta/classes/kernel-yocto.bbclass                  |   17 +++++++++++------
 .../conf/distro/include/poky-default-revisions.inc |    4 ++--
 meta/conf/machine/mpc8315e-rdb.conf                |    3 +++
 meta/recipes-kernel/linux/linux-yocto.inc          |    1 -
 meta/recipes-kernel/linux/linux-yocto_git.bb       |    1 +
 5 files changed, 17 insertions(+), 9 deletions(-)

1.7.3.4

Fixes [BUGID #685]

Although not used if the in kernel uImage is booted, it is a good idea to set the UBOOT_ENTRYPOINT just as the other uImage based boards do.

---
 meta/conf/machine/mpc8315e-rdb.conf |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

index e3f9d23..ac518fb 100644
@@ -14,3 +14,6 @@ MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+
+UBOOT_ENTRYPOINT = "0x00000000"
+

1.7.3.4

Fixes [BUGID #692]

Previously the information dumped by the kernel configuration audit scripts was only placed in log files. This isn't as useful as it could be, since they are rarely checked. This change takes the output from kconf_check and explicitly displays it to the user.

---
 meta/classes/kernel-yocto.bbclass                  |   17 +++++++++++------
 .../conf/distro/include/poky-default-revisions.inc |    4 ++--
 meta/recipes-kernel/linux/linux-yocto.inc          |    1 -
 meta/recipes-kernel/linux/linux-yocto_git.bb       |    1 +
 4 files changed, 14 insertions(+), 9 deletions(-)

index 8479b39..70521a4 100644
@@ -131,17 +131,22 @@ do_kernel_configme() {
 		echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
 		exit 1
 	fi
-
+	
 	echo "# Global settings from linux recipe" >> ${B}/.config
 	echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
 }
 
-do_kernel_configcheck() {
-	echo "[INFO] validating kernel configuration"
-	cd ${B}/..
-	kconf_check ${B}/.config ${B} ${S} ${B} ${LINUX_VERSION} ${KMACHINE}-${LINUX_KERNEL_TYPE}
-}
+python do_kernel_configcheck() {
+    import bb, re, string, sys, commands
 
+    bb.plain("NOTE: validating kernel configuration")
+
+    pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
+    cmd = bb.data.expand("cd ${B}/..; kconf_check -${LINUX_KERNEL_TYPE}-config-${LINUX_VERSION} ${B} ${S} ${B} ${KBRANCH}",d )
+    ret, result = commands.getstatusoutput("%s%s" % (pathprefix, cmd))
+
+    bb.plain( "%s" % result )
+}
 
 # Ensure that the branches (BSP and meta) are on the locatios specified by
 # their SRCREV values. If they are NOT on the right commits, the branches

index 0c3aa9a..ac0de6a 100644
@@ -57,7 +57,7 @@ SRCREV_pn-gypsy ??= "147"
 SRCREV_pn-inputproto ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
 SRCREV_pn-inputproto-native ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
 SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
-SRCREV_pn-kern-tools-native ??= "8832b75dc2e494ae96ca3e1dee7bfde2f3096904"
+SRCREV_pn-kern-tools-native ??= "fde7ef8fa8043607752563b9b7908f487eb2f7dd"
 SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
 SRCREV_pn-libfakekey ??= "e8c2e412ea4a417afc1f30e32cb7bdc508b1dccc"
 SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f"

@@ -105,7 +105,7 @@ SRCREV_machine_pn-linux-yocto_atom-pc ?= "a9d833fda90e2f1257888a97e092135610b5f2
 SRCREV_machine_pn-linux-yocto_routerstationpro ?= "219a5f9dc6e5beced36184e141f80b2df61ae32f"
 SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "3f01b98238c2ff7913ce9f68f9db5ae9538717bc"
 SRCREV_machine_pn-linux-yocto_beagleboard ?= "a9d833fda90e2f1257888a97e092135610b5f259"
-SRCREV_meta_pn-linux-yocto ?= "8a49ef6f1a43dabbce34a9ee9a1be08b26fc511c"
+SRCREV_meta_pn-linux-yocto ?= "e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99"
 SRCREV_pn-linux-libc-headers-yocto ??= "a9d833fda90e2f1257888a97e092135610b5f259"
 SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028"
 SRCREV_pn-matchbox-desktop-sato ??= "76"

index dc4ab55..3ad849e 100644
@@ -15,7 +15,6 @@ LINUX_KERNEL_TYPE ?= standard
 do_patch[depends] = "kern-tools-native:do_populate_sysroot"
 
 addtask kernel_configme before do_configure after do_patch
-addtask kernel_configcheck after do_configure before do_compile
 
 # Pick up shared functions
 inherit kernel-yocto

index 7833f65..b1486bc 100644
@@ -30,5 +30,6 @@ KERNEL_FEATURES=features/netfilter
 # extra tasks
 addtask kernel_link_vmlinux after do_compile before do_install
 addtask validate_branches before do_patch after do_kernel_checkout
+addtask kernel_configcheck after do_configure before do_compile
 
 require linux-tools.inc

1.7.3.4

Good catch, and typically that would have been a mistake. That's me updating the captured scripts to have the updated kconf_check (among others), so it was intentional, but I did for get to mention it in the submission email.

Cheers,

Bruce

"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Ah right, of course. Thanks!

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel