[PATCH 0/8] kernel-yocto: consolidated pull request (v3.8 and more)

[PATCH 0/8] kernel-yocto: consolidated pull request (v3.8 and more)

[Bruce Ashfield]

Richard/Saul,

Here's the queue of patches that I've been testing for quite some time, with the
introduction of the 3.8 kernel recipe being the "newest" at about a week old. I
mention the age of the commits, just to point out that I've been building and
working with them in my tree for a while, with no major issues.

The 3.8 kernel tree has been build and boot tested with the core-image-sato for
all qemu machines. Many hours were spent over the past two days nailing down
a late 3.8-rc breakage in the arm versatile (qemuarm), but that is solved now
and tested. The changes will eventually make it upstream, but I'm carrying the
fixes on the BSP branch for now.

That being said, I'd want to see this go through a bit of testing before it
appears in any other branches .. since there really is only so much testing 
that I can do myself. If certain boards have issues, we'll simply hold them
back at the 3.4 kernel (which is where the hardware refernce BSPs will stay
for now, until they can be checked).

 - patches 1-3 are bugs and workflow updates
 - patches 4-8 are required for the v3.8 kernel introduction

Without further rambling, here are the patch descriptions and commentary:

[PATCH 1/8] kernel-yocto: respect SRC_URI modified branch selection

    Although the setting of KBRANCH is the suggested/primary way to interact with
    the yocto kern-tools and the fetcher, some users may be more comfortable
    modifying the SRC_URI branch parameter directly.

    If they do, the tools will not force their branch and build output will be
    different then they expect, in non obvious ways.

    It's easy enough to detect this scenario, but checking the SRC_URI in the
    same way that the git fetcher checks for the branch (and SRCREV). If we take
    the value from the SRC_URI and use it directly in the patch/validate/update
    routines, we'll stay consistent with KBRANCH if it is used, and also
    automatically adapt to a manually changed branch parameter on the SRC_URI.

    For all other users, there are no visible or behavioural changes as a result
    of this change

    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

[PATCH 2/8] kernel-yocto: allow building from fetcher source dir

    The linux-yocto recipes themselves always set S="${WORKDIR}/linux" and
    arrange for the fetcher default of ${WORKDIR}/git to be renamed before
    building.

    Part of this rename involves an assumption that the directory used by
    the fetcher can be removed as part of the renaming process, or in fact
    that renaming is required.

    If a derived recipe uses S="${WORKDIR}/git", the checkout phase fails
    since the kernel source is removed as part of the processing.

    To fix this the code now detects this situation and does not clean the
    source directory before renaming the fetcher default (and in fact does
    not rename it at all).

    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

[PATCH 3/8] linux-yocto/3.4: remove cedartrail machine

    The cedartrail BSP is no longer support from yocto 1.4, so we remove
    it from the tree.

    Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>


[PATCH 4/8] v86d: compile against userspace safe kernel headers

    v86d was building directly against the staged kernel in the target
    sysroot. This has been fine in the past, but with recent (3.7) changes
    to user headers into the "uapi" include structure, there are no longer

    Without the preprocesor protection, v86d fails to build against any
    kernel with uapi header files.

    v86d doesn't actually need the whole kernel tree, the exported headers
    are enough to build a working binary. This change sets the v86d variable
    to ${STAGING_DIR_HOST}/usr, and once the v86d build adds "include" to the
    end of KDIR, we have a valid include path to the target sysroot headers.

    This also works for pre-uapi kernel headers, so the change is safe for
    most (if not all) kernel's with properly exported headers.

    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

[PATCH 5/8] kern-tools: import configuration, controls and audit updates

    Updating the kern-tools SRCREV to import the following fixes:

      commit 7f91d198d32fc90260e52724ef4aac0b997c1e8b

	kconf_check: fix new Kconfig detection

	One of the functions of the kernel configuration audit is to notify
	the user if Kconfig* files have been removed from the kernel, and
	also to notify of new Kconfig files.

	New Kconfig files should be classified as hardware or non-hardware to
	allow BSP audits to notify if boards are setting values that they
	shouldn't, hence why notifying about new "buckets" is important.

      commit c4f26a3296e0e1c3dbdd5ec8e2947d5443a9ffc2

	updateme/scc: allow config fragment exclusion

	It is common to need the features (patches, git operations) of a
	branch, but not want the kernel configuration fragments of a given
	branch. To allow this, we provide a new include flag "nocfg".

	When this flag is used, all of the configuration fragments included
	by the targetted feature will not be applied to the current build,
	with one exception, a base/critical fragment can force it's config
	values, since without them, the system would not be functional.

	Example:

	   include ktypes/standard/standard.scc nocfg

      commit c7ec19d55aca6c4b17073c5362fce5be61a89d82

	scc: wrap git merge

	To allow for parameter validation and sanity checking, wrap "git merge"
	as a dedicated "merge" command instead of using the raw git fallback.

	This also makes it consistent with existing top level commands such
	as  'tag', 'branch', 'patch', etc.

	There are no changes to arguments, and existing 'git merge' commands
	continue to work with this change.

    [YOCTO #3419]
    [YOCTO #3421]

[PATCH 6/8] linux-yocto: remove 3.0 linux-yocto recipes

    With the introduction of the 3.8 linux-yocto recipes, we remove
    the 3.0 variant.

    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

[PATCH 7/8] linux-libc-headers: update to v3.8

    Now that the 3.8 kernel has been released we can bump the libc-headers
    to that version and remove the 3.7 variant. Userspace compatibility is
    maintained through kernel versions, we also make the single 3.8 version
    the toolchain default.

    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

[PATCH 8/8] linux-yocto: introduce 3.8 kernel recipe

    Introducing the linux-yocto 3.8 kernel recipe. The tools and branch structure
    of this tree are the same as the previous linux-yocto recipes, while the meta
    data and content have been updated for the 3.8 kernel.

    build and boot tested for qemu*.

    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

Cheers,

Bruce

The following changes since commit d7b248e715d99766bf8602ff9f038f8b0afa5e78:

  augeas: change SRC_URI (2013-02-26 08:02:29 -0800)

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 (8):
  kernel-yocto: respect SRC_URI modified branch selection
  kernel-yocto: allow building from fetcher source dir
  linux-yocto/3.4: remove cedartrail machine
  v86d: compile against userspace safe kernel headers
  kern-tools: import configuration, controls and audit updates
  linux-yocto: remove 3.0 linux-yocto recipes
  linux-libc-headers: update to v3.8
  linux-yocto: introduce 3.8 kernel recipe

 meta/classes/kernel-yocto.bbclass                  |  109 +++++++++++---------
 meta/conf/distro/include/tcmode-default.inc        |    2 +-
 meta/recipes-bsp/v86d/v86d_0.1.10.bb               |    2 +-
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 ...bc-headers_3.7.bb => linux-libc-headers_3.8.bb} |    6 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |   28 -----
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb    |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb  |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   33 ------
 meta/recipes-kernel/linux/linux-yocto_3.4.bb       |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.8.bb       |   30 ++++++
 11 files changed, 99 insertions(+), 119 deletions(-)
 rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_3.7.bb => linux-libc-headers_3.8.bb} (42%)
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.0.bb
 create mode 100644 meta/recipes-kernel/linux/linux-yocto_3.8.bb

-- 
1.7.10.4

[PATCH 1/8] kernel-yocto: respect SRC_URI modified branch selection

[Bruce Ashfield]

Although the setting of KBRANCH is the suggested/primary way to interact with
the yocto kern-tools and the fetcher, some users may be more comfortable
modifying the SRC_URI branch parameter directly.

If they do, the tools will not force their branch and build output will be
different then they expect, in non obvious ways.

It's easy enough to detect this scenario, but checking the SRC_URI in the
same way that the git fetcher checks for the branch (and SRCREV). If we take
the value from the SRC_URI and use it directly in the patch/validate/update
routines, we'll stay consistent with KBRANCH if it is used, and also
automatically adapt to a manually changed branch parameter on the SRC_URI.

For all other users, there are no visible or behavioural changes as a result
of this change

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |   70 ++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 8494c16..368f91e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -27,21 +27,6 @@ def find_sccs(d):
 
     return sources_list
 
-# this is different from find_patches, in that it returns a colon separated
-# list of <patches>:<subdir> instead of just a list of patches
-def find_urls(d):
-    patches=src_patches(d)
-    fetch = bb.fetch2.Fetch([], d)
-    patch_list=[]
-    for p in patches:
-        _, _, local, _, _, _ = bb.decodeurl(p)
-        for url in fetch.urls:
-            urldata = fetch.ud[url]
-            if urldata.localpath == local:
-                patch_list.append(local+':'+urldata.path)
-
-    return patch_list
-
 # check the SRC_URI for "kmeta" type'd git repositories. Return the name of
 # the repository as it will be found in WORKDIR
 def find_kernel_feature_dirs(d):
@@ -59,6 +44,18 @@ def find_kernel_feature_dirs(d):
 	    
     return feature_dirs
 
+# find the master/machine source branch. In the same way that the fetcher proceses
+# git repositories in the SRC_URI we take the first repo found, first branch.
+def get_machine_branch(d):
+    fetch = bb.fetch2.Fetch([], d)
+    for url in fetch.urls:
+        urldata = fetch.ud[url]
+        parm = urldata.parm
+        if "branch" in parm:
+            branches = urldata.parm.get("branch").split(',')
+            return branches[0]
+	    
+    return "master"
 
 do_patch() {
 	cd ${S}
@@ -73,7 +70,7 @@ do_patch() {
 		fi
 	fi
 
-	kbranch=${KBRANCH}
+	machine_branch="${@ get_machine_branch(d)}"
 
 	# if we have a defined/set meta branch we should not be generating
 	# any meta data. The passed branch has what we need.
@@ -81,9 +78,9 @@ do_patch() {
 		createme_flags="--disable-meta-gen --meta ${KMETA}"
 	fi
 
-	createme ${createme_flags} ${ARCH} ${kbranch}
+	createme ${createme_flags} ${ARCH} ${machine_branch}
 	if [ $? -ne 0 ]; then
-		echo "ERROR. Could not create ${kbranch}"
+		echo "ERROR. Could not create ${machine_branch}"
 		exit 1
 	fi
 
@@ -113,15 +110,15 @@ do_patch() {
 	    done
 	fi
 
-	if [ "${kbranch}" != "${KBRANCH_DEFAULT}" ]; then
-		updateme_flags="--branch ${kbranch}"
+	if [ "${machine_branch}" != "${KBRANCH_DEFAULT}" ]; then
+		updateme_flags="--branch ${machine_branch}"
 	fi
 
 	# updates or generates the target description
 	updateme ${updateme_flags} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
                          ${includes} ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches}
 	if [ $? -ne 0 ]; then
-		echo "ERROR. Could not update ${kbranch}"
+		echo "ERROR. Could not update ${machine_branch}"
 		exit 1
 	fi
 
@@ -138,9 +135,9 @@ do_patch() {
 	# should thrown an error, since we aren't building what was expected
 	final_branch="$(git symbolic-ref HEAD 2>/dev/null)"
 	final_branch=${final_branch##refs/heads/}
-	if [ "${kbranch}" != "${KBRANCH_DEFAULT}" ] &&
-	   [ "${final_branch}" != "${kbranch}" ]; then
-		echo "ERROR: branch ${kbranch} was requested, but was not properly"
+	if [ "${machine_branch}" != "${KBRANCH_DEFAULT}" ] &&
+	   [ "${final_branch}" != "${machine_branch}" ]; then
+		echo "ERROR: branch ${machine_branch} was requested, but was not properly"
 		echo "       configured to be built. The current branch is ${final_branch}"
 		exit 1
 	fi
@@ -192,6 +189,13 @@ do_kernel_checkout() {
 			exit 1
 		fi
 	fi
+	
+	machine_branch="${@ get_machine_branch(d)}"
+	if [ "${KBRANCH}" != "${machine_branch}" ]; then
+		echo "WARNING: The SRC_URI machine branch and KBRANCH are not the same."
+		echo "	       KBRANCH will be adjusted to match, but this typically is a"
+		echo "	       misconfiguration and should be checked."
+	fi
 
 	# convert any remote branches to local tracking ones
 	for i in `git branch -a | grep remotes | grep -v HEAD`; do
@@ -203,12 +207,12 @@ do_kernel_checkout() {
 	done
 
 	# Create a working tree copy of the kernel by checking out a branch
-	git show-ref --quiet --verify -- "refs/heads/${KBRANCH}"
+	git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
 	if [ $? -eq 0 ]; then
 		# checkout and clobber any unimportant files
-		git checkout -f ${KBRANCH}
+		git checkout -f ${machine_branch}
 	else
-		echo "Not checking out ${KBRANCH}, it will be created later"
+		echo "Not checking out ${machine_branch}, it will be created later"
 		git checkout -f master
 	fi
 }
@@ -271,6 +275,8 @@ do_validate_branches() {
 	cd ${S}
 	export KMETA=${KMETA}
 
+	machine_branch="${@ get_machine_branch(d)}"
+
 	set +e
 	# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
 	# check and we can exit early
@@ -280,11 +286,11 @@ do_validate_branches() {
 
 	# If something other than the default branch was requested, it must
 	# exist in the tree, and it's a hard error if it wasn't
-	git show-ref --quiet --verify -- "refs/heads/${KBRANCH}"
+	git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
 	if [ $? -eq 1 ]; then
 		if [ -n "${KBRANCH_DEFAULT}" ] && 
-                      [ "${KBRANCH}" != "${KBRANCH_DEFAULT}" ]; then
-			echo "ERROR: branch ${KBRANCH} was set for kernel compilation, "
+                      [ "${machine_branch}" != "${KBRANCH_DEFAULT}" ]; then
+			echo "ERROR: branch ${machine_branch} was set for kernel compilation, "
 			echo "       but it does not exist in the kernel repository."
 			echo "       Check the value of KBRANCH and ensure that it describes"
 			echo "       a valid banch in the source kernel repository"
@@ -362,10 +368,10 @@ do_validate_branches() {
 		fi
 	fi
 
-	git show-ref --quiet --verify -- "refs/heads/${KBRANCH}"
+	git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
 	if [ $? -eq 0 ]; then
 		# restore the branch for builds
-		git checkout -q -f ${KBRANCH}
+		git checkout -q -f ${machine_branch}
         else
 	        git checkout -q master
 	fi
-- 
1.7.10.4

[PATCH 2/8] kernel-yocto: allow building from fetcher source dir

[Bruce Ashfield]

The linux-yocto recipes themselves always set S="${WORKDIR}/linux" and
arrange for the fetcher default of ${WORKDIR}/git to be renamed before
building.

Part of this rename involves an assumption that the directory used by
the fetcher can be removed as part of the renaming process, or in fact
that renaming is required.

If a derived recipe uses S="${WORKDIR}/git", the checkout phase fails
since the kernel source is removed as part of the processing.

To fix this the code now detects this situation and does not clean the
source directory before renaming the fetcher default (and in fact does
not rename it at all).

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |   39 +++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 368f91e..7b8e607 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -148,29 +148,34 @@ do_kernel_checkout() {
 
 	# A linux yocto SRC_URI should use the bareclone option. That
 	# ensures that all the branches are available in the WORKDIR version
-	# of the repository. 
+	# of the repository.
+	source_dir=`echo ${S} | sed 's%/$%%'`
+	source_workdir="${WORKDIR}/git"
 	if [ -d "${WORKDIR}/git/" ] && [ -d "${WORKDIR}/git/.git" ]; then
-		# we build out of {S}, so ensure that ${S} is clean and present
-		rm -rf ${S}
-		mkdir -p ${S}
-		
-		# We can fix up the kernel repository even if it wasn't a bare clone.
-		mv ${WORKDIR}/git/.git ${S}
-		rm -rf ${WORKDIR}/git/
+		# case2: the repository is a non-bare clone
+
+		# if S is WORKDIR/git, then we shouldn't be moving or deleting the tree.
+		if [ "${source_dir}" != "${source_workdir}" ]; then
+			rm -rf ${S}
+			mv ${WORKDIR}/git ${S}
+		fi
 		cd ${S}
 	elif [ -d "${WORKDIR}/git/" ] && [ ! -d "${WORKDIR}/git/.git" ]; then
-		# we build out of {S}, so ensure that ${S} is clean and present
-		rm -rf ${S}
-		mkdir -p ${S}/.git
-
-		mv ${WORKDIR}/git/* ${S}/.git
-		rm -rf ${WORKDIR}/git/
+		# case2: the repository is a bare clone
+
+		# if S is WORKDIR/git, then we shouldn't be moving or deleting the tree.
+		if [ "${source_dir}" != "${source_workdir}" ]; then
+			rm -rf ${S}
+			mkdir -p ${S}/.git
+			mv ${WORKDIR}/git/* ${S}/.git
+			rm -rf ${WORKDIR}/git/
+		fi
 		cd ${S}	
 		git config core.bare false
 	else
-	        # We have no git repository at all. To support low bandwidth options
-		# for building the kernel, we'll just convert the tree to a git repo
-	        # and let the rest of the process work unchanged
+		# case 3: we have no git repository at all. 
+		# To support low bandwidth options for building the kernel, we'll just 
+		# convert the tree to a git repo and let the rest of the process work unchanged
 	        cd ${S}
 		git init
 		git add .
-- 
1.7.10.4

[PATCH 3/8] linux-yocto/3.4: remove cedartrail machine

[Bruce Ashfield]

The cedartrail BSP is no longer support from yocto 1.4, so we remove
it from the tree.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index c58efe7..50cf953 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -10,7 +10,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "3d56b103cd7072d520c395194e620aba2f6e52e3"
 SRCREV_machine_qemuppc ?= "09178bc8825d6fb66ddcb1785f20a022c4ba2efd"
-SRCREV_meta ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0"
+SRCREV_meta ?= "c0b1845314cebb21694dbb4459fcc6f80feb01d0"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index 265d082..35edbd4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.4.28"
 KMETA = "meta"
 
 SRCREV_machine ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
-SRCREV_meta ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0"
+SRCREV_meta ?= "c0b1845314cebb21694dbb4459fcc6f80feb01d0"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index ab975f2..ca43944 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "62d3cb6a8e048c4833a5501bea2f35998de0b89d"
 SRCREV_machine_qemux86 ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
 SRCREV_machine_qemux86-64 ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
 SRCREV_machine ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
-SRCREV_meta ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0"
+SRCREV_meta ?= "c0b1845314cebb21694dbb4459fcc6f80feb01d0"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-- 
1.7.10.4

[PATCH 4/8] v86d: compile against userspace safe kernel headers

[Bruce Ashfield]

v86d was building directly against the staged kernel in the target
sysroot. This has been fine in the past, but with recent (3.7) changes
to user headers into the "uapi" include structure, there are no longer

Without the preprocesor protection, v86d fails to build against any
kernel with uapi header files.

v86d doesn't actually need the whole kernel tree, the exported headers
are enough to build a working binary. This change sets the v86d variable
to ${STAGING_DIR_HOST}/usr, and once the v86d build adds "include" to the
end of KDIR, we have a valid include path to the target sysroot headers.

This also works for pre-uapi kernel headers, so the change is safe for
most (if not all) kernel's with properly exported headers.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-bsp/v86d/v86d_0.1.10.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/meta/recipes-bsp/v86d/v86d_0.1.10.bb
index 51829a3..2dbfbb5 100644
--- a/meta/recipes-bsp/v86d/v86d_0.1.10.bb
+++ b/meta/recipes-bsp/v86d/v86d_0.1.10.bb
@@ -27,7 +27,7 @@ do_configure () {
 }
 
 do_compile () {
-	KDIR="${STAGING_KERNEL_DIR}" make
+	KDIR="${STAGING_DIR_HOST}/usr" make
 }
 
 do_install () {
-- 
1.7.10.4

[PATCH 5/8] kern-tools: import configuration, controls and audit updates

[Bruce Ashfield]

Updating the kern-tools SRCREV to import the following fixes:

  commit 7f91d198d32fc90260e52724ef4aac0b997c1e8b

    kconf_check: fix new Kconfig detection

    One of the functions of the kernel configuration audit is to notify
    the user if Kconfig* files have been removed from the kernel, and
    also to notify of new Kconfig files.

    New Kconfig files should be classified as hardware or non-hardware to
    allow BSP audits to notify if boards are setting values that they
    shouldn't, hence why notifying about new "buckets" is important.

  commit c4f26a3296e0e1c3dbdd5ec8e2947d5443a9ffc2

    updateme/scc: allow config fragment exclusion

    It is common to need the features (patches, git operations) of a
    branch, but not want the kernel configuration fragments of a given
    branch. To allow this, we provide a new include flag "nocfg".

    When this flag is used, all of the configuration fragments included
    by the targetted feature will not be applied to the current build,
    with one exception, a base/critical fragment can force it's config
    values, since without them, the system would not be functional.

    Example:

       include ktypes/standard/standard.scc nocfg

  commit c7ec19d55aca6c4b17073c5362fce5be61a89d82

    scc: wrap git merge

    To allow for parameter validation and sanity checking, wrap "git merge"
    as a dedicated "merge" command instead of using the raw git fallback.

    This also makes it consistent with existing top level commands such
    as  'tag', 'branch', 'patch', etc.

    There are no changes to arguments, and existing 'git merge' commands
    continue to work with this change.

[YOCTO #3419]
[YOCTO #3421]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 98cd8b9..9f4438c 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "9284af9b968d40e441b10f5c09961cbe329ccb9b"
+SRCREV = "7f91d198d32fc90260e52724ef4aac0b997c1e8b"
 PR = "r12"
 PV = "0.1+git${SRCPV}"
 
-- 
1.7.10.4

Re: [linux-yocto] [PATCH 5/8] kern-tools: import configuration, controls and audit updates

[Kamble, Nitin A]

Acked-by: Nitin A Kamble <nitin.a.kamble@intel.com>

This patch is getting the linux-yocto-dev kernel building for the emgd based meta-intel BSPs.
Without it the do_patch of the dev kernel fails as noted in the bug #3948.

Nitin

> -----Original Message-----
> From: linux-yocto-bounces@yoctoproject.org [mailto:linux-yocto-
> bounces@yoctoproject.org] On Behalf Of Bruce Ashfield
> Sent: Tuesday, February 26, 2013 9:07 PM
> To: richard.purdie@linuxfoundation.org
> Cc: linux-yocto@yoctoproject.org; openembedded-
> core@lists.openembedded.org
> Subject: [linux-yocto] [PATCH 5/8] kern-tools: import configuration, controls
> and audit updates
> 
> Updating the kern-tools SRCREV to import the following fixes:
> 
>   commit 7f91d198d32fc90260e52724ef4aac0b997c1e8b
> 
>     kconf_check: fix new Kconfig detection
> 
>     One of the functions of the kernel configuration audit is to notify
>     the user if Kconfig* files have been removed from the kernel, and
>     also to notify of new Kconfig files.
> 
>     New Kconfig files should be classified as hardware or non-hardware to
>     allow BSP audits to notify if boards are setting values that they
>     shouldn't, hence why notifying about new "buckets" is important.
> 
>   commit c4f26a3296e0e1c3dbdd5ec8e2947d5443a9ffc2
> 
>     updateme/scc: allow config fragment exclusion
> 
>     It is common to need the features (patches, git operations) of a
>     branch, but not want the kernel configuration fragments of a given
>     branch. To allow this, we provide a new include flag "nocfg".
> 
>     When this flag is used, all of the configuration fragments included
>     by the targetted feature will not be applied to the current build,
>     with one exception, a base/critical fragment can force it's config
>     values, since without them, the system would not be functional.
> 
>     Example:
> 
>        include ktypes/standard/standard.scc nocfg
> 
>   commit c7ec19d55aca6c4b17073c5362fce5be61a89d82
> 
>     scc: wrap git merge
> 
>     To allow for parameter validation and sanity checking, wrap "git merge"
>     as a dedicated "merge" command instead of using the raw git fallback.
> 
>     This also makes it consistent with existing top level commands such
>     as  'tag', 'branch', 'patch', etc.
> 
>     There are no changes to arguments, and existing 'git merge' commands
>     continue to work with this change.
> 
> [YOCTO #3419]
> [YOCTO #3421]
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  meta/recipes-kernel/kern-tools/kern-tools-native_git.bb |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> index 98cd8b9..9f4438c 100644
> --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
> "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
> 
>  DEPENDS = "git-native guilt-native"
> 
> -SRCREV = "9284af9b968d40e441b10f5c09961cbe329ccb9b"
> +SRCREV = "7f91d198d32fc90260e52724ef4aac0b997c1e8b"
>  PR = "r12"
>  PV = "0.1+git${SRCPV}"
> 
> --
> 1.7.10.4
> 
> _______________________________________________
> linux-yocto mailing list
> linux-yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/linux-yocto

[PATCH 6/8] linux-yocto: remove 3.0 linux-yocto recipes

[Bruce Ashfield]

With the introduction of the 3.8 linux-yocto recipes, we remove
the 3.0 variant.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |   28 -------------------
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |   33 -----------------------
 2 files changed, 61 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.0.bb

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
deleted file mode 100644
index 0cdc7c0..0000000
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH = "yocto/standard/preempt-rt/base"
-KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
-
-LINUX_VERSION ?= "3.0.32"
-LINUX_KERNEL_TYPE = "preempt-rt"
-KMETA = "meta"
-
-SRCREV_machine ?= "bbd5bfe49403fdcca294ca4b163d5f7195ea3a8e"
-SRCREV_machine_qemuppc ?= "c3575ad0016173b6e0b953404eb6a770e75a1f11"
-SRCREV_meta ?= "bf5ee4945ee6d748e6abe16356f2357f76b5e2f0"
-
-PR = "${INC_PR}.0"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-
-# Omit broken machines from COMPATIBLE_MACHINE
-#   qemuppc hangs at boot
-#   qemumips panics at boot
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
-
-# Functionality flags
-KERNEL_FEATURES_append = " features/netfilter"
-KERNEL_FEATURES_append = " features/taskstats"
-KERNEL_FEATURES_append_qemux86 = " cfg/sound"
-KERNEL_FEATURES_append_qemux86-64 = " cfg/sound"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
deleted file mode 100644
index b7fbf23..0000000
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH = "yocto/standard/base"
-KBRANCH_qemux86  = "yocto/standard/common-pc/base"
-KBRANCH_qemux86-64  = "yocto/standard/common-pc-64/base"
-KBRANCH_qemuppc  = "yocto/standard/qemu-ppc32"
-KBRANCH_qemumips = "yocto/standard/mti-malta32-be"
-KBRANCH_qemuarm  = "yocto/standard/arm-versatile-926ejs"
-
-KMETA = "meta"
-
-LINUX_VERSION ?= "3.0.32"
-
-SRCREV_machine_qemuarm ?= "f2d606dfbc61d10847783f1e7c1dcb0ecabf3220"
-SRCREV_machine_qemumips  ?= "57f4bbfb4c65e4c8e349401b877f1661fb026ed6"
-SRCREV_machine_qemuppc ?= "d8779a6245d13c3b56eabac36a14c8896f448566"
-SRCREV_machine_qemux86 ?= "33d5d1ea371dad280e5bcfadd12c3a360c6bc5b8"
-SRCREV_machine_qemux86-64 ?= "fe23c7dd94eb94dd5887028683093615ac921086"
-SRCREV_machine ?= "cef17a18d72eae749dc78de3c83772f52815d842"
-SRCREV_meta ?= "fa9b8c24e84bb9d75d08d197c84c50ce4f99c424"
-
-PR = "${INC_PR}.1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-
-COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64"
-
-# Functionality flags
-KERNEL_FEATURES_append = " features/netfilter"
-KERNEL_FEATURES_append = " features/taskstats"
-KERNEL_FEATURES_append_qemux86 = " cfg/sound"
-KERNEL_FEATURES_append_qemux86-64 = " cfg/sound"
-- 
1.7.10.4

[PATCH 7/8] linux-libc-headers: update to v3.8

[Bruce Ashfield]

Now that the 3.8 kernel has been released we can bump the libc-headers
to that version and remove the 3.7 variant. Userspace compatibility is
maintained through kernel versions, we also make the single 3.8 version
the toolchain default.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/conf/distro/include/tcmode-default.inc                      |    2 +-
 .../{linux-libc-headers_3.7.bb => linux-libc-headers_3.8.bb}     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_3.7.bb => linux-libc-headers_3.8.bb} (42%)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 6e282df..93df37c 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
 BINUVERSION ?= "2.23.1"
 EGLIBCVERSION ?= "2.17"
 UCLIBCVERSION ?= "0.9.33+git%"
-LINUXLIBCVERSION ?= "3.7"
+LINUXLIBCVERSION ?= "3.8"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.8.bb
similarity index 42%
rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb
rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.8.bb
index a363289..5672bd4 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.8.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 SRC_URI += "file://scripts-Makefile.headersinst-install-headers-from-sc.patch"
 
-PR = "r1"
+PR = "r0"
 
-SRC_URI[md5sum] = "5323f3faadd051e83af605a63be5ea2e"
-SRC_URI[sha256sum] = "dc08d87a579fe2918362e6666e503a95a76296419195cb499aa9dd4dbe171a9e"
+SRC_URI[md5sum] = "fcd1d2e60e1033c935a13ef81c89ea2d"
+SRC_URI[sha256sum] = "fce774b5313e73949cb35f128e91e7b2ccd7fa2438abc5cff69267e504395a45"
-- 
1.7.10.4

[PATCH 8/8] linux-yocto: introduce 3.8 kernel recipe

[Bruce Ashfield]

Introducing the linux-yocto 3.8 kernel recipe. The tools and branch structure
of this tree are the same as the previous linux-yocto recipes, while the meta
data and content have been updated for the 3.8 kernel.

build and boot tested for qemu*.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto_3.8.bb |   30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 meta/recipes-kernel/linux/linux-yocto_3.8.bb

diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
new file mode 100644
index 0000000..7c1dff7
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
@@ -0,0 +1,30 @@
+require recipes-kernel/linux/linux-yocto.inc
+
+KBRANCH_DEFAULT = "standard/base"
+KBRANCH = "${KBRANCH_DEFAULT}"
+
+SRCREV_machine_qemuarm ?= "351d133943b50a9dfeee07661d44254722a19f04"
+SRCREV_machine_qemumips  ?= "d529d082041142435587bd442b1235dbe1c72950"
+SRCREV_machine_qemuppc ?= "8dcd155ad408658e9180d1630da2ac7e0ee70542"
+SRCREV_machine_qemux86 ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5"
+SRCREV_machine_qemux86-64 ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5"
+SRCREV_machine ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5"
+SRCREV_meta ?= "c2ed0f16fdec628242a682897d5d86df4547cf24"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+
+LINUX_VERSION ?= "3.8"
+
+PR = "${INC_PR}.0"
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+KMETA = "meta"
+
+COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64"
+
+# Functionality flags
+KERNEL_FEATURES_append = " features/netfilter/netfilter.scc"
+KERNEL_FEATURES_append_qemux86=" cfg/sound.scc"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
+KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm.scc"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
-- 
1.7.10.4