* [PATCH 1/4] linux-yocto: pass KMACHINE to updateme, not MACHINE
2011-08-06 4:19 [PATCH 0/4] Richard/Saul, Bruce Ashfield
@ 2011-08-06 4:19 ` Bruce Ashfield
2011-08-06 4:19 ` [PATCH 2/4] linux-yocto: allow configuration of arbitrary branches Bruce Ashfield
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Bruce Ashfield @ 2011-08-06 4:19 UTC (permalink / raw)
To: richard.purdie; +Cc: dvhart, openembedded-core, saul.wold
To support the mapping of any oe/yocto MACHINE to a kernel
branch that may not share that naming structure we have
KMACHINE and KBRANCH. To allow the mapping to work, we
actually have to pass KMACHINE into updateme and not MACHINE.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index a374df1..5e7003b 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -28,7 +28,7 @@ do_patch() {
addon_features="$addon_features --feature $feat"
done
fi
- updateme --branch ${kbranch} ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR}
+ updateme --branch ${kbranch} ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
if [ $? -ne 0 ]; then
echo "ERROR. Could not update ${kbranch}"
exit 1
--
1.7.4.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/4] linux-yocto: allow configuration of arbitrary branches
2011-08-06 4:19 [PATCH 0/4] Richard/Saul, Bruce Ashfield
2011-08-06 4:19 ` [PATCH 1/4] linux-yocto: pass KMACHINE to updateme, not MACHINE Bruce Ashfield
@ 2011-08-06 4:19 ` Bruce Ashfield
2011-08-06 4:19 ` [PATCH 3/4] linux-yocto: update atom-pc preempt-rt definition Bruce Ashfield
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Bruce Ashfield @ 2011-08-06 4:19 UTC (permalink / raw)
To: richard.purdie; +Cc: dvhart, openembedded-core, saul.wold
When building an external tree or bootstrapping a BSP the
external branch may not have been checked out. The tools now ensure
that the tree is ready for configuration, so we no longer need to
force the checkout of the external branch.
This change is coupled with some kern tools tweaks as follows:
40d9bab updateme: allow the location of board descriptions based on defines
59859ca createme: use branch name when creating meta data
91b4275 configme: determine meta branch based on directories, not branch naming
f5a915c kgit-meta: make branch creation and renaming more robust
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 16 ++++------------
.../kern-tools/kern-tools-native_git.bb | 2 +-
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 5e7003b..f31ff61 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -28,7 +28,8 @@ do_patch() {
addon_features="$addon_features --feature $feat"
done
fi
- updateme --branch ${kbranch} ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
+ updateme --branch ${kbranch} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
+ ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
if [ $? -ne 0 ]; then
echo "ERROR. Could not update ${kbranch}"
exit 1
@@ -86,17 +87,8 @@ addtask kernel_checkout before do_patch after do_unpack
do_kernel_configme() {
echo "[INFO] doing kernel configme"
- kbranch=${KBRANCH}
- if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
- # switch from a generic to a specific branch
- kbranch=${YOCTO_KERNEL_EXTERNAL_BRANCH}
- cd ${S}
- git checkout ${kbranch}
- else
- cd ${S}
- fi
-
- configme --reconfig --output ${B} ${kbranch} ${MACHINE}
+ cd ${S}
+ configme --reconfig --output ${B} ${KBRANCH} ${KMACHINE}
if [ $? -ne 0 ]; then
echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
exit 1
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 1fbb1f7..5659252 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=e2bf4415f3d8
DEPENDS = "git-native guilt-native"
-SRCREV = "f5a915c277a37ba5949b4c0778356189e7dd9ec0"
+SRCREV = "40d9bab24bde4c2f94a0cece153663aa93e0f9a4"
PR = r10
PV = "0.1+git${SRCPV}"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/4] linux-yocto: update atom-pc preempt-rt definition
2011-08-06 4:19 [PATCH 0/4] Richard/Saul, Bruce Ashfield
2011-08-06 4:19 ` [PATCH 1/4] linux-yocto: pass KMACHINE to updateme, not MACHINE Bruce Ashfield
2011-08-06 4:19 ` [PATCH 2/4] linux-yocto: allow configuration of arbitrary branches Bruce Ashfield
@ 2011-08-06 4:19 ` Bruce Ashfield
2011-08-06 4:19 ` [PATCH 4/4] linux-yocto: merge v3.0.1 Bruce Ashfield
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Bruce Ashfield @ 2011-08-06 4:19 UTC (permalink / raw)
To: richard.purdie; +Cc: dvhart, openembedded-core, saul.wold
The atom-pc preempt-rt configuration wasn't pulling in the common-pc
settings, and wasn't defining re-use of the preempt-rt/base branch
properly.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index ead9d7c..bd08ca6 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -20,7 +20,7 @@ SRCREV_machine_qemuppc = "582dcc88c7c4d765c03b38ff384210d6efbf7956"
SRCREV_machine_qemux86 = "099a40c1669d20fdae2846cfd28bf74fd38dacea"
SRCREV_machine_qemux86-64 = "896b8fd5783a6aac80d1447da5958334f4734845"
SRCREV_machine = "2d22c15ef4802bc117c5482217c2b2c4d34ab303"
-SRCREV_meta = "37856a69113155d343efc8f8c59c7e63fbf963c4"
+SRCREV_meta = "76b3679beff6c640388a609ccf87f46bb7bf0f2b"
PR = "r0"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/4] linux-yocto: merge v3.0.1
2011-08-06 4:19 [PATCH 0/4] Richard/Saul, Bruce Ashfield
` (2 preceding siblings ...)
2011-08-06 4:19 ` [PATCH 3/4] linux-yocto: update atom-pc preempt-rt definition Bruce Ashfield
@ 2011-08-06 4:19 ` Bruce Ashfield
2011-08-06 4:22 ` [PATCH 0/4] Richard/Saul, Bruce Ashfield
2011-08-08 13:10 ` Richard Purdie
5 siblings, 0 replies; 7+ messages in thread
From: Bruce Ashfield @ 2011-08-06 4:19 UTC (permalink / raw)
To: richard.purdie; +Cc: dvhart, openembedded-core, saul.wold
3.0.1 -stable has been released. This now becomes the baseline for
the 3.0 linux-yocto tree. As was the policy in the 2.6.34 and
2.6.37 kernels, the version stays at 3.0 in the recipe.
Build and boot tested on qemu* targets.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index bd08ca6..a7bd67a 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -14,12 +14,12 @@ KMETA = meta
LINUX_VERSION ?= "3.0"
LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
-SRCREV_machine_qemuarm = "703430f6cd786d9f42fdee1936337ecf1c3d27b5"
-SRCREV_machine_qemumips = "a3bb11ebd7dd1482de334dd71f8e4afe5e2bcd32"
-SRCREV_machine_qemuppc = "582dcc88c7c4d765c03b38ff384210d6efbf7956"
-SRCREV_machine_qemux86 = "099a40c1669d20fdae2846cfd28bf74fd38dacea"
-SRCREV_machine_qemux86-64 = "896b8fd5783a6aac80d1447da5958334f4734845"
-SRCREV_machine = "2d22c15ef4802bc117c5482217c2b2c4d34ab303"
+SRCREV_machine_qemuarm = "30a2cec4e9d7048681c1d239f49cc935287a7012"
+SRCREV_machine_qemumips = "f9b9688cefaa87d898394902acfb858d6b0f1e28"
+SRCREV_machine_qemuppc = "a46a4c356f8bcf7a30d967a1b43633b824cd07a1"
+SRCREV_machine_qemux86 = "efaab1f75dbc577922c862fa19d45c3f31cb99cb"
+SRCREV_machine_qemux86-64 = "c30a56850c73c74af2d056d803081a0d829ce35c"
+SRCREV_machine = "318b059a472128f67119f367f51f11893ee60269"
SRCREV_meta = "76b3679beff6c640388a609ccf87f46bb7bf0f2b"
PR = "r0"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/4] Richard/Saul,
2011-08-06 4:19 [PATCH 0/4] Richard/Saul, Bruce Ashfield
` (3 preceding siblings ...)
2011-08-06 4:19 ` [PATCH 4/4] linux-yocto: merge v3.0.1 Bruce Ashfield
@ 2011-08-06 4:22 ` Bruce Ashfield
2011-08-08 13:10 ` Richard Purdie
5 siblings, 0 replies; 7+ messages in thread
From: Bruce Ashfield @ 2011-08-06 4:22 UTC (permalink / raw)
To: richard.purdie; +Cc: dvhart, saul.wold, openembedded-core
Hmm. Sorry about the broken subject on this, it's late and I had a
git-send-email
misfire. The contents is fine, I just didn't write the proper subject:
linux-yocto: update to v3.0.1 (and associated changes).
Cheers,
Bruce
On Sat, Aug 6, 2011 at 12:19 AM, Bruce Ashfield
<bruce.ashfield@windriver.com> wrote:
> Here's a collection of fixes that have been cooking here for the week.
> Build, boot and regression testing has been completed. With these the
> 3.0 kernel tree is bumped to 3.0.1, and some use cases have been updated
> to support building arbitrary repos (for x32 dev testing) and for
> building multiple machines (and kernel types) out of a single branch
> (-rt n450 support).
>
> The patches themselves contain the details.
>
> build and boot testing was done on the qemu* targets. With these changes
> it should be possible to start switching the prefernce to the 3.0.x
> kernel, and we can begin doing that next week.
>
> The following changes since commit 29208d2e353ba2f0b1c9b5d59014a2ea71dde078:
>
> local.conf.sample: Comment out BBMASK by default (2011-08-05 17:19:51 +0100)
>
> 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 (4):
> linux-yocto: pass KMACHINE to updateme, not MACHINE
> linux-yocto: allow configuration of arbitrary branches
> linux-yocto: update atom-pc preempt-rt definition
> linux-yocto: merge v3.0.1
>
> meta/classes/kernel-yocto.bbclass | 16 ++++------------
> .../kern-tools/kern-tools-native_git.bb | 2 +-
> meta/recipes-kernel/linux/linux-yocto_3.0.bb | 14 +++++++-------
> 3 files changed, 12 insertions(+), 20 deletions(-)
>
> --
> 1.7.4.1
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 0/4] Richard/Saul,
2011-08-06 4:19 [PATCH 0/4] Richard/Saul, Bruce Ashfield
` (4 preceding siblings ...)
2011-08-06 4:22 ` [PATCH 0/4] Richard/Saul, Bruce Ashfield
@ 2011-08-08 13:10 ` Richard Purdie
5 siblings, 0 replies; 7+ messages in thread
From: Richard Purdie @ 2011-08-08 13:10 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: dvhart, openembedded-core, saul.wold
On Sat, 2011-08-06 at 00:19 -0400, Bruce Ashfield wrote:
> Here's a collection of fixes that have been cooking here for the week.
> Build, boot and regression testing has been completed. With these the
> 3.0 kernel tree is bumped to 3.0.1, and some use cases have been updated
> to support building arbitrary repos (for x32 dev testing) and for
> building multiple machines (and kernel types) out of a single branch
> (-rt n450 support).
>
> The patches themselves contain the details.
>
> build and boot testing was done on the qemu* targets. With these changes
> it should be possible to start switching the prefernce to the 3.0.x
> kernel, and we can begin doing that next week.
>
> The following changes since commit 29208d2e353ba2f0b1c9b5d59014a2ea71dde078:
>
> local.conf.sample: Comment out BBMASK by default (2011-08-05 17:19:51 +0100)
>
> 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 (4):
> linux-yocto: pass KMACHINE to updateme, not MACHINE
> linux-yocto: allow configuration of arbitrary branches
> linux-yocto: update atom-pc preempt-rt definition
> linux-yocto: merge v3.0.1
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 7+ messages in thread