Poky Project Discussions
 help / color / mirror / Atom feed
* [PATCH 0/3] linux-yocto: consolidated pull request
@ 2011-01-17 21:57 Bruce Ashfield
  2011-01-17 21:57 ` [PATCH 1/3] linux-yocto: beagleboard enablement Bruce Ashfield
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-01-17 21:57 UTC (permalink / raw)
  To: rpurdie; +Cc: yocto, poky, saul.wold

Richard/Saul,

This pull request contains three changes on top of the previously
sent changes that are still pending:

 linux-yocto: enable arch ARM config settings for KARCH based boards
 linux-yocto-stable: add atom-pc preempt_rt support
 linux-yocto: add systemtap config to -stable and -dev kernels

But I wanted to send these anyway, since them sitting on my disk
here isn't helping anyone.

The first commit: 

linux-yocto: update validate_branches to detected invalid commit IDs

Addresses a problem that Richard ran into when invalid commit IDs
are used for SRCREVs. I tested this while fixing the ARM boot 
issues.

The second commit:

linux-yocto: streamline new BSP creation

Is self explanitory, as is the commit message. With this change you
can throw a previously unknown machine at the yocto kernel and have
a resonable first effort at booting the board and creating an
environment for development.

And finally:

linux-yocto: beagleboard enablement

Enables the beagleboard for 2.6.37. The patch itself has the details.

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

Thanks,
    Bruce Ashfield <bruce.ashfield@windriver.com>
---


Bruce Ashfield (3):
  linux-yocto: beagleboard enablement
  linux-yocto: streamline new BSP creation
  linux-yocto: update validate_branches to detected invalid commit IDs

 meta/classes/kernel-yocto.bbclass  |   37 ++++++++++++++++++++---------------
 meta/conf/machine/beagleboard.conf |    6 ++--
 2 files changed, 24 insertions(+), 19 deletions(-)



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/3] linux-yocto: beagleboard enablement
  2011-01-17 21:57 [PATCH 0/3] linux-yocto: consolidated pull request Bruce Ashfield
@ 2011-01-17 21:57 ` Bruce Ashfield
  2011-01-17 21:57 ` [PATCH 2/3] linux-yocto: streamline new BSP creation Bruce Ashfield
  2011-01-17 21:57 ` [PATCH 3/3] linux-yocto: update validate_branches to detected invalid commit IDs Bruce Ashfield
  2 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-01-17 21:57 UTC (permalink / raw)
  To: rpurdie; +Cc: yocto, poky, saul.wold

Enable beagleboard support for 2.6.37. The only non-kernel related
change for the board is to update the serial console designation.

The Beagleboard use omap serial driver, so we replace ttyS2 with ttyO2.
This is described in following link:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg40838.html

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Liming Wang <liming.wang@windriver.com>
---
 meta/conf/machine/beagleboard.conf |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/conf/machine/beagleboard.conf b/meta/conf/machine/beagleboard.conf
index cb6417b..bbb0f21 100644
--- a/meta/conf/machine/beagleboard.conf
+++ b/meta/conf/machine/beagleboard.conf
@@ -19,10 +19,10 @@ IMAGE_FSTYPES += "tar.bz2 jffs2"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 # Guesswork
-SERIAL_CONSOLE = "115200 ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-stable"
-#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 
 KERNEL_IMAGETYPE = "uImage"
 
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] linux-yocto: streamline new BSP creation
  2011-01-17 21:57 [PATCH 0/3] linux-yocto: consolidated pull request Bruce Ashfield
  2011-01-17 21:57 ` [PATCH 1/3] linux-yocto: beagleboard enablement Bruce Ashfield
@ 2011-01-17 21:57 ` Bruce Ashfield
  2011-01-17 21:57 ` [PATCH 3/3] linux-yocto: update validate_branches to detected invalid commit IDs Bruce Ashfield
  2 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-01-17 21:57 UTC (permalink / raw)
  To: rpurdie; +Cc: yocto, poky, saul.wold

By setting BOOTSTRAP to the branch that should be used for a
currently undefined BSP a build can be completed and an
environment for streamlining the BSP created.

With the appropriate machine.conf, and a defconfig any MACHINE
can be built against and inherit the configuration of the
standard yocto kernel.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index df2a8a4..88dcf32 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -24,7 +24,7 @@ python __anonymous () {
             bb.data.setVar("KMACHINE", "${MACHINE}", d)
             # track the global configuration on a bootstrapped BSP
             bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d)
-            bb.data.setVar("BOOTSTRAP", "t", d)
+            bb.data.setVar("BOOTSTRAP", bb.data.expand("${MACHINE}",d) + "-standard", d)
     else:
         # The branch for a build is:
         #    yocto/<kernel type>/${KMACHINE} or
@@ -44,10 +44,10 @@ python __anonymous () {
         bb.data.setVar('KMACHINE_' + bb.data.expand("${MACHINE}",d), kmachine, d)
 
         if mach == "UNDEFINED":
-            bb.data.setVar("KBRANCH", "yocto/standard/base", d)
             bb.data.setVar('KMACHINE_' + bb.data.expand("${MACHINE}",d), bb.data.expand("${MACHINE}",d), d)
+            bb.data.setVar("KBRANCH", "yocto/standard/base", d)
             bb.data.setVar("SRCREV_machine", "standard", d)
-            bb.data.setVar("BOOTSTRAP", "t", d)
+            bb.data.setVar("BOOTSTRAP", "yocto/standard/" + bb.data.expand("${MACHINE}",d), d)
 }
 
 do_patch() {
@@ -57,6 +57,11 @@ do_patch() {
 	fi
 
 	kbranch=${KBRANCH}
+	if [ -n "${BOOTSTRAP}" ]; then
+           # switch from a generic to a specific branch
+           kbranch=${BOOTSTRAP}
+	fi
+
 
 	# simply ensures that a branch of the right name has been created
 	createme ${ARCH} ${kbranch} ${defconfig}
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/3] linux-yocto: update validate_branches to detected invalid commit IDs
  2011-01-17 21:57 [PATCH 0/3] linux-yocto: consolidated pull request Bruce Ashfield
  2011-01-17 21:57 ` [PATCH 1/3] linux-yocto: beagleboard enablement Bruce Ashfield
  2011-01-17 21:57 ` [PATCH 2/3] linux-yocto: streamline new BSP creation Bruce Ashfield
@ 2011-01-17 21:57 ` Bruce Ashfield
  2 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-01-17 21:57 UTC (permalink / raw)
  To: rpurdie; +Cc: yocto, poky, saul.wold

The previous implementation of invalid commit ID checks would
error early when a bad object was detected. Rather than changing
to set +e for the entire routine, we'll capture the output and
do an explicit check for a bad object and throw a useful error
message when it is detected.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 88dcf32..32d2e20 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -161,30 +161,30 @@ do_validate_branches() {
 	current=`git branch |grep \*|sed 's/^\* //'`
 	if [ -n "$target_branch_head" ] && [ "$branch_head" != "$target_branch_head" ]; then
 		if [ -n "${KERNEL_REVISION_CHECKING}" ]; then
-			git show ${target_branch_head} > /dev/null 2>&1
-			if [ $? -eq 0 ]; then
-				echo "Forcing branch $current to ${target_branch_head}"
-				git branch -m $current $current-orig
-				git checkout -b $current ${target_branch_head}
-			else
+			ref=`git show ${target_meta_head} 2>&1 | head -n1 || true`
+			if [ "$ref" = "fatal: bad object ${target_meta_head}" ]; then
 				echo "ERROR ${target_branch_head} is not a valid commit ID."
 				echo "The kernel source tree may be out of sync"
 				exit 1
-			fi	       
+			else
+				echo "Forcing branch $current to ${target_branch_head}"
+				git branch -m $current $current-orig
+				git checkout -b $current ${target_branch_head}
+			fi
 		fi
 	fi
 
 	if [ "$meta_head" != "$target_meta_head" ]; then
 		if [ -n "${KERNEL_REVISION_CHECKING}" ]; then
-			git show ${target_meta_head} > /dev/null 2>&1
-			if [ $? -eq 0 ]; then
-				echo "Forcing branch meta to ${target_meta_head}"
-				git branch -m ${KMETA} ${KMETA}-orig
-				git checkout -b ${KMETA} ${target_meta_head}
-			else
+			ref=`git show ${target_meta_head} 2>&1 | head -n1 || true`
+			if [ "$ref" = "fatal: bad object ${target_meta_head}" ]; then
 				echo "ERROR ${target_meta_head} is not a valid commit ID"
 				echo "The kernel source tree may be out of sync"
 				exit 1
+			else
+				echo "Forcing branch meta to ${target_meta_head}"
+				git branch -m ${KMETA} ${KMETA}-orig
+				git checkout -b ${KMETA} ${target_meta_head}
 			fi	   
 		fi
 	fi
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 0/3] linux-yocto: consolidated pull request
@ 2011-05-05  4:53 Bruce Ashfield
  0 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-05-05  4:53 UTC (permalink / raw)
  To: richard.purdie; +Cc: yocto, openembedded-core, poky, saul.wold

Richard/Saul,

I've been running with these changes since before ELC, so they've had
some good soak time. The first two changes lay the ground for for some
1.1 functionality and are used by recipes in the meta-kernel-dev layer.
The changes are transparent to existing recipes.

In particular they are related to auto creating meta data for kernel
repository builds. They are enough for basic korg/defconfig builds and
limited other repository building. More changes will complete this work
shortly.

The last patch just updates the SRCREVs to pickup Khem's backported
perf tool / gcc 4.6.0 patch.

There are about 8 more pending patches that deal with some recipe
renames, cleanup and more 1.1 functionality but I wanted to get
this first set of 3 out before rebasing the rest.

Sorry about the big cross post, but these changes span quite a few
different interest groups.

cc: Khem Raj <raj.khem@gmail.com>

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

Thanks,
    Bruce Ashfield <bruce.ashfield@windriver.com>
---


Bruce Ashfield (3):
  linux-yocto: apply meta data to external repos
  linux-yocto: safely process unbranched repositories
  linux-yocto: update SRCREVs

 meta/classes/kernel-yocto.bbclass                  |   34 +++++++++++++++-----
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 meta/recipes-kernel/linux/linux-yocto_git.bb       |   24 +++++++-------
 3 files changed, 39 insertions(+), 21 deletions(-)



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 0/3] linux-yocto: consolidated pull request
@ 2011-05-09 18:34 Bruce Ashfield
  0 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-05-09 18:34 UTC (permalink / raw)
  To: richard.purdie; +Cc: yocto, dvhart, openembedded-core, poky, saul.wold

Saul/Richard,

The first two patches are a split and resend of the machine
movement patch:

[
   linux-yocto: move non-core machines to meta-yocto

   The machine configuration of the non-core (non-qemu) machines
   has moved to meta-yocto. Moving the branch mappings, compatibility
   and SRCREVs of these machines to meta-yocto should also be
   done.

  Anyone using meta-yocto to build these machines will see no impact
  from this change.
]

Patch #3 is a sanity check that shows a problem that Tom managed
to hit, and cause us some significant debug time. If for some 
reason (we still don't have a root cause) the kernel repo is cloned
without tags and/or meta data, we can now detect it and throw an
informative error message rather than generating meta data and
building "something".

cc: Darren Hart <dvhart@linux.intel.com> 
cc: Tom Zanussi <tom.zanussi@intel.com>

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

Thanks,
    Bruce Ashfield <bruce.ashfield@windriver.com>
---


Bruce Ashfield (3):
  linux-yocto: remove non-core (qemu) machine compatibility
  linux-yocto: move non-core machines to meta-yocto
  linux-yocto: error if meta data not present

 meta-yocto/conf/layer.conf                         |    3 ++-
 .../linux/linux-yocto-stable_git.bbappend          |   12 ++++++++++++
 .../recipes-kernel/linux/linux-yocto_git.bbappend  |   12 ++++++++++++
 meta/classes/kernel-yocto.bbclass                  |    5 ++++-
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 .../recipes-kernel/linux/linux-yocto-stable_git.bb |   10 +---------
 meta/recipes-kernel/linux/linux-yocto_git.bb       |   15 ++++-----------
 7 files changed, 36 insertions(+), 23 deletions(-)
 create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend
 create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2011-05-09 18:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-17 21:57 [PATCH 0/3] linux-yocto: consolidated pull request Bruce Ashfield
2011-01-17 21:57 ` [PATCH 1/3] linux-yocto: beagleboard enablement Bruce Ashfield
2011-01-17 21:57 ` [PATCH 2/3] linux-yocto: streamline new BSP creation Bruce Ashfield
2011-01-17 21:57 ` [PATCH 3/3] linux-yocto: update validate_branches to detected invalid commit IDs Bruce Ashfield
  -- strict thread matches above, loose matches on Subject: below --
2011-05-05  4:53 [PATCH 0/3] linux-yocto: consolidated pull request Bruce Ashfield
2011-05-09 18:34 Bruce Ashfield

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox