[PATCH 00/18] kernel-yocto: consolidated pull request

[PATCH 00/18] kernel-yocto: consolidated pull request

[Bruce Ashfield]

Richard/Saul,

Here's the pending queue of kernel changes for the 1.7 feature freeze.
The queue is large, but I've actually been building and running with 
most of these changes for 6 months now, so they've been soaked for
quite a while.

This block of changes is largely about removing some of the old code,
the corner cases, and removing checks that are now handled by the
fetcher (awesome!). They are incremental cleanups, and nothing significant
changes .. in fact, I'm probably the only one that really even cares 
about the changes (since I have more features to do on top of them):

  kernel-yocto: use cat-file instead of git-show
  kernel-yocto: move SRCREV validation to patching phase
  kernel-yocto: remove containing branch check
  kernel-yocto: remove SRC_URI kbranch validation
  kernel-yocto: remove branch existence checking in do_validate_branches
  kernel-yocto: remove KBRANCH_DEFAULT
  kernel-yocto: simplify branch SRCREV validation
  kernel-yocto: use show-ref instead of branch -a
  kernel-yocto: clean overly complex branch checkout
  kernel-yocto: allow custom non-meta, SRCREV format builds
  kernel-yocto: remove KBRANCH_DEFAULT
  kernel-yocto: convert echo statements to bb* equivalents
  kern-tools: allow meta branch and meta data directory to differ

The next change is:

  images: introduce core-image-kernel-dev

  This is the image type that I've been using for the same 6 month window
  to build and boot test kernel updates. There's nothing really new here, 
  but it is a named image type that selects existing package groups and
  puts them all in one place. After it built for all arches and 3.16 .. we
  had no failures.

  There are moer packages to add to this, but that's post 1.7 work.

And finally, libc-headers, kernel version updates and removals:

  linux-yocto/3.14: vhost, vxland, openvswitch and block/bfq updates
  linux-yocto/3.14: update to v3.14.17
  linux-yocto/3.4: remove 3.4 name recipes
  linux-libc-headers: update to 3.16

  With those changes, we have an up to date 3.14, have dropped the 3.4
  kernel and have updated the libc-headers. The kernel-dev image was
  built to test everything out.

That's the breakdown of the changes, and I can tweak as necessary. With
that size a queue, I'm sure something will go boom, so I'm around to adjust
as required.

Cheers,

Bruce

The following changes since commit 37d7b218e9faef6093caedd67875c2d72b8111e2:

  kernel-yocto: remove redundant SRCREV check (2014-08-29 16:32:23 -0400)

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 (18):
  kernel-yocto: use cat-file instead of git-show
  kernel-yocto: move SRCREV validation to patching phase
  kernel-yocto: remove containing branch check
  kernel-yocto: remove SRC_URI kbranch validation
  kernel-yocto: remove branch existence checking in do_validate_branches
  kernel-yocto: remove KBRANCH_DEFAULT
  kernel-yocto: simplify branch SRCREV validation
  kernel-yocto: use show-ref instead of branch -a
  kernel-yocto: clean overly complex branch checkout
  kernel-yocto: allow custom non-meta, SRCREV format builds
  kernel-yocto: remove KBRANCH_DEFAULT
  kernel-yocto: convert echo statements to bb* equivalents
  kern-tools: allow meta branch and meta data directory to differ
  images: introduce core-image-kernel-dev
  linux-yocto/3.14: vhost, vxland, openvswitch and block/bfq updates
  linux-yocto/3.14: update to v3.14.17
  linux-yocto/3.4: remove 3.4 name recipes
  linux-libc-headers: update to 3.16

 meta/classes/kernel-yocto.bbclass                  | 201 ++++++++-------------
 meta/conf/distro/include/tcmode-default.inc        |   2 +-
 .../images/core-image-kernel-dev.bb                |  16 ++
 .../kern-tools/kern-tools-native_git.bb            |   2 +-
 .../linux-libc-headers/linux-libc-headers_3.14.bb  |   7 -
 .../linux-libc-headers/linux-libc-headers_3.16.bb  |   7 +
 meta/recipes-kernel/linux/linux-yocto-dev.bb       |   1 -
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |   4 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  12 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb    |  30 ---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |   3 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |   8 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb  |  26 ---
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      |  15 +-
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      |  34 ++--
 meta/recipes-kernel/linux/linux-yocto_3.4.bb       |  38 ----
 16 files changed, 140 insertions(+), 266 deletions(-)
 create mode 100644 meta/recipes-extended/images/core-image-kernel-dev.bb
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.14.bb
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.4.bb

-- 
1.8.1.2

[PATCH 01/18] kernel-yocto: use cat-file instead of git-show

[Bruce Ashfield]

Parsing the output of git show is error prone, since it changes based on
the type of issue with bad comit IDs. Since the output is no longer used
in the case of a valid ref, we can switch to git-cat-file and  simply
check the return code.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 6c9242770407..38c886b21b09 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -321,8 +321,8 @@ do_validate_branches() {
 		fi
 	fi
 
-	ref=`git show ${machine_srcrev} 2>&1 | head -n1 || true`
-	if [ "$ref" = "fatal: bad object ${target_meta_head}" ]; then
+	git cat-file -t ${machine_srcrev} > /dev/null
+	if [ if $? -ne 0 ]; then
 	    echo "ERROR ${machine_srcrev} is not a valid commit ID."
 	    echo "The kernel source tree may be out of sync"
 	    exit 1
@@ -358,8 +358,8 @@ do_validate_branches() {
 	git show-ref --quiet --verify -- "refs/heads/${KMETA}"
 	if [ $? -eq 0 ] && [ "${target_meta_head}" != "AUTOINC" ]; then
 		if [ "$meta_head" != "$target_meta_head" ]; then
-			ref=`git show ${target_meta_head} 2>&1 | head -n1 || true`
-			if [ "$ref" = "fatal: bad object ${target_meta_head}" ]; then
+			git cat-file -t ${target_meta_head} > /dev/null
+			if [ $? -ne 0 ]; then
 				echo "ERROR ${target_meta_head} is not a valid commit ID"
 				echo "The kernel source tree may be out of sync"
 				exit 1
-- 
1.8.1.2

[PATCH 02/18] kernel-yocto: move SRCREV validation to patching phase

[Bruce Ashfield]

Rather than attempting to condition the entire tree to machine SRCREV (since
we don't know what branch will be built), we can instead wait until patching
has completed and then confirm that we are indeed building a decendant of the
specified SRCREV. The result is a much simpler check, and no mangling of the
tree.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 38c886b21b09..4938712c7cff 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -71,6 +71,7 @@ do_patch() {
 	fi
 
 	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
+	machine_srcrev="${SRCREV_machine}"
 
 	# if we have a defined/set meta branch we should not be generating
 	# any meta data. The passed branch has what we need.
@@ -122,6 +123,17 @@ do_patch() {
 		exit 1
 	fi
 
+	# see if the branch we are about to patch has been properly reset to the defined
+	# SRCREV .. if not, we reset it.
+	branch_head=`git rev-parse HEAD`
+	if [ "${machine_srcrev}" != "AUTOINC" ]; then
+	 	if [ "${machine_srcrev}" != "${branch_head}" ]; then
+			current_branch=`git rev-parse --abbrev-ref HEAD`
+			git branch "$current_branch-orig"
+			git reset --hard ${machine_srcrev}
+		fi
+	fi
+
 	# executes and modifies the source tree as required
 	patchme ${KMACHINE}
 	if [ $? -ne 0 ]; then
@@ -130,6 +142,17 @@ do_patch() {
 		exit 1
 	fi
 
+	# check to see if the specified SRCREV is reachable from the final branch.
+	# if it wasn't something wrong has happened, and we should error.
+	if [ "${machine_srcrev}" != "AUTOINC" ]; then
+		git merge-base --is-ancestor ${machine_srcrev} HEAD
+	 	if [ $? -ne 0 ]; then
+			bbnote "ERROR: SRCREV ${machine_srcrev} was specified, but is not reachable"
+			bbnote "       Check the BSP description for incorrect branch selection, or other errors."
+			exit 1
+		fi
+	fi
+
 	# Perform a final check. If something other than the default kernel
 	# branch was requested, and that's not where we ended up, then we 
 	# should thrown an error, since we aren't building what was expected
@@ -335,22 +358,6 @@ do_validate_branches() {
 		exit 1
 	fi
 
-	# force the SRCREV in each branch that contains the specified
-	# SRCREV (if it isn't the current HEAD of that branch)
-	git checkout -q master
-	for b in $containing_branches; do
-		branch_head=`git show-ref -s --heads ${b}`		
-		if [ "$branch_head" != "$machine_srcrev" ]; then
-			echo "[INFO] Setting branch $b to ${machine_srcrev}"
-			if [ "$b" = "master" ]; then
-				git reset --hard $machine_srcrev > /dev/null
-			else
-				git branch -D $b > /dev/null
-				git branch $b $machine_srcrev > /dev/null
-			fi
-		fi
-	done
-
 	## KMETA branch validation.
 	## We do validation if the meta branch exists, and AUTOREV hasn't been set
  	meta_head=`git show-ref -s --heads ${KMETA}`
-- 
1.8.1.2

[PATCH 03/18] kernel-yocto: remove containing branch check

[Bruce Ashfield]

The bitbake fetcher now enforces that a commit is contained by a branch,
so this code can be dropped from do_validate_branches.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 4938712c7cff..357a79b12311 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -351,13 +351,6 @@ do_validate_branches() {
 	    exit 1
 	fi
 
-	containing_branches=`git branch --contains $machine_srcrev | sed 's/^..//'`
-	if [ -z "$containing_branches" ]; then
-		echo "ERROR: SRCREV was set to \"$machine_srcrev\", but no branches"
-		echo "       contain this commit"
-		exit 1
-	fi
-
 	## KMETA branch validation.
 	## We do validation if the meta branch exists, and AUTOREV hasn't been set
  	meta_head=`git show-ref -s --heads ${KMETA}`
-- 
1.8.1.2

[PATCH 04/18] kernel-yocto: remove SRC_URI kbranch validation

[Bruce Ashfield]

We no longer need to check if the KBRANCH matches the branch specified
in the SRC_URI. This is taken care of by the fetcher at the beginning
and SRCREV ancestor validation after patching.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 357a79b12311..3bef841ae80a 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -230,12 +230,6 @@ do_kernel_checkout() {
 	
 	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 
-	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 --no-color | grep remotes | grep -v HEAD`; do
 		b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
-- 
1.8.1.2

[PATCH 05/18] kernel-yocto: remove branch existence checking in do_validate_branches

[Bruce Ashfield]

Now that the fetcher will enforce branch existence, we no longer need to
confirm that a branch exists, and that it was the branch requested to
be built.

We know the branch exists and we'll confirm that the specified SRCREV
is going to be built after we've patched the tree.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 3bef841ae80a..d51748e556ef 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -309,13 +309,19 @@ python do_kernel_configcheck() {
 # their SRCREV values. If they are NOT on the right commits, the branches
 # are corrected to the proper commit.
 do_validate_branches() {
+	set +e
 	cd ${S}
 	export KMETA=${KMETA}
 
 	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 	machine_srcrev="${SRCREV_machine}"
 
-	set +e
+	# if the machine branch doesn't exist, lets build master
+	git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
+	if [ $? -eq 1 ]; then
+		machine_branch = "master"
+	fi
+
 	# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
 	# check and we can exit early
 	if [ "${machine_srcrev}" = "AUTOINC" ] || [ "${machine_srcrev}" = "INVALID" ] ||
@@ -324,19 +330,6 @@ do_validate_branches() {
 		return
 	fi
 
-	# 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/${machine_branch}"
-	if [ $? -eq 1 ]; then
-		if [ -n "${KBRANCH_DEFAULT}" ] && 
-                      [ "${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"
-			exit 1
-		fi
-	fi
 
 	git cat-file -t ${machine_srcrev} > /dev/null
 	if [ if $? -ne 0 ]; then
@@ -369,13 +362,7 @@ do_validate_branches() {
 		fi
 	fi
 
-	git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
-	if [ $? -eq 0 ]; then
-		# restore the branch for builds
-		git checkout -q -f ${machine_branch}
-        else
-	        git checkout -q master
-	fi
+	git checkout -q -f ${machine_branch}
 }
 
 # Many scripts want to look in arch/$arch/boot for the bootable
-- 
1.8.1.2

[PATCH 06/18] kernel-yocto: remove KBRANCH_DEFAULT

[Bruce Ashfield]

KBRANCH_DEFAULT was introduced as a way to trigger the enforced build
of a particular branch of the tree. With the fetcher now enforcing
SRCREVs existing on a branch, we can simply validate that the SRCREV
is reachable from the final branch and no longer care about enforcing
a given branch.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index d51748e556ef..087fbb0c3702 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -111,10 +111,6 @@ do_patch() {
 	    done
 	fi
 
-	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}
@@ -152,18 +148,6 @@ do_patch() {
 			exit 1
 		fi
 	fi
-
-	# Perform a final check. If something other than the default kernel
-	# branch was requested, and that's not where we ended up, then we 
-	# 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 [ "${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
 }
 
 do_kernel_checkout() {
-- 
1.8.1.2

[PATCH 07/18] kernel-yocto: simplify branch SRCREV validation

[Bruce Ashfield]

The checking of machine and meta branch SRCREVs was inconsistent and
didn't allow a mixed AUTOREV machine/meta branch combination. By
simplifying the checks and changing the logic, we can now allow this
combination.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 087fbb0c3702..0ac1572471bc 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -311,37 +311,36 @@ do_validate_branches() {
 	if [ "${machine_srcrev}" = "AUTOINC" ] || [ "${machine_srcrev}" = "INVALID" ] ||
 	   [ "${machine_srcrev}" = "" ]; then
 		bbnote "INFO: SRCREV validation is not required for AUTOREV or empty/invalid settings, returning"
-		return
-	fi
-
-
-	git cat-file -t ${machine_srcrev} > /dev/null
-	if [ if $? -ne 0 ]; then
-	    echo "ERROR ${machine_srcrev} is not a valid commit ID."
-	    echo "The kernel source tree may be out of sync"
-	    exit 1
+	else
+		git cat-file -t ${machine_srcrev} > /dev/null
+		if [ if $? -ne 0 ]; then
+			echo "ERROR ${machine_srcrev} is not a valid commit ID."
+			echo "The kernel source tree may be out of sync"
+			exit 1
+		fi
 	fi
 
 	## KMETA branch validation.
 	## We do validation if the meta branch exists, and AUTOREV hasn't been set
- 	meta_head=`git show-ref -s --heads ${KMETA}`
- 	target_meta_head="${SRCREV_meta}"
-	git show-ref --quiet --verify -- "refs/heads/${KMETA}"
-	if [ $? -eq 0 ] && [ "${target_meta_head}" != "AUTOINC" ]; then
+	target_meta_head="${SRCREV_meta}"
+	if [ "${target_meta_head}" = "AUTOINC" ] || [ "${target_meta_head}" = "" ]; then
+		bbnote "INFO: SRCREV validation skipped for AUTOREV or empty meta branch"
+	else
+	 	meta_head=`git show-ref -s --heads ${KMETA}`
+
+		git cat-file -t ${target_meta_head} > /dev/null
+		if [ $? -ne 0 ]; then
+			echo "ERROR ${target_meta_head} is not a valid commit ID"
+			echo "The kernel source tree may be out of sync"
+			exit 1
+		fi
 		if [ "$meta_head" != "$target_meta_head" ]; then
-			git cat-file -t ${target_meta_head} > /dev/null
-			if [ $? -ne 0 ]; then
-				echo "ERROR ${target_meta_head} is not a valid commit ID"
-				echo "The kernel source tree may be out of sync"
+			echo "[INFO] Setting branch ${KMETA} to ${target_meta_head}"
+			git branch -m ${KMETA} ${KMETA}-orig
+			git checkout -q -b ${KMETA} ${target_meta_head}
+			if [ $? -ne 0 ];then
+				echo "ERROR: could not checkout ${KMETA} branch from known hash ${target_meta_head}"
 				exit 1
-			else
-				echo "[INFO] Setting branch ${KMETA} to ${target_meta_head}"
-				git branch -m ${KMETA} ${KMETA}-orig
-				git checkout -q -b ${KMETA} ${target_meta_head}
-				if [ $? -ne 0 ];then
-					echo "ERROR: could not checkout ${KMETA} branch from known hash ${target_meta_head}"
-					exit 1
-				fi
 			fi
 		fi
 	fi
-- 
1.8.1.2

[PATCH 08/18] kernel-yocto: use show-ref instead of branch -a

[Bruce Ashfield]

It's better to check a branches existence via show-ref versus the end
user branch commands. So we make the switch.

Also as part of this change, we move the conversion of remote branches
to local branches above the meta branch checking. This is required to
ensure that the branch is local for the show-ref check.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 0ac1572471bc..9209f423cff1 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -200,11 +200,20 @@ do_kernel_checkout() {
 	fi
 	# end debare
 
+	# convert any remote branches to local tracking ones
+	for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do
+		b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
+		git show-ref --quiet --verify -- "refs/heads/$b"
+		if [ $? -ne 0 ]; then
+			git branch $b $i > /dev/null
+		fi
+	done
+
        	# If KMETA is defined, the branch must exist, but a machine branch
 	# can be missing since it may be created later by the tools.
 	if [ -n "${KMETA}" ]; then
-		git branch -a --no-color | grep -q ${KMETA}
-		if [ $? -ne 0 ]; then
+		git show-ref --quiet --verify -- "refs/heads/${KMETA}"
+		if [ $? -eq 1 ]; then
 			echo "ERROR. The branch '${KMETA}' is required and was not"
 			echo "found. Ensure that the SRC_URI points to a valid linux-yocto"
 			echo "kernel repository"
@@ -214,15 +223,6 @@ do_kernel_checkout() {
 	
 	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 
-	# convert any remote branches to local tracking ones
-	for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do
-		b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
-		git show-ref --quiet --verify -- "refs/heads/$b"
-		if [ $? -ne 0 ]; then
-			git branch $b $i > /dev/null
-		fi
-	done
-
 	# Create a working tree copy of the kernel by checking out a branch
 	git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
 	if [ $? -eq 0 ]; then
-- 
1.8.1.2

[PATCH 09/18] kernel-yocto: clean overly complex branch checkout

[Bruce Ashfield]

Since the git fetcher ensures that branches exist, we no longer need to
validate the branch and have a conditional checkout of the source.

We can remove some checks and ensure that whenever we exit the
do_kernel_checkout routine that a branch is always checked out.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9209f423cff1..69620f0a4275 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -221,17 +221,16 @@ do_kernel_checkout() {
 		fi
 	fi
 	
-	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 
 	# Create a working tree copy of the kernel by checking out a branch
+	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 	git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
 	if [ $? -eq 0 ]; then
-		# checkout and clobber any unimportant files
-		git checkout -f ${machine_branch}
-	else
-		echo "Not checking out ${machine_branch}, it will be created later"
-		git checkout -f master
+		machine_branch = "master"
 	fi
+
+	# checkout and clobber any unimportant files
+	git checkout -f ${machine_branch}
 }
 do_kernel_checkout[dirs] = "${S}"
 
-- 
1.8.1.2

[PATCH 10/18] kernel-yocto: allow custom non-meta, SRCREV format builds

[Bruce Ashfield]

When custom respositories are built (like a pure kernel.org
repo), the machine_meta SRCREV format is not applicable. As
such, we shouldn't check for the meta branch and we shouldn't
only check SRCREV_machine based revisions.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 69620f0a4275..4f912bff2fcd 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -72,6 +72,10 @@ do_patch() {
 
 	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 	machine_srcrev="${SRCREV_machine}"
+	if [ -z "${machine_srcrev}" ]; then
+		# fallback to SRCREV if a non machine_meta tree is being built
+		machine_srcrev="${SRCREV}"
+	fi
 
 	# if we have a defined/set meta branch we should not be generating
 	# any meta data. The passed branch has what we need.
@@ -119,17 +123,6 @@ do_patch() {
 		exit 1
 	fi
 
-	# see if the branch we are about to patch has been properly reset to the defined
-	# SRCREV .. if not, we reset it.
-	branch_head=`git rev-parse HEAD`
-	if [ "${machine_srcrev}" != "AUTOINC" ]; then
-	 	if [ "${machine_srcrev}" != "${branch_head}" ]; then
-			current_branch=`git rev-parse --abbrev-ref HEAD`
-			git branch "$current_branch-orig"
-			git reset --hard ${machine_srcrev}
-		fi
-	fi
-
 	# executes and modifies the source tree as required
 	patchme ${KMACHINE}
 	if [ $? -ne 0 ]; then
@@ -299,17 +292,16 @@ do_validate_branches() {
 	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 	machine_srcrev="${SRCREV_machine}"
 
-	# if the machine branch doesn't exist, lets build master
-	git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
-	if [ $? -eq 1 ]; then
-		machine_branch = "master"
-	fi
-
 	# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
 	# check and we can exit early
-	if [ "${machine_srcrev}" = "AUTOINC" ] || [ "${machine_srcrev}" = "INVALID" ] ||
-	   [ "${machine_srcrev}" = "" ]; then
+	if [ "${machine_srcrev}" = "AUTOINC" ]; then
 		bbnote "INFO: SRCREV validation is not required for AUTOREV or empty/invalid settings, returning"
+	elif [ "${machine_srcrev}" = "" ] && [ "${SRCREV}" != "AUTOINC" ]; then
+		# SRCREV_machine_<MACHINE> was not set. This means that a custom recipe
+		# that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In
+		# this case, we need to reset to the give SRCREV before heading to patching
+		bbnote "INFO: custom recipe is being built, forcing SRCREV to ${SRCREV}"
+		force_srcrev="${SRCREV}"
 	else
 		git cat-file -t ${machine_srcrev} > /dev/null
 		if [ if $? -ne 0 ]; then
@@ -317,10 +309,10 @@ do_validate_branches() {
 			echo "The kernel source tree may be out of sync"
 			exit 1
 		fi
+		force_srcrev=${machine_srcrev}
 	fi
 
 	## KMETA branch validation.
-	## We do validation if the meta branch exists, and AUTOREV hasn't been set
 	target_meta_head="${SRCREV_meta}"
 	if [ "${target_meta_head}" = "AUTOINC" ] || [ "${target_meta_head}" = "" ]; then
 		bbnote "INFO: SRCREV validation skipped for AUTOREV or empty meta branch"
@@ -345,6 +337,16 @@ do_validate_branches() {
 	fi
 
 	git checkout -q -f ${machine_branch}
+	if [ -n "${force_srcrev}" ]; then
+		# see if the branch we are about to patch has been properly reset to the defined
+		# SRCREV .. if not, we reset it.
+		branch_head=`git rev-parse HEAD`
+		if [ "${force_srcrev}" != "${branch_head}" ]; then
+			current_branch=`git rev-parse --abbrev-ref HEAD`
+			git branch "$current_branch-orig"
+			git reset --hard ${force_srcrev}
+		fi
+	fi
 }
 
 # Many scripts want to look in arch/$arch/boot for the bootable
-- 
1.8.1.2

[PATCH 11/18] kernel-yocto: remove KBRANCH_DEFAULT

[Bruce Ashfield]

KBRANCH_DEFAULT is no longer used, so we can remove it from all
recipes (and it won't be missed).

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-dev.bb       |  1 -
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb    |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  3 +--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb  |  3 +--
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 15 +++++++--------
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 14 +++++++-------
 meta/recipes-kernel/linux/linux-yocto_3.4.bb       | 15 +++++++--------
 10 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index 10f3d234ed25..595f72d5bb6e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -23,7 +23,6 @@ python () {
 }
 
 KBRANCH = "standard/base"
-KBRANCH_DEFAULT = "${KBRANCH}"
 KMETA = "meta"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
index 65a74d3ec75d..80d8db082338 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -1,7 +1,7 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/preempt-rt/base"
-KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
+KBRANCH ?= "standard/preempt-rt/base"
+KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "c373b342af7bcbeda346df9598a5b1e9784d362f"
 SRCREV_machine_qemuppc ?= "767da5a30782cc1bc6522cef8aa5fd8130ecc06c"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index 0c5767a49e5b..59918d77e1cf 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -1,7 +1,7 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/preempt-rt/base"
-KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
+KBRANCH ?= "standard/preempt-rt/base"
+KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "77d54dcdf1e078290d88e85adbbe3f90d41f4c9e"
 SRCREV_machine_qemuppc ?= "ba132753cc6688c1c22d7147b02e434a3441833c"
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 e01ffeec7ab0..6929dfaec198 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -1,7 +1,7 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/preempt-rt/base"
-KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
+KBRANCH ?= "standard/preempt-rt/base"
+KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 LINUX_VERSION ?= "3.4.91"
 LINUX_KERNEL_TYPE = "preempt-rt"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
index b70d7bc081ce..a751d541179a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -1,7 +1,6 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH_DEFAULT = "standard/tiny/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
+KBRANCH ?= "standard/tiny/base"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index 3e8c0bc67127..34341d7a016a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -1,6 +1,6 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/tiny/base"
+KBRANCH ?= "standard/tiny/base"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
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 fd5c9f76967e..bad6b8f4eb9b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -3,8 +3,7 @@ require recipes-kernel/linux/linux-yocto.inc
 # We need lzma (as CONFIG_KERNEL_LZMA=y)
 DEPENDS += "xz-native"
 
-KBRANCH_DEFAULT = "standard/tiny/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
+KBRANCH ?= "standard/tiny/base"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index 57395b4ebb1b..f2904b62a132 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -1,15 +1,14 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH_DEFAULT = "standard/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
+KBRANCH = "standard/base"
 
 # board specific branches
-KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
-KBRANCH_qemumips = "standard/mti-malta32"
-KBRANCH_qemuppc  = "standard/qemuppc"
-KBRANCH_qemux86  = "standard/common-pc/base"
-KBRANCH_qemux86-64  = "standard/common-pc-64/base"
-KBRANCH_qemumips64 = "standard/mti-malta64"
+KBRANCH_qemuarm  ?= "standard/arm-versatile-926ejs"
+KBRANCH_qemumips ?= "standard/mti-malta32"
+KBRANCH_qemuppc  ?= "standard/qemuppc"
+KBRANCH_qemux86  ?= "standard/common-pc/base"
+KBRANCH_qemux86-64  ?= "standard/common-pc-64/base"
+KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
 SRCREV_machine_qemuarm ?= "db489eed7f5c86037358cc9d0fefa7b90dbbaa86"
 SRCREV_machine_qemumips ?= "780aac11b3f20ed2f5df3f173b0d02b28a6eb96b"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 8c3cceec7d8d..9f154b6775aa 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -1,14 +1,14 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/base"
+KBRANCH ?= "standard/base"
 
 # board specific branches
-KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
-KBRANCH_qemumips = "standard/mti-malta32"
-KBRANCH_qemuppc  = "standard/qemuppc"
-KBRANCH_qemux86  = "standard/common-pc/base"
-KBRANCH_qemux86-64  = "standard/common-pc-64/base"
-KBRANCH_qemumips64 = "standard/mti-malta64"
+KBRANCH_qemuarm  ?= "standard/arm-versatile-926ejs"
+KBRANCH_qemumips ?= "standard/mti-malta32"
+KBRANCH_qemuppc  ?= "standard/qemuppc"
+KBRANCH_qemux86  ?= "standard/common-pc/base"
+KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
+KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
 SRCREV_machine_qemuarm ?= "92de8060e113e4a13f16c6b4b5333f538e291c6d"
 SRCREV_machine_qemumips ?= "313647599dd3cd7f42374d918a9397f82eed36fb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 1eabf764ef6d..3538afcf9809 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -1,15 +1,14 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH_DEFAULT = "standard/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
+KBRANCH = "standard/base"
 
 # board specific branches
-KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
-KBRANCH_qemumips = "standard/mti-malta32"
-KBRANCH_qemuppc  = "standard/qemuppc"
-KBRANCH_qemux86  = "standard/common-pc/base"
-KBRANCH_qemux86-64  = "standard/common-pc-64/base"
-KBRANCH_qemumips64 = "standard/mti-malta64"
+KBRANCH_qemuarm  ?= "standard/arm-versatile-926ejs"
+KBRANCH_qemumips ?= "standard/mti-malta32"
+KBRANCH_qemuppc  ?= "standard/qemuppc"
+KBRANCH_qemux86  ?= "standard/common-pc/base"
+KBRANCH_qemux86-64  ?= "standard/common-pc-64/base"
+KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
 SRCREV_machine_qemuarm ?= "192b56b2f529af1be014ea85667c9f3fea0afd53"
 SRCREV_machine_qemumips  ?= "58fb8b8fb2f9911cac84cd840d63c8a58bada6ca"
-- 
1.8.1.2

[PATCH 12/18] kernel-yocto: convert echo statements to bb* equivalents

[Bruce Ashfield]

Use the bbinfo, bberror, bbfatal equivalents to the existing echo statements
within the kernel-yocto processing. This makes us consistent with the other
messages from the build system.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 4f912bff2fcd..ee09769d4616 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -85,8 +85,7 @@ do_patch() {
 
 	createme ${createme_flags} ${ARCH} ${machine_branch}
 	if [ $? -ne 0 ]; then
-		echo "ERROR. Could not create ${machine_branch}"
-		exit 1
+		bbfatal "Could not create ${machine_branch}"
 	fi
 
 	sccs="${@" ".join(find_sccs(d))}"
@@ -119,16 +118,14 @@ do_patch() {
 	updateme ${updateme_flags} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
                          ${includes} ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches}
 	if [ $? -ne 0 ]; then
-		echo "ERROR. Could not update ${machine_branch}"
-		exit 1
+		bbfatal "Could not update ${machine_branch}"
 	fi
 
 	# executes and modifies the source tree as required
 	patchme ${KMACHINE}
 	if [ $? -ne 0 ]; then
-		echo "ERROR. Could not apply patches for ${KMACHINE}."
-		echo "       Patch failures can be resolved in the devshell (bitbake -c devshell ${PN})"
-		exit 1
+		bberror "Could not apply patches for ${KMACHINE}."
+		bbfatal "Patch failures can be resolved in the devshell (bitbake -c devshell ${PN})"
 	fi
 
 	# check to see if the specified SRCREV is reachable from the final branch.
@@ -136,9 +133,8 @@ do_patch() {
 	if [ "${machine_srcrev}" != "AUTOINC" ]; then
 		git merge-base --is-ancestor ${machine_srcrev} HEAD
 	 	if [ $? -ne 0 ]; then
-			bbnote "ERROR: SRCREV ${machine_srcrev} was specified, but is not reachable"
-			bbnote "       Check the BSP description for incorrect branch selection, or other errors."
-			exit 1
+			bberror "SRCREV ${machine_srcrev} was specified, but is not reachable"
+			bbfatal "Check the BSP description for incorrect branch selection, or other errors."
 		fi
 	fi
 }
@@ -183,9 +179,8 @@ do_kernel_checkout() {
 
 	        cd ${S}
 		if [ ! -f "Makefile" ]; then
-			echo "[ERROR]: S is not set to the linux source directory. Check "
-			echo "         the recipe and set S to the proper extracted subdirectory"
-			exit 1
+			bberror "S is not set to the linux source directory. Check "
+			bbfatal "the recipe and set S to the proper extracted subdirectory"
 		fi
 		git init
 		git add .
@@ -207,10 +202,9 @@ do_kernel_checkout() {
 	if [ -n "${KMETA}" ]; then
 		git show-ref --quiet --verify -- "refs/heads/${KMETA}"
 		if [ $? -eq 1 ]; then
-			echo "ERROR. The branch '${KMETA}' is required and was not"
-			echo "found. Ensure that the SRC_URI points to a valid linux-yocto"
-			echo "kernel repository"
-			exit 1
+			bberror "The branch '${KMETA}' is required and was not found"
+			bberror "Ensure that the SRC_URI points to a valid linux-yocto"
+			bbfatal "kernel repository"
 		fi
 	fi
 	
@@ -231,7 +225,7 @@ addtask kernel_checkout before do_patch after do_unpack
 
 do_kernel_configme[dirs] += "${S} ${B}"
 do_kernel_configme() {
-	echo "[INFO] doing kernel configme"
+	bbnote "kernel configme"
 	export KMETA=${KMETA}
 
 	if [ -n "${KCONFIG_MODE}" ]; then
@@ -248,8 +242,7 @@ do_kernel_configme() {
 	PATH=${PATH}:${S}/scripts/util
 	configme ${configmeflags} --reconfig --output ${B} ${LINUX_KERNEL_TYPE} ${KMACHINE}
 	if [ $? -ne 0 ]; then
-		echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
-		exit 1
+		bbfatal "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
 	fi
 	
 	echo "# Global settings from linux recipe" >> ${B}/.config
@@ -295,19 +288,18 @@ do_validate_branches() {
 	# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
 	# check and we can exit early
 	if [ "${machine_srcrev}" = "AUTOINC" ]; then
-		bbnote "INFO: SRCREV validation is not required for AUTOREV or empty/invalid settings, returning"
+		bbnote "SRCREV validation is not required for AUTOREV"
 	elif [ "${machine_srcrev}" = "" ] && [ "${SRCREV}" != "AUTOINC" ]; then
 		# SRCREV_machine_<MACHINE> was not set. This means that a custom recipe
 		# that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In
 		# this case, we need to reset to the give SRCREV before heading to patching
-		bbnote "INFO: custom recipe is being built, forcing SRCREV to ${SRCREV}"
+		bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}"
 		force_srcrev="${SRCREV}"
 	else
 		git cat-file -t ${machine_srcrev} > /dev/null
 		if [ if $? -ne 0 ]; then
-			echo "ERROR ${machine_srcrev} is not a valid commit ID."
-			echo "The kernel source tree may be out of sync"
-			exit 1
+			bberror "${machine_srcrev} is not a valid commit ID."
+			bbfatal "The kernel source tree may be out of sync"
 		fi
 		force_srcrev=${machine_srcrev}
 	fi
@@ -315,23 +307,21 @@ do_validate_branches() {
 	## KMETA branch validation.
 	target_meta_head="${SRCREV_meta}"
 	if [ "${target_meta_head}" = "AUTOINC" ] || [ "${target_meta_head}" = "" ]; then
-		bbnote "INFO: SRCREV validation skipped for AUTOREV or empty meta branch"
+		bbnote "SRCREV validation skipped for AUTOREV or empty meta branch"
 	else
 	 	meta_head=`git show-ref -s --heads ${KMETA}`
 
 		git cat-file -t ${target_meta_head} > /dev/null
 		if [ $? -ne 0 ]; then
-			echo "ERROR ${target_meta_head} is not a valid commit ID"
-			echo "The kernel source tree may be out of sync"
-			exit 1
+			bberror "${target_meta_head} is not a valid commit ID"
+			bbfatal "The kernel source tree may be out of sync"
 		fi
 		if [ "$meta_head" != "$target_meta_head" ]; then
-			echo "[INFO] Setting branch ${KMETA} to ${target_meta_head}"
+			bbnote "Setting branch ${KMETA} to ${target_meta_head}"
 			git branch -m ${KMETA} ${KMETA}-orig
 			git checkout -q -b ${KMETA} ${target_meta_head}
 			if [ $? -ne 0 ];then
-				echo "ERROR: could not checkout ${KMETA} branch from known hash ${target_meta_head}"
-				exit 1
+				bbfatal "Could not checkout ${KMETA} branch from known hash ${target_meta_head}"
 			fi
 		fi
 	fi
-- 
1.8.1.2

[PATCH 13/18] kern-tools: allow meta branch and meta data directory to differ

[Bruce Ashfield]

From the kern-tools commit:

    tools: allow meta directories that are not the same as the branch name

    With this change it is now possible to have a meta branch with meta data
    in a directory that is not the same name as the branch.

    The changes to three parts of the build are required to discover the name
    of the meta directory by relying on the fact that in a clean/proper build
    the meta directory is the only untracked, top level directory in the build.

    As such, we can restore a checkpoint and then examine the build directory
    to determine the meta directory name .. avoiding any new variables to
    indicate this to the scripts and build system.

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 24263e5d2b7e..bca1decf7bd2 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"
 
-SRCREV = "e914d570232a5a6aa47b721dafbab4af4209d93c"
+SRCREV = "83f468ab8ef748a8880cba7d26779c35abfcc0bf"
 PR = "r12"
 PV = "0.2+git${SRCPV}"
 
-- 
1.8.1.2

[PATCH 14/18] images: introduce core-image-kernel-dev

[Bruce Ashfield]

When building a new kernel, or testing and update to the kernel there
are a set of packages that are sensitive to APIs, build system and
other changes associated with the kernel.

After building this recipe, we can be reasonably sure that a new kernel
package and coupled userspace have been built, installed and tested
via a single image.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-extended/images/core-image-kernel-dev.bb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta/recipes-extended/images/core-image-kernel-dev.bb

diff --git a/meta/recipes-extended/images/core-image-kernel-dev.bb b/meta/recipes-extended/images/core-image-kernel-dev.bb
new file mode 100644
index 000000000000..7f95f63f5973
--- /dev/null
+++ b/meta/recipes-extended/images/core-image-kernel-dev.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A development image that builds the kernel and packages that are \
+sensitive to kernel updates and version changes"
+
+# Could also be core-image-basic, but we'll keep this small for now
+require recipes-core/images/core-image-minimal.bb
+
+# Note: you must have meta-skeleton in your bblayers to build hello-mod
+KERNEL_DEV_MODULE ?= "hello-mod"
+KERNEL_DEV_UTILS ?= "dropbear"
+KERNEL_DEV_TOOLS ?= "packagegroup-core-tools-profile"
+
+CORE_IMAGE_EXTRA_INSTALL += "${KERNEL_DEV_MODULE} \
+                             ${KERNEL_DEV_UTILS} \
+                             ${KERNEL_DEV_TOOLS} \
+                             "
+                             
-- 
1.8.1.2

[PATCH 15/18] linux-yocto/3.14: vhost, vxland, openvswitch and block/bfq updates

[Bruce Ashfield]

Updating the linux-yocto/3.14 SRCREVs to integrate more feature additions
and backports to the LTSI kernel base:

   42477caf6bfd block, bfq: add Early Queue Merge (EQM) to BFQ-v7r5 for 3.14.0
   349aa3f0848d block: introduce the BFQ-v7r5 I/O sched for 3.14
   121ed2738c47 block: cgroups, kconfig, build bits for BFQ-v7r5-3.14
   9925795a3e54 vhost-scsi: Include prot_bytes into expected data transfer length
   68fe340cb836 vhost: move memory pointer to VQs
   72fa27bcf526 vhost: move acked_features to VQs
   757680234478 vhost: replace rcu with mutex
   050c1440ac73 vhost-net: extend device allocation to vmalloc
   d68641313156 vhost/scsi: Enable T10 PI IOV -> SGL memory mapping
   fb89a8df7f1c vhost/scsi: Add T10 PI IOV -> SGL memory mapping logic
   5caf8475ee8a vhost/scsi: Add preallocation of protection SGLs
   c0785b9490a8 vhost/scsi: Move sanity check into vhost_scsi_map_iov_to_sgl
   bd947327cdf6 vhost: don't open-code sockfd_put()
   83fab2df94c6 openvswitch: Use exact lookup for flow_get and flow_del.
   9c185c40f7a8 openvswitch: Fix tracking of flags seen in TCP flows.
   0d2455332847 openvswitch: supply a dummy err_handler of gre_cisco_protocol to prevent kernel crash
   4513a2fd2703 openvswitch: Fix a double free bug for the sample action
   1acf10deff18 openvswitch: Simplify genetlink code.
   9ea6a4dea3f5 openvswitch: Minimize ovs_flow_cmd_new|set critical sections.
   9e76764432cf openvswitch: Split ovs_flow_cmd_new_or_set().
   7bafcd59a838 openvswitch: Minimize ovs_flow_cmd_del critical section.
   67980f929444 openvswitch: Reduce locking requirements.
   347f9442b559 openvswitch: Fix ovs_flow_stats_get/clear RCU dereference.
   c7aa7c522ec0 openvswitch: Fix typo.
   b244c7b19a55 openvswitch: Minimize dp and vport critical sections.
   21883a3ffdb6 openvswitch: Make flow mask removal symmetric.
   ffa173197cf5 openvswitch: Build flow cmd netlink reply only if needed.
   f3e8e5c07505 openvswitch: Clarify locking.
   df42a8f505c2 openvswitch: Avoid assigning a NULL pointer to flow actions.
   91b07542da22 openvswitch: Compact sw_flow_key.
   24bb1a576332 net/openvswitch: Use with RCU_INIT_POINTER(x, NULL) in vport-gre.c
   808868318939 openvswitch: Use TCP flags in the flow key for stats.
   a57851bae1cf openvswitch: Fix output of SCTP mask.
   8b70125106ee openvswitch: Per NUMA node flow stats.
   606497442f52 openvswitch: Remove 5-tuple optimization.
   01e74b175909 openvswitch: Use ether_addr_copy
   b5d02cfdc985 openvswitch: flow_netlink: Use pr_fmt to OVS_NLERR output
   4da9e8d176f9 openvswitch: Use net_ratelimit in OVS_NLERR
   ee8f673dd798 openvswitch: Added (unsigned long long) cast in printf
   b67f35f8b0aa openvswitch: avoid cast-qual warning in vport_priv
   3e01428f6e0c openvswitch: avoid warnings in vport_from_priv
   069ee359a487 openvswitch: use const in some local vars and casts
   cbec86356a89 vxlan: add x-netns support
   a51970560923 vxlan: ensure to advertise the right fdb remote
   696068dca072 vxlan: remove unused port variable in vxlan_udp_encap_recv()
   e94003f3b58d sched/deadline: Fix sched_yield() behavior

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index 59918d77e1cf..4d26d3307cdc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -3,9 +3,9 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH ?= "standard/preempt-rt/base"
 KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "77d54dcdf1e078290d88e85adbbe3f90d41f4c9e"
-SRCREV_machine_qemuppc ?= "ba132753cc6688c1c22d7147b02e434a3441833c"
-SRCREV_meta ?= "3c987080bc943b8eae37fb6672368bb74978e484"
+SRCREV_machine ?= "21561a4c2865f79bd3489087eed19b26839e33f1"
+SRCREV_machine_qemuppc ?= "61cd09f76a3632ccc02a9e471220f7b5fcb61b93"
+SRCREV_meta ?= "ccad961c4cb6be245ed198bd2c17c27ab33cfcd7"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index 34341d7a016a..ebb85058f33f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.14.13"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "d2f8bdb8818bf2b83ac75b6b5e8428be61242d19"
-SRCREV_meta ?= "3c987080bc943b8eae37fb6672368bb74978e484"
+SRCREV_machine ?= "42477caf6bfda5ca7439121d348e474cff44ab5c"
+SRCREV_meta ?= "ccad961c4cb6be245ed198bd2c17c27ab33cfcd7"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 9f154b6775aa..f78699db0f2e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -10,14 +10,14 @@ KBRANCH_qemux86  ?= "standard/common-pc/base"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "92de8060e113e4a13f16c6b4b5333f538e291c6d"
-SRCREV_machine_qemumips ?= "313647599dd3cd7f42374d918a9397f82eed36fb"
-SRCREV_machine_qemuppc ?= "45ef97bc22532a5a2d2fb94df3eec0aca27d0335"
-SRCREV_machine_qemux86 ?= "edec15a07d310c4368b8149496da0548b564a413"
-SRCREV_machine_qemux86-64 ?= "d2f8bdb8818bf2b83ac75b6b5e8428be61242d19"
-SRCREV_machine_qemumips64 ?= "474fc6753d80afbd4483ea5531b03bc5b9c1ac18"
-SRCREV_machine ?= "d2f8bdb8818bf2b83ac75b6b5e8428be61242d19"
-SRCREV_meta ?= "3c987080bc943b8eae37fb6672368bb74978e484"
+SRCREV_machine_qemuarm ?= "65c9b3a3996f541eb26e5918de0ce02ec81a36e2"
+SRCREV_machine_qemumips ?= "e6a4a3bd2e332e2d1b01b4008497775d1ccfea19"
+SRCREV_machine_qemuppc ?= "05e7be95eb9d48590cf7e8dea2538b927a8ba1c6"
+SRCREV_machine_qemux86 ?= "3270ea3cf75d58316913b42ea51ad85068a595de"
+SRCREV_machine_qemux86-64 ?= "42477caf6bfda5ca7439121d348e474cff44ab5c"
+SRCREV_machine_qemumips64 ?= "f2317d326cce17a7a595e0c346e0f15b1a1df981"
+SRCREV_machine ?= "42477caf6bfda5ca7439121d348e474cff44ab5c"
+SRCREV_meta ?= "ccad961c4cb6be245ed198bd2c17c27ab33cfcd7"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-- 
1.8.1.2

[PATCH 16/18] linux-yocto/3.14: update to v3.14.17

[Bruce Ashfield]

Updating the 3.14 repository to the latest korg stable udpate.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index 4d26d3307cdc..406004f760ec 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH ?= "standard/preempt-rt/base"
 KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "21561a4c2865f79bd3489087eed19b26839e33f1"
-SRCREV_machine_qemuppc ?= "61cd09f76a3632ccc02a9e471220f7b5fcb61b93"
+SRCREV_machine ?= "12f9e966eb249c3bdcc935612e2a372e90bad950"
+SRCREV_machine_qemuppc ?= "52ceb28926768c49f06db4e7e08d2226c2a473fd"
 SRCREV_meta ?= "ccad961c4cb6be245ed198bd2c17c27ab33cfcd7"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
-LINUX_VERSION ?= "3.14.13"
+LINUX_VERSION ?= "3.14.17"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index ebb85058f33f..2ab3e1c067f3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -4,11 +4,11 @@ KBRANCH ?= "standard/tiny/base"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.14.13"
+LINUX_VERSION ?= "3.14.17"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "42477caf6bfda5ca7439121d348e474cff44ab5c"
+SRCREV_machine ?= "5a47bbc4c3c2472f3746a8cf1485db7134cf9245"
 SRCREV_meta ?= "ccad961c4cb6be245ed198bd2c17c27ab33cfcd7"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index f78699db0f2e..2024d8e49536 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -10,18 +10,18 @@ KBRANCH_qemux86  ?= "standard/common-pc/base"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "65c9b3a3996f541eb26e5918de0ce02ec81a36e2"
-SRCREV_machine_qemumips ?= "e6a4a3bd2e332e2d1b01b4008497775d1ccfea19"
-SRCREV_machine_qemuppc ?= "05e7be95eb9d48590cf7e8dea2538b927a8ba1c6"
-SRCREV_machine_qemux86 ?= "3270ea3cf75d58316913b42ea51ad85068a595de"
-SRCREV_machine_qemux86-64 ?= "42477caf6bfda5ca7439121d348e474cff44ab5c"
-SRCREV_machine_qemumips64 ?= "f2317d326cce17a7a595e0c346e0f15b1a1df981"
-SRCREV_machine ?= "42477caf6bfda5ca7439121d348e474cff44ab5c"
+SRCREV_machine_qemuarm ?= "5130b21b5ef3562c3cb03ad401bc9960fdedf49a"
+SRCREV_machine_qemumips ?= "ef22686356ce614f4bb3637ce6ee0dab068ea5e7"
+SRCREV_machine_qemuppc ?= "c7fed96ea15a49706582d84866f6552a33b3cac4"
+SRCREV_machine_qemux86 ?= "e0f04763abba7d487357f98f4267117fd5e79262"
+SRCREV_machine_qemux86-64 ?= "5a47bbc4c3c2472f3746a8cf1485db7134cf9245"
+SRCREV_machine_qemumips64 ?= "2af2cebe7e8c3755ac1f031c241b0cacad032d93"
+SRCREV_machine ?= "5a47bbc4c3c2472f3746a8cf1485db7134cf9245"
 SRCREV_meta ?= "ccad961c4cb6be245ed198bd2c17c27ab33cfcd7"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.14.13"
+LINUX_VERSION ?= "3.14.17"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-- 
1.8.1.2

[PATCH 17/18] linux-yocto/3.4: remove 3.4 name recipes

[Bruce Ashfield]

Removing the 3.4 recipes, since support has not shifted to 3.10 and
3.14 for LTSI kernel versions, with 3.16+ as the development version.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   | 30 ------------------
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 25 ---------------
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      | 37 -----------------------
 3 files changed, 92 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.4.bb

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
deleted file mode 100644
index 6929dfaec198..000000000000
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH ?= "standard/preempt-rt/base"
-KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
-
-LINUX_VERSION ?= "3.4.91"
-LINUX_KERNEL_TYPE = "preempt-rt"
-
-KMETA = "meta"
-
-SRCREV_machine ?= "5993b0a650d24f810edb22bab577287d0c6d4f4b"
-SRCREV_machine_qemuppc ?= "765d61e4883bb6db3be516722465f2e8d1fc73cd"
-SRCREV_meta ?= "a8742041c8b9f447d4ad4c3f478e022f1e4bfcfd"
-
-PR = "${INC_PR}.1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.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/netfilter.scc"
-KERNEL_FEATURES_append = " features/taskstats/taskstats.scc"
-KERNEL_FEATURES_append_qemux86 = " cfg/sound.scc"
-KERNEL_FEATURES_append_qemux86-64 = " cfg/sound.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
deleted file mode 100644
index bad6b8f4eb9b..000000000000
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-# We need lzma (as CONFIG_KERNEL_LZMA=y)
-DEPENDS += "xz-native"
-
-KBRANCH ?= "standard/tiny/base"
-LINUX_KERNEL_TYPE = "tiny"
-KCONFIG_MODE = "--allnoconfig"
-
-LINUX_VERSION ?= "3.4.91"
-
-KMETA = "meta"
-
-SRCREV_machine ?= "498189ccb98f833daa2092ceee72da8c878e0009"
-SRCREV_meta ?= "a8742041c8b9f447d4ad4c3f478e022f1e4bfcfd"
-
-PR = "${INC_PR}.1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-
-COMPATIBLE_MACHINE = "(qemux86)"
-
-# Functionality flags
-KERNEL_FEATURES = ""
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
deleted file mode 100644
index 3538afcf9809..000000000000
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH = "standard/base"
-
-# board specific branches
-KBRANCH_qemuarm  ?= "standard/arm-versatile-926ejs"
-KBRANCH_qemumips ?= "standard/mti-malta32"
-KBRANCH_qemuppc  ?= "standard/qemuppc"
-KBRANCH_qemux86  ?= "standard/common-pc/base"
-KBRANCH_qemux86-64  ?= "standard/common-pc-64/base"
-KBRANCH_qemumips64 ?= "standard/mti-malta64"
-
-SRCREV_machine_qemuarm ?= "192b56b2f529af1be014ea85667c9f3fea0afd53"
-SRCREV_machine_qemumips  ?= "58fb8b8fb2f9911cac84cd840d63c8a58bada6ca"
-SRCREV_machine_qemuppc ?= "4fe50989bc8bcb3564ca37c2cffd42ac176b428d"
-SRCREV_machine_qemux86 ?= "498189ccb98f833daa2092ceee72da8c878e0009"
-SRCREV_machine_qemux86-64 ?= "498189ccb98f833daa2092ceee72da8c878e0009"
-SRCREV_machine ?= "498189ccb98f833daa2092ceee72da8c878e0009"
-SRCREV_meta ?= "a8742041c8b9f447d4ad4c3f478e022f1e4bfcfd"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-
-LINUX_VERSION ?= "3.4.91"
-
-PR = "${INC_PR}.5"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-KMETA = "meta"
-
-COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64"
-
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
-- 
1.8.1.2

[PATCH 18/18] linux-libc-headers: update to 3.16

[Bruce Ashfield]

Updating the linux-libc-headers to the 3.16 release. This matches the
current -dev kernel version, and is compatible with the existing
named kernel versions (3.10, 3.14).

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/conf/distro/include/tcmode-default.inc                       | 2 +-
 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.14.bb | 7 -------
 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb | 7 +++++++
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.14.bb
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 41a014721daf..74e8f438516c 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -27,7 +27,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
 BINUVERSION ?= "2.24"
 EGLIBCVERSION ?= "2.19"
 UCLIBCVERSION ?= "0.9.33+git%"
-LINUXLIBCVERSION ?= "3.14"
+LINUXLIBCVERSION ?= "3.16"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.14.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.14.bb
deleted file mode 100644
index 9ac70af942a1..000000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.14.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-KORG_ARCHIVE_COMPRESSION = "xz"
-
-require linux-libc-headers.inc
-
-SRC_URI[md5sum] = "b621207b3f6ecbb67db18b13258f8ea8"
-SRC_URI[sha256sum] = "61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa"
-
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb
new file mode 100644
index 000000000000..cedaced2da50
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb
@@ -0,0 +1,7 @@
+KORG_ARCHIVE_COMPRESSION = "xz"
+
+require linux-libc-headers.inc
+
+SRC_URI[md5sum] = "5c569ed649a0c9711879f333e90c5386"
+SRC_URI[sha256sum] = "4813ad7927a7d92e5339a873ab16201b242b2748934f12cb5df9ba2cfe1d77a0"
+
-- 
1.8.1.2

Re: [PATCH 02/18] kernel-yocto: move SRCREV validation to patching phase

[Richard Purdie]

On Sat, 2014-08-30 at 00:38 -0400, Bruce Ashfield wrote:
> Rather than attempting to condition the entire tree to machine SRCREV (since
> we don't know what branch will be built), we can instead wait until patching
> has completed and then confirm that we are indeed building a decendant of the
> specified SRCREV. The result is a much simpler check, and no mangling of the
> tree.
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  meta/classes/kernel-yocto.bbclass | 39 +++++++++++++++++++++++----------------
>  1 file changed, 23 insertions(+), 16 deletions(-)

Looks like some versions of git on the AB cluster don't support this. Do
we need to bump the minimum git version and install buildtools-tarball
on the affected machines? Or can we use some other construct here?

https://autobuilder.yoctoproject.org/main/builders/nightly-x86-64/builds/24/steps/BuildImages/logs/stdio

Cheers,

Richard


> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
> index 38c886b21b09..4938712c7cff 100644
> --- a/meta/classes/kernel-yocto.bbclass
> +++ b/meta/classes/kernel-yocto.bbclass
> @@ -71,6 +71,7 @@ do_patch() {
>  	fi
>  
>  	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
> +	machine_srcrev="${SRCREV_machine}"
>  
>  	# if we have a defined/set meta branch we should not be generating
>  	# any meta data. The passed branch has what we need.
> @@ -122,6 +123,17 @@ do_patch() {
>  		exit 1
>  	fi
>  
> +	# see if the branch we are about to patch has been properly reset to the defined
> +	# SRCREV .. if not, we reset it.
> +	branch_head=`git rev-parse HEAD`
> +	if [ "${machine_srcrev}" != "AUTOINC" ]; then
> +	 	if [ "${machine_srcrev}" != "${branch_head}" ]; then
> +			current_branch=`git rev-parse --abbrev-ref HEAD`
> +			git branch "$current_branch-orig"
> +			git reset --hard ${machine_srcrev}
> +		fi
> +	fi
> +
>  	# executes and modifies the source tree as required
>  	patchme ${KMACHINE}
>  	if [ $? -ne 0 ]; then
> @@ -130,6 +142,17 @@ do_patch() {
>  		exit 1
>  	fi
>  
> +	# check to see if the specified SRCREV is reachable from the final branch.
> +	# if it wasn't something wrong has happened, and we should error.
> +	if [ "${machine_srcrev}" != "AUTOINC" ]; then
> +		git merge-base --is-ancestor ${machine_srcrev} HEAD
> +	 	if [ $? -ne 0 ]; then
> +			bbnote "ERROR: SRCREV ${machine_srcrev} was specified, but is not reachable"
> +			bbnote "       Check the BSP description for incorrect branch selection, or other errors."
> +			exit 1
> +		fi
> +	fi
> +
>  	# Perform a final check. If something other than the default kernel
>  	# branch was requested, and that's not where we ended up, then we 
>  	# should thrown an error, since we aren't building what was expected
> @@ -335,22 +358,6 @@ do_validate_branches() {
>  		exit 1
>  	fi
>  
> -	# force the SRCREV in each branch that contains the specified
> -	# SRCREV (if it isn't the current HEAD of that branch)
> -	git checkout -q master
> -	for b in $containing_branches; do
> -		branch_head=`git show-ref -s --heads ${b}`		
> -		if [ "$branch_head" != "$machine_srcrev" ]; then
> -			echo "[INFO] Setting branch $b to ${machine_srcrev}"
> -			if [ "$b" = "master" ]; then
> -				git reset --hard $machine_srcrev > /dev/null
> -			else
> -				git branch -D $b > /dev/null
> -				git branch $b $machine_srcrev > /dev/null
> -			fi
> -		fi
> -	done
> -
>  	## KMETA branch validation.
>  	## We do validation if the meta branch exists, and AUTOREV hasn't been set
>   	meta_head=`git show-ref -s --heads ${KMETA}`

Re: [PATCH 02/18] kernel-yocto: move SRCREV validation to patching phase

[Bruce Ashfield]

On Sat, Aug 30, 2014 at 9:55 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Sat, 2014-08-30 at 00:38 -0400, Bruce Ashfield wrote:
>> Rather than attempting to condition the entire tree to machine SRCREV (since
>> we don't know what branch will be built), we can instead wait until patching
>> has completed and then confirm that we are indeed building a decendant of the
>> specified SRCREV. The result is a much simpler check, and no mangling of the
>> tree.
>>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> ---
>>  meta/classes/kernel-yocto.bbclass | 39 +++++++++++++++++++++++----------------
>>  1 file changed, 23 insertions(+), 16 deletions(-)
>
> Looks like some versions of git on the AB cluster don't support this. Do
> we need to bump the minimum git version and install buildtools-tarball
> on the affected machines? Or can we use some other construct here?

Ah crap. After I sent the series, I meant to follow up and say just this .. that
if I use the ancestor construct .. it may cause problems.

I have a fallback strategy and will send an incremental patch on the end of the
series.

Bruce

>
> https://autobuilder.yoctoproject.org/main/builders/nightly-x86-64/builds/24/steps/BuildImages/logs/stdio
>
> Cheers,
>
> Richard
>
>
>> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
>> index 38c886b21b09..4938712c7cff 100644
>> --- a/meta/classes/kernel-yocto.bbclass
>> +++ b/meta/classes/kernel-yocto.bbclass
>> @@ -71,6 +71,7 @@ do_patch() {
>>       fi
>>
>>       machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
>> +     machine_srcrev="${SRCREV_machine}"
>>
>>       # if we have a defined/set meta branch we should not be generating
>>       # any meta data. The passed branch has what we need.
>> @@ -122,6 +123,17 @@ do_patch() {
>>               exit 1
>>       fi
>>
>> +     # see if the branch we are about to patch has been properly reset to the defined
>> +     # SRCREV .. if not, we reset it.
>> +     branch_head=`git rev-parse HEAD`
>> +     if [ "${machine_srcrev}" != "AUTOINC" ]; then
>> +             if [ "${machine_srcrev}" != "${branch_head}" ]; then
>> +                     current_branch=`git rev-parse --abbrev-ref HEAD`
>> +                     git branch "$current_branch-orig"
>> +                     git reset --hard ${machine_srcrev}
>> +             fi
>> +     fi
>> +
>>       # executes and modifies the source tree as required
>>       patchme ${KMACHINE}
>>       if [ $? -ne 0 ]; then
>> @@ -130,6 +142,17 @@ do_patch() {
>>               exit 1
>>       fi
>>
>> +     # check to see if the specified SRCREV is reachable from the final branch.
>> +     # if it wasn't something wrong has happened, and we should error.
>> +     if [ "${machine_srcrev}" != "AUTOINC" ]; then
>> +             git merge-base --is-ancestor ${machine_srcrev} HEAD
>> +             if [ $? -ne 0 ]; then
>> +                     bbnote "ERROR: SRCREV ${machine_srcrev} was specified, but is not reachable"
>> +                     bbnote "       Check the BSP description for incorrect branch selection, or other errors."
>> +                     exit 1
>> +             fi
>> +     fi
>> +
>>       # Perform a final check. If something other than the default kernel
>>       # branch was requested, and that's not where we ended up, then we
>>       # should thrown an error, since we aren't building what was expected
>> @@ -335,22 +358,6 @@ do_validate_branches() {
>>               exit 1
>>       fi
>>
>> -     # force the SRCREV in each branch that contains the specified
>> -     # SRCREV (if it isn't the current HEAD of that branch)
>> -     git checkout -q master
>> -     for b in $containing_branches; do
>> -             branch_head=`git show-ref -s --heads ${b}`
>> -             if [ "$branch_head" != "$machine_srcrev" ]; then
>> -                     echo "[INFO] Setting branch $b to ${machine_srcrev}"
>> -                     if [ "$b" = "master" ]; then
>> -                             git reset --hard $machine_srcrev > /dev/null
>> -                     else
>> -                             git branch -D $b > /dev/null
>> -                             git branch $b $machine_srcrev > /dev/null
>> -                     fi
>> -             fi
>> -     done
>> -
>>       ## KMETA branch validation.
>>       ## We do validation if the meta branch exists, and AUTOREV hasn't been set
>>       meta_head=`git show-ref -s --heads ${KMETA}`
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



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

Re: [PATCH 02/18] kernel-yocto: move SRCREV validation to patching phase

[Bruce Ashfield]

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

On 2014-08-30, 9:55 AM, Richard Purdie wrote:
> On Sat, 2014-08-30 at 00:38 -0400, Bruce Ashfield wrote:
>> Rather than attempting to condition the entire tree to machine SRCREV (since
>> we don't know what branch will be built), we can instead wait until patching
>> has completed and then confirm that we are indeed building a decendant of the
>> specified SRCREV. The result is a much simpler check, and no mangling of the
>> tree.
>>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> ---
>>   meta/classes/kernel-yocto.bbclass | 39 +++++++++++++++++++++++----------------
>>   1 file changed, 23 insertions(+), 16 deletions(-)
>
> Looks like some versions of git on the AB cluster don't support this. Do
> we need to bump the minimum git version and install buildtools-tarball
> on the affected machines? Or can we use some other construct here?
>
> https://autobuilder.yoctoproject.org/main/builders/nightly-x86-64/builds/24/steps/BuildImages/logs/stdio
>

I pushed a patch to my contrib kernel/zedd patch that should address this,
and I've also attached it here.

We simply switch back to the more basic commands, and will worry about
--is-ancestor at some point in the future :)

This passed my two tests here.

Bruce

> Cheers,
>
> Richard
>
>
>> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
>> index 38c886b21b09..4938712c7cff 100644
>> --- a/meta/classes/kernel-yocto.bbclass
>> +++ b/meta/classes/kernel-yocto.bbclass
>> @@ -71,6 +71,7 @@ do_patch() {
>>   	fi
>>
>>   	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
>> +	machine_srcrev="${SRCREV_machine}"
>>
>>   	# if we have a defined/set meta branch we should not be generating
>>   	# any meta data. The passed branch has what we need.
>> @@ -122,6 +123,17 @@ do_patch() {
>>   		exit 1
>>   	fi
>>
>> +	# see if the branch we are about to patch has been properly reset to the defined
>> +	# SRCREV .. if not, we reset it.
>> +	branch_head=`git rev-parse HEAD`
>> +	if [ "${machine_srcrev}" != "AUTOINC" ]; then
>> +	 	if [ "${machine_srcrev}" != "${branch_head}" ]; then
>> +			current_branch=`git rev-parse --abbrev-ref HEAD`
>> +			git branch "$current_branch-orig"
>> +			git reset --hard ${machine_srcrev}
>> +		fi
>> +	fi
>> +
>>   	# executes and modifies the source tree as required
>>   	patchme ${KMACHINE}
>>   	if [ $? -ne 0 ]; then
>> @@ -130,6 +142,17 @@ do_patch() {
>>   		exit 1
>>   	fi
>>
>> +	# check to see if the specified SRCREV is reachable from the final branch.
>> +	# if it wasn't something wrong has happened, and we should error.
>> +	if [ "${machine_srcrev}" != "AUTOINC" ]; then
>> +		git merge-base --is-ancestor ${machine_srcrev} HEAD
>> +	 	if [ $? -ne 0 ]; then
>> +			bbnote "ERROR: SRCREV ${machine_srcrev} was specified, but is not reachable"
>> +			bbnote "       Check the BSP description for incorrect branch selection, or other errors."
>> +			exit 1
>> +		fi
>> +	fi
>> +
>>   	# Perform a final check. If something other than the default kernel
>>   	# branch was requested, and that's not where we ended up, then we
>>   	# should thrown an error, since we aren't building what was expected
>> @@ -335,22 +358,6 @@ do_validate_branches() {
>>   		exit 1
>>   	fi
>>
>> -	# force the SRCREV in each branch that contains the specified
>> -	# SRCREV (if it isn't the current HEAD of that branch)
>> -	git checkout -q master
>> -	for b in $containing_branches; do
>> -		branch_head=`git show-ref -s --heads ${b}`		
>> -		if [ "$branch_head" != "$machine_srcrev" ]; then
>> -			echo "[INFO] Setting branch $b to ${machine_srcrev}"
>> -			if [ "$b" = "master" ]; then
>> -				git reset --hard $machine_srcrev > /dev/null
>> -			else
>> -				git branch -D $b > /dev/null
>> -				git branch $b $machine_srcrev > /dev/null
>> -			fi
>> -		fi
>> -	done
>> -
>>   	## KMETA branch validation.
>>   	## We do validation if the meta branch exists, and AUTOREV hasn't been set
>>    	meta_head=`git show-ref -s --heads ${KMETA}`
>
>


[-- Attachment #2: 0001-kernel-yocto-replace-is-ancestor-with-basic-git-porc.patch --]
[-- Type: application/mbox, Size: 1542 bytes --]

Re: [PATCH 00/18] kernel-yocto: consolidated pull request

[Richard Purdie]

Thanks for the other fix, I've pulled that in and am retesting. I did
also see:

https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/24/steps/BuildImages/logs/stdio

ERROR: Fetcher failure: Unable to find revision 5a47bbc4c3c2472f3746a8cf1485db7134cf9245 in branch master even from upstream
ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-tiny/3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0/temp/log.do_fetch.10000
NOTE: recipe linux-yocto-tiny-3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0: task do_fetch: Failed
ERROR: Task 324 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb, do_fetch) failed with exit code '1'
WARNING: Failed to fetch URL git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta, attempting MIRRORS if available
ERROR: Fetcher failure: Unable to find revision 12f9e966eb249c3bdcc935612e2a372e90bad950 in branch master even from upstream
ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-rt/3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0/temp/log.do_fetch.9978
NOTE: recipe linux-yocto-rt-3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0: task do_fetch: Failed
ERROR: Task 325 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb, do_fetch) failed with exit code '1

(I've a fix in for the other alsa failure)

Any idea what's up with this?

Cheers,

Richard

Re: [PATCH 00/18] kernel-yocto: consolidated pull request

[Bruce Ashfield]

On 2014-08-31, 6:07 AM, Richard Purdie wrote:
> Thanks for the other fix, I've pulled that in and am retesting. I did
> also see:
>
> https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/24/steps/BuildImages/logs/stdio
>
> ERROR: Fetcher failure: Unable to find revision 5a47bbc4c3c2472f3746a8cf1485db7134cf9245 in branch master even from upstream
> ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-tiny/3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0/temp/log.do_fetch.10000
> NOTE: recipe linux-yocto-tiny-3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0: task do_fetch: Failed
> ERROR: Task 324 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb, do_fetch) failed with exit code '1'
> WARNING: Failed to fetch URL git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta, attempting MIRRORS if available
> ERROR: Fetcher failure: Unable to find revision 12f9e966eb249c3bdcc935612e2a372e90bad950 in branch master even from upstream
> ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-rt/3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0/temp/log.do_fetch.9978
> NOTE: recipe linux-yocto-rt-3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0: task do_fetch: Failed
> ERROR: Task 325 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb, do_fetch) failed with exit code '1
>
> (I've a fix in for the other alsa failure)
>
> Any idea what's up with this?

Hmmm. I'm not sure why it is looking for that commit on master for the
3.14 kernel. That's my merge of v3.14.17, so it definitely will not
be on the master branch.


% git show 5a47bbc4c3c2472f3746a8cf1485db7134cf9245
commit 5a47bbc4c3c2472f3746a8cf1485db7134cf9245
Merge: 233bb0d36202 946de0e6b6ed
Author: Bruce Ashfield <bruce.ashfield@windriver.com>
Date:   Mon Aug 25 14:17:26 2014 -0400

     Merge tag 'v3.14.17' into standard/base

     This is the 3.14.17 stable release

I didn't do anything different for this -stable update than any other.

I'm out for the day today, but can look at this again tonight .. I must
have fat fingered something, since I can't see why the 
linux-yocto_3.14.bb KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"

isn't overriding the linux-yocto.inc default of KBRANCH ?= "master"

Bruce


>
> Cheers,
>
> Richard
>

Re: [PATCH 00/18] kernel-yocto: consolidated pull request

[Otavio Salvador]

On Sat, Aug 30, 2014 at 1:38 AM, Bruce Ashfield
<bruce.ashfield@windriver.com> wrote:
> Here's the pending queue of kernel changes for the 1.7 feature freeze.
> The queue is large, but I've actually been building and running with
> most of these changes for 6 months now, so they've been soaked for
> quite a while.

Why waiting such long time to send them?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 00/18] kernel-yocto: consolidated pull request

[Bruce Ashfield]

On Sun, Aug 31, 2014 at 7:41 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Sat, Aug 30, 2014 at 1:38 AM, Bruce Ashfield
> <bruce.ashfield@windriver.com> wrote:
>> Here's the pending queue of kernel changes for the 1.7 feature freeze.
>> The queue is large, but I've actually been building and running with
>> most of these changes for 6 months now, so they've been soaked for
>> quite a while.
>
> Why waiting such long time to send them?

Higher priority items, and everything needed to be retested.
My intention was simply to let Richard know that they've been tested
on hundreds of builds, not to explain the inner workings of my schedule
and when I get enough cycles to be happy with a series.

Cheers,

Bruce

>
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



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

Re: [PATCH 00/18] kernel-yocto: consolidated pull request

[Bruce Ashfield]

On 2014-08-31, 6:07 AM, Richard Purdie wrote:
> Thanks for the other fix, I've pulled that in and am retesting. I did
> also see:
>
> https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/24/steps/BuildImages/logs/stdio
>
> ERROR: Fetcher failure: Unable to find revision 5a47bbc4c3c2472f3746a8cf1485db7134cf9245 in branch master even from upstream
> ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-tiny/3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0/temp/log.do_fetch.10000
> NOTE: recipe linux-yocto-tiny-3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0: task do_fetch: Failed
> ERROR: Task 324 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb, do_fetch) failed with exit code '1'
> WARNING: Failed to fetch URL git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta, attempting MIRRORS if available
> ERROR: Fetcher failure: Unable to find revision 12f9e966eb249c3bdcc935612e2a372e90bad950 in branch master even from upstream
> ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-rt/3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0/temp/log.do_fetch.9978
> NOTE: recipe linux-yocto-rt-3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0: task do_fetch: Failed
> ERROR: Task 325 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb, do_fetch) failed with exit code '1
>
> (I've a fix in for the other alsa failure)
>
> Any idea what's up with this?

I've managed to reproduce the failure locally now (I had to explicitly
build -tiny). Investigating and will follow up with a patch later.

Bruce

>
> Cheers,
>
> Richard
>

Re: [PATCH 00/18] kernel-yocto: consolidated pull request

[Bruce Ashfield]

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

On 2014-08-31, 6:07 AM, Richard Purdie wrote:
> Thanks for the other fix, I've pulled that in and am retesting. I did
> also see:
>
> https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/24/steps/BuildImages/logs/stdio
>
> ERROR: Fetcher failure: Unable to find revision 5a47bbc4c3c2472f3746a8cf1485db7134cf9245 in branch master even from upstream
> ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-tiny/3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0/temp/log.do_fetch.10000
> NOTE: recipe linux-yocto-tiny-3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0: task do_fetch: Failed
> ERROR: Task 324 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb, do_fetch) failed with exit code '1'
> WARNING: Failed to fetch URL git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta, attempting MIRRORS if available
> ERROR: Fetcher failure: Unable to find revision 12f9e966eb249c3bdcc935612e2a372e90bad950 in branch master even from upstream
> ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-rt/3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0/temp/log.do_fetch.9978
> NOTE: recipe linux-yocto-rt-3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0: task do_fetch: Failed
> ERROR: Task 325 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb, do_fetch) failed with exit code '1
>
> (I've a fix in for the other alsa failure)
>
> Any idea what's up with this?

Fixed. I just pushed the patch to my contrib zedd/kernel branch. Attached
here as well.

I did fat finger the conditional assignments and include order in my
KBRANCH_DEFAULT removal patch.

But it is working now, and I'm back to normally scheduled long weekend
activities .. but will of course continue to monitor.

Bruce



>
> Cheers,
>
> Richard
>


[-- Attachment #2: 0001-linux-yocto-ensure-that-recipe-specific-defaults-tak.patch --]
[-- Type: application/mbox, Size: 4442 bytes --]

Re: [PATCH 00/18] kernel-yocto: consolidated pull request

[Richard Purdie]

On Sun, 2014-08-31 at 22:39 -0400, Bruce Ashfield wrote:
> On 2014-08-31, 6:07 AM, Richard Purdie wrote:
> > Thanks for the other fix, I've pulled that in and am retesting. I did
> > also see:
> >
> > https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/24/steps/BuildImages/logs/stdio
> >
> > ERROR: Fetcher failure: Unable to find revision 5a47bbc4c3c2472f3746a8cf1485db7134cf9245 in branch master even from upstream
> > ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
> > ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-tiny/3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0/temp/log.do_fetch.10000
> > NOTE: recipe linux-yocto-tiny-3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0: task do_fetch: Failed
> > ERROR: Task 324 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb, do_fetch) failed with exit code '1'
> > WARNING: Failed to fetch URL git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta, attempting MIRRORS if available
> > ERROR: Fetcher failure: Unable to find revision 12f9e966eb249c3bdcc935612e2a372e90bad950 in branch master even from upstream
> > ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
> > ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-rt/3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0/temp/log.do_fetch.9978
> > NOTE: recipe linux-yocto-rt-3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0: task do_fetch: Failed
> > ERROR: Task 325 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb, do_fetch) failed with exit code '1
> >
> > (I've a fix in for the other alsa failure)
> >
> > Any idea what's up with this?
> 
> Fixed. I just pushed the patch to my contrib zedd/kernel branch. Attached
> here as well.
> 
> I did fat finger the conditional assignments and include order in my
> KBRANCH_DEFAULT removal patch.
> 
> But it is working now, and I'm back to normally scheduled long weekend
> activities .. but will of course continue to monitor.

Thanks, much appreciated. We're down to one remaining issue:

https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/27/steps/BuildImages/logs/stdio

which is basically because by default, meta-skeleton isn't in
bblayers.conf. Not quite sure what the correct fix is here.

For now I've merged everything in the series except the image addition.

Cheers,

Richard

Re: [PATCH 00/18] kernel-yocto: consolidated pull request

[Bruce Ashfield]

On 2014-09-01, 12:12 PM, Richard Purdie wrote:
> On Sun, 2014-08-31 at 22:39 -0400, Bruce Ashfield wrote:
>> On 2014-08-31, 6:07 AM, Richard Purdie wrote:
>>> Thanks for the other fix, I've pulled that in and am retesting. I did
>>> also see:
>>>
>>> https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/24/steps/BuildImages/logs/stdio
>>>
>>> ERROR: Fetcher failure: Unable to find revision 5a47bbc4c3c2472f3746a8cf1485db7134cf9245 in branch master even from upstream
>>> ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
>>> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-tiny/3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0/temp/log.do_fetch.10000
>>> NOTE: recipe linux-yocto-tiny-3.14.17+gitAUTOINC+ccad961c4c_5a47bbc4c3-r0: task do_fetch: Failed
>>> ERROR: Task 324 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb, do_fetch) failed with exit code '1'
>>> WARNING: Failed to fetch URL git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta, attempting MIRRORS if available
>>> ERROR: Fetcher failure: Unable to find revision 12f9e966eb249c3bdcc935612e2a372e90bad950 in branch master even from upstream
>>> ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=master,meta;name=machine,meta'. Unable to fetch URL from any source.
>>> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/linux-yocto-rt/3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0/temp/log.do_fetch.9978
>>> NOTE: recipe linux-yocto-rt-3.14.17+gitAUTOINC+ccad961c4c_12f9e966eb-r0: task do_fetch: Failed
>>> ERROR: Task 325 (/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb, do_fetch) failed with exit code '1
>>>
>>> (I've a fix in for the other alsa failure)
>>>
>>> Any idea what's up with this?
>>
>> Fixed. I just pushed the patch to my contrib zedd/kernel branch. Attached
>> here as well.
>>
>> I did fat finger the conditional assignments and include order in my
>> KBRANCH_DEFAULT removal patch.
>>
>> But it is working now, and I'm back to normally scheduled long weekend
>> activities .. but will of course continue to monitor.
>
> Thanks, much appreciated. We're down to one remaining issue:
>
> https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/27/steps/BuildImages/logs/stdio
>
> which is basically because by default, meta-skeleton isn't in
> bblayers.conf. Not quite sure what the correct fix is here.

Aha .. indeed.

>
> For now I've merged everything in the series except the image addition.

Sounds good. I'll have a look at that image type and see what I can cook up.

Bruce

>
> Cheers,
>
> Richard
>