* [PATCH 0/1] POKY - Master Pull Request
@ 2011-05-10 5:25 Saul Wold
2011-05-10 5:25 ` [PATCH 1/1] linux-yocto: move non-core machines to meta-yocto Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2011-05-10 5:25 UTC (permalink / raw)
To: poky; +Cc: Darren Hart
From: Saul Wold <sgw@linux.intel.com>
Richard,
This is a change set that matches up with Bruce's changeset
contained in tonight's consolidated pull request.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: stage/master
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=stage/master
Thanks,
Saul Wold <sgw@linux.intel.com>
---
Bruce Ashfield (1):
linux-yocto: move non-core machines to meta-yocto
meta-yocto/conf/layer.conf | 3 ++-
.../linux/linux-yocto-stable_git.bbappend | 12 ++++++++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 12 ++++++++++++
3 files changed, 26 insertions(+), 1 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] 3+ messages in thread* [PATCH 1/1] linux-yocto: move non-core machines to meta-yocto
2011-05-10 5:25 [PATCH 0/1] POKY - Master Pull Request Saul Wold
@ 2011-05-10 5:25 ` Saul Wold
2011-05-10 9:03 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2011-05-10 5:25 UTC (permalink / raw)
To: poky; +Cc: Darren Hart
From: Bruce Ashfield <bruce.ashfield@windriver.com>
The non-qemu compatibility references have been removed from
the main linux-yocto recipe. This change restores them in the
meta-yocto layer.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
---
meta-yocto/conf/layer.conf | 3 ++-
.../linux/linux-yocto-stable_git.bbappend | 12 ++++++++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 12 ++++++++++++
3 files changed, 26 insertions(+), 1 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
diff --git a/meta-yocto/conf/layer.conf b/meta-yocto/conf/layer.conf
index f11d8ed..68786b2 100644
--- a/meta-yocto/conf/layer.conf
+++ b/meta-yocto/conf/layer.conf
@@ -2,7 +2,8 @@
BBPATH := "${BBPATH}:${LAYERDIR}"
# We have a packages directory, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb"
+BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
+ ${LAYERDIR}/recipes-*/*/*.bbappend"
BBFILE_COLLECTIONS += "yocto"
BBFILE_PATTERN_yocto := "^${LAYERDIR}/"
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend
new file mode 100644
index 0000000..ea0287d
--- /dev/null
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend
@@ -0,0 +1,12 @@
+KMACHINE_atom-pc = "atom-pc"
+KMACHINE_routerstationpro = "routerstationpro"
+KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
+KMACHINE_beagleboard = "beagleboard"
+
+SRCREV_machine_atom-pc = "72ca49ab08b8eb475cec82a10049503602325791"
+SRCREV_machine_routerstationpro = "49745cd45c92a89e70c6e2334caa80818c134562"
+SRCREV_machine_mpc8315e-rdb = "a1c0ed6bf4060c10874b2a8547d81b3169dcf16a"
+SRCREV_machine_beagleboard = "ef7f944e773950d4016b7643f9ecf052bbe250cd"
+
+COMPATIBLE_MACHINE += "(atom-pc|routerstationpro|mpc8315e-rdb|beagleboard)"
+
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend
new file mode 100644
index 0000000..e4aa7fd
--- /dev/null
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend
@@ -0,0 +1,12 @@
+KMACHINE_atom-pc = "yocto/standard/common-pc/atom-pc"
+KMACHINE_routerstationpro = "yocto/standard/routerstationpro"
+KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb"
+KMACHINE_beagleboard = "yocto/standard/beagleboard"
+
+SRCREV_machine_emenlow = "c3bbcb676f929c4fc0511a6e66494b8770d015a1"
+SRCREV_machine_atom-pc = "b906f358fd404a1e74a961f25079274e0d933ee1"
+SRCREV_machine_routerstationpro = "95ca94d2e71ca2db6822a37a7f575fa79c3d05d0"
+SRCREV_machine_mpc8315e-rdb = "53c800c244e73d81d2832f6da306eeae3b09e5dc"
+SRCREV_machine_beagleboard = "b906f358fd404a1e74a961f25079274e0d933ee1"
+
+COMPATIBLE_MACHINE = "(mpc8315e-rdb|routerstationpro|beagleboard)"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] linux-yocto: move non-core machines to meta-yocto
2011-05-10 5:25 ` [PATCH 1/1] linux-yocto: move non-core machines to meta-yocto Saul Wold
@ 2011-05-10 9:03 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-05-10 9:03 UTC (permalink / raw)
To: Saul Wold; +Cc: Darren Hart, poky
On Mon, 2011-05-09 at 22:25 -0700, Saul Wold wrote:
> From: Bruce Ashfield <bruce.ashfield@windriver.com>
>
> The non-qemu compatibility references have been removed from
> the main linux-yocto recipe. This change restores them in the
> meta-yocto layer.
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> Acked-by: Darren Hart <dvhart@linux.intel.com>
> ---
> meta-yocto/conf/layer.conf | 3 ++-
> .../linux/linux-yocto-stable_git.bbappend | 12 ++++++++++++
> .../recipes-kernel/linux/linux-yocto_git.bbappend | 12 ++++++++++++
> 3 files changed, 26 insertions(+), 1 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
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-10 10:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-10 5:25 [PATCH 0/1] POKY - Master Pull Request Saul Wold
2011-05-10 5:25 ` [PATCH 1/1] linux-yocto: move non-core machines to meta-yocto Saul Wold
2011-05-10 9:03 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.