* [PATCH v3] meta-yocto/meta-intel: linux-yocto recipe renames
@ 2011-06-14 20:47 Bruce Ashfield
2011-06-14 20:47 ` [PATCH] meta-intel/linux-yocto: update to match the renamed linux-yocto recipes Bruce Ashfield
2011-06-14 20:47 ` [PATCH] meta-yocto/linux-yocto: " Bruce Ashfield
0 siblings, 2 replies; 5+ messages in thread
From: Bruce Ashfield @ 2011-06-14 20:47 UTC (permalink / raw)
To: dvhart, tom.zanussi, saul.wold; +Cc: yocto
Tom/Darren/Saul,
Here's v3 of this patch series, I was unfortunately on bernard when I did the
first and second patches. This one has been tested on multiple boards, and
contains changes to both the names and some SRCREV movement to bbappend
files.
Patch 2 is for meta-yocto with the same change.
These are the references that I found (hopefully I didn't
miss any) and fixed to the new naming convention.
Note: I still can't push to meta-intel-contrib, so I'm just
sending this as a patch.
Cheers,
Bruce
Bruce Ashfield (1):
meta-intel/linux-yocto: update to match the renamed linux-yocto
recipes
meta-crownbay/conf/machine/crownbay-noemgd.conf | 6 ------
meta-crownbay/conf/machine/crownbay.conf | 8 +-------
.../linux/linux-yocto-stable_git.bbappend | 9 ---------
.../linux/linux-yocto_2.6.34.bbappend | 15 +++++++++++++++
.../linux/linux-yocto_2.6.37.bbappend | 15 +++++++++++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 9 ---------
meta-emenlow/conf/machine/emenlow.conf | 6 ------
.../linux/linux-yocto-stable_git.bbappend | 3 ---
.../linux/linux-yocto_2.6.34.bbappend | 6 ++++++
.../linux/linux-yocto_2.6.37.bbappend | 6 ++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 3 ---
meta-fishriver/conf/machine/fishriver.conf | 6 ------
.../linux/linux-yocto-stable_git.bbappend | 5 -----
.../linux/linux-yocto_2.6.34.bbappend | 8 ++++++++
.../linux/linux-yocto_2.6.37.bbappend | 7 +++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 3 ---
meta-jasperforest/conf/machine/jasperforest.conf | 2 --
.../linux/linux-yocto-stable_git.bbappend | 5 -----
.../linux/linux-yocto_2.6.34.bbappend | 5 +++++
.../linux/linux-yocto_2.6.37.bbappend | 8 ++++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 6 ------
.../linux/linux-yocto-stable_git.bbappend | 10 ----------
.../linux/linux-yocto_2.6.34.bbappend | 10 ++++++++++
.../linux/linux-yocto_2.6.37.bbappend | 10 ++++++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 10 ----------
meta-sugarbay/conf/machine/sugarbay.conf | 3 ---
.../linux/linux-yocto_2.6.37.bbappend | 7 +++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 5 -----
28 files changed, 98 insertions(+), 98 deletions(-)
delete mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend
delete mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend
delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend
delete mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend
create mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] meta-intel/linux-yocto: update to match the renamed linux-yocto recipes
2011-06-14 20:47 [PATCH v3] meta-yocto/meta-intel: linux-yocto recipe renames Bruce Ashfield
@ 2011-06-14 20:47 ` Bruce Ashfield
2011-06-15 0:04 ` Darren Hart
2011-06-14 20:47 ` [PATCH] meta-yocto/linux-yocto: " Bruce Ashfield
1 sibling, 1 reply; 5+ messages in thread
From: Bruce Ashfield @ 2011-06-14 20:47 UTC (permalink / raw)
To: dvhart, tom.zanussi, saul.wold; +Cc: yocto
The linux-yocto recipes have been renamed to include explicit
version numbers. The meta-intel bbappends must be updated to
follow the new naming convention.
As a consequence of the recipe renames any SRCREV specificiations
that were part of a machine.conf have been moved to the corresponding
bbappend file. This allows the 2.6.34 and 2.6.37 SRCREVs to co-exist.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta-crownbay/conf/machine/crownbay-noemgd.conf | 6 ------
meta-crownbay/conf/machine/crownbay.conf | 8 +-------
.../linux/linux-yocto-stable_git.bbappend | 9 ---------
.../linux/linux-yocto_2.6.34.bbappend | 15 +++++++++++++++
.../linux/linux-yocto_2.6.37.bbappend | 15 +++++++++++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 9 ---------
meta-emenlow/conf/machine/emenlow.conf | 6 ------
.../linux/linux-yocto-stable_git.bbappend | 3 ---
.../linux/linux-yocto_2.6.34.bbappend | 6 ++++++
.../linux/linux-yocto_2.6.37.bbappend | 6 ++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 3 ---
meta-fishriver/conf/machine/fishriver.conf | 6 ------
.../linux/linux-yocto-stable_git.bbappend | 5 -----
.../linux/linux-yocto_2.6.34.bbappend | 8 ++++++++
.../linux/linux-yocto_2.6.37.bbappend | 7 +++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 3 ---
meta-jasperforest/conf/machine/jasperforest.conf | 2 --
.../linux/linux-yocto-stable_git.bbappend | 5 -----
.../linux/linux-yocto_2.6.34.bbappend | 5 +++++
.../linux/linux-yocto_2.6.37.bbappend | 8 ++++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 6 ------
.../linux/linux-yocto-stable_git.bbappend | 10 ----------
.../linux/linux-yocto_2.6.34.bbappend | 10 ++++++++++
.../linux/linux-yocto_2.6.37.bbappend | 10 ++++++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 10 ----------
meta-sugarbay/conf/machine/sugarbay.conf | 3 ---
.../linux/linux-yocto_2.6.37.bbappend | 7 +++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 5 -----
28 files changed, 98 insertions(+), 98 deletions(-)
delete mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend
delete mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend
delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend
delete mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend
create mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 1916b2f..cc0b2eb 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -34,9 +34,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
-
-SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "88ea187941f262518b3b8194e042f0270fdf27c4"
-SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
-
-SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
-SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 6634102..baf3310 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -14,7 +14,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
KERNEL_IMAGETYPE = "bzImage"
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
@@ -38,9 +38,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
-
-SRCREV_machine_pn-linux-yocto_crownbay ?= "88ea187941f262518b3b8194e042f0270fdf27c4"
-SRCREV_meta_pn-linux-yocto_crownbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
-
-SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
-SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend
deleted file mode 100644
index 570f8d4..0000000
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_crownbay = "crownbay"
-KMACHINE_crownbay = "crownbay"
-KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
-
-COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
-KMACHINE_crownbay-noemgd = "crownbay"
-KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
new file mode 100644
index 0000000..6f3694b
--- /dev/null
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_crownbay = "crownbay"
+KMACHINE_crownbay = "crownbay"
+KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
+
+COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
+KMACHINE_crownbay-noemgd = "crownbay"
+KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
+SRCREV_meta_pn-linux-yocto_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
+
+RCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
+SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
new file mode 100644
index 0000000..1a62b38
--- /dev/null
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_crownbay = "crownbay"
+KMACHINE_crownbay = "yocto/standard/crownbay"
+KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
+
+COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
+KMACHINE_crownbay-noemgd = "yocto/standard/crownbay"
+KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto_crownbay ?= "88ea187941f262518b3b8194e042f0270fdf27c4"
+SRCREV_meta_pn-linux-yocto_crownbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
+
+SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "88ea187941f262518b3b8194e042f0270fdf27c4"
+SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend
deleted file mode 100644
index cdae000..0000000
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_crownbay = "crownbay"
-KMACHINE_crownbay = "yocto/standard/crownbay"
-KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
-
-COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
-KMACHINE_crownbay-noemgd = "yocto/standard/crownbay"
-KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index 8fe9dd3..b0b7d5e 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -38,9 +38,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
-
-SRCREV_machine_pn-linux-yocto_emenlow = "7dd88fc03db50b131e4a96e6af8036a836ccc300"
-SRCREV_meta_pn-linux-yocto_emenlow ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
-
-SRCREV_machine_pn-linux-yocto-stable_emenlow = "a29743c0a1398798fbc02c0799c8605d91514e14"
-SRCREV_meta_pn-linux-yocto-stable_emenlow ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend
deleted file mode 100644
index 77a665d..0000000
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_emenlow = "emenlow"
-KMACHINE_emenlow = "emenlow"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
new file mode 100644
index 0000000..160b3aa
--- /dev/null
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_emenlow = "emenlow"
+KMACHINE_emenlow = "emenlow"
+
+SRCREV_machine_pn-linux-yocto_emenlow = "a29743c0a1398798fbc02c0799c8605d91514e14"
+SRCREV_meta_pn-linux-yocto_emenlow ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
new file mode 100644
index 0000000..6be0227
--- /dev/null
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_emenlow = "emenlow"
+KMACHINE_emenlow = "yocto/standard/emenlow"
+
+SRCREV_machine_pn-linux-yocto_emenlow = "7dd88fc03db50b131e4a96e6af8036a836ccc300"
+SRCREV_meta_pn-linux-yocto_emenlow ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend
deleted file mode 100644
index 05307b7..0000000
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_emenlow = "emenlow"
-KMACHINE_emenlow = "yocto/standard/emenlow"
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index 9621f62..e692cac 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -34,9 +34,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
-
-SRCREV_machine_pn-linux-yocto_fishriver ?= "697d84759be192403a8a87ab269196c67a0c2c88"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
-
-SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
-SRCREV_meta_pn-linux-yocto-stable_fishriver ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend
deleted file mode 100644
index 29399ba..0000000
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver = "fishriver"
-
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
new file mode 100644
index 0000000..622d97a
--- /dev/null
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_fishriver = "fishriver"
+KMACHINE_fishriver = "fishriver"
+
+SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
+SRCREV_meta_pn-linux-yocto-stable_fishriver ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
+
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
new file mode 100644
index 0000000..4fab9e0
--- /dev/null
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_fishriver = "fishriver"
+KMACHINE_fishriver = "yocto/standard/fishriver"
+
+SRCREV_machine_pn-linux-yocto_fishriver ?= "697d84759be192403a8a87ab269196c67a0c2c88"
+SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
+
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend
deleted file mode 100644
index eec65d8..0000000
--- a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_fishriver = "fishriver"
-KMACHINE_fishriver = "yocto/standard/fishriver"
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index fee6930..3f8591a 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -42,5 +42,3 @@ PREFERRED_VERSION_grub ?= "1.98"
TARGET_CC_ARCH = "-m64"
-SRCREV_machine_pn-linux-yocto_jasperforest ?= "2058f5a373c7ce4a94f8252df322704fc475de97"
-SRCREV_meta_pn-linux-yocto_jasperforest ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend
deleted file mode 100644
index bd6bada..0000000
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-KMACHINE_jasperforest = "jasperforest"
-
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
new file mode 100644
index 0000000..bd6bada
--- /dev/null
+++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_jasperforest = "jasperforest"
+KMACHINE_jasperforest = "jasperforest"
+
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
new file mode 100644
index 0000000..d937d80
--- /dev/null
+++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_jasperforest = "jasperforest"
+
+KMACHINE_jasperforest = "yocto/standard/common-pc-64/jasperforest"
+
+SRCREV_machine_pn-linux-yocto_jasperforest ?= "2058f5a373c7ce4a94f8252df322704fc475de97"
+SRCREV_meta_pn-linux-yocto_jasperforest ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend
deleted file mode 100644
index abceb18..0000000
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-
-KMACHINE_jasperforest = "yocto/standard/common-pc-64/jasperforest"
-
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend
deleted file mode 100644
index 18d4999..0000000
--- a/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-KMACHINE_n450 = "atom-pc"
-COMPATIBLE_MACHINE_n450 = "n450"
-
-# The n450 is a single core hypterthreaded CPU
-KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
-
-# We use the atom-pc machine SRCREV and the default meta SRCREV
-#SRCREV_machine_pn-linux-yocto-stable_n450 = ""
-#SRCREV_meta_pn-linux-yocto-stable_n450 ?= ""
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
new file mode 100644
index 0000000..18d4999
--- /dev/null
+++ b/meta-n450/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+KMACHINE_n450 = "atom-pc"
+COMPATIBLE_MACHINE_n450 = "n450"
+
+# The n450 is a single core hypterthreaded CPU
+KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
+
+# We use the atom-pc machine SRCREV and the default meta SRCREV
+#SRCREV_machine_pn-linux-yocto-stable_n450 = ""
+#SRCREV_meta_pn-linux-yocto-stable_n450 ?= ""
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
new file mode 100644
index 0000000..d52a90a
--- /dev/null
+++ b/meta-n450/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+KMACHINE_n450 = "yocto/standard/common-pc/atom-pc"
+COMPATIBLE_MACHINE_n450 = "n450"
+
+# The n450 is a single core hypterthreaded CPU
+KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
+
+# We use the atom-pc machine SRCREV and the default meta SRCREV
+#SRCREV_machine_pn-linux-yocto-stable_n450 = ""
+#SRCREV_meta_pn-linux-yocto-stable_n450 ?= ""
diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend
deleted file mode 100644
index d52a90a..0000000
--- a/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-KMACHINE_n450 = "yocto/standard/common-pc/atom-pc"
-COMPATIBLE_MACHINE_n450 = "n450"
-
-# The n450 is a single core hypterthreaded CPU
-KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
-
-# We use the atom-pc machine SRCREV and the default meta SRCREV
-#SRCREV_machine_pn-linux-yocto-stable_n450 = ""
-#SRCREV_meta_pn-linux-yocto-stable_n450 ?= ""
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index cca50a9..ebc6dbc 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -44,6 +44,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
TARGET_CC_ARCH = "-m64"
PREFERRED_VERSION_grub ?= "1.98"
-
-SRCREV_machine_pn-linux-yocto_sugarbay ?= "5021040d4d881cd0f4a741c6342a290a3af7d021"
-SRCREV_meta_pn-linux-yocto_sugarbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
new file mode 100644
index 0000000..0d5556c
--- /dev/null
+++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_sugarbay = "sugarbay"
+KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay"
+
+SRCREV_machine_pn-linux-yocto_sugarbay ?= "5021040d4d881cd0f4a741c6342a290a3af7d021"
+SRCREV_meta_pn-linux-yocto_sugarbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend
deleted file mode 100644
index 72d00ec..0000000
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_sugarbay = "sugarbay"
-KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay"
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] meta-yocto/linux-yocto: update to match the renamed linux-yocto recipes
2011-06-14 20:47 [PATCH v3] meta-yocto/meta-intel: linux-yocto recipe renames Bruce Ashfield
2011-06-14 20:47 ` [PATCH] meta-intel/linux-yocto: update to match the renamed linux-yocto recipes Bruce Ashfield
@ 2011-06-14 20:47 ` Bruce Ashfield
1 sibling, 0 replies; 5+ messages in thread
From: Bruce Ashfield @ 2011-06-14 20:47 UTC (permalink / raw)
To: dvhart, tom.zanussi, saul.wold; +Cc: yocto
The linux-yocto recipes have been renamed to include explicit
version numbers. The meta-yocto bbappends must be updated to
follow the new naming convention.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../linux/linux-yocto-stable_git.bbappend | 12 ------------
.../linux/linux-yocto_2.6.34.bbappend | 12 ++++++++++++
.../linux/linux-yocto_2.6.37.bbappend | 15 +++++++++++++++
.../recipes-kernel/linux/linux-yocto_git.bbappend | 15 ---------------
4 files changed, 27 insertions(+), 27 deletions(-)
delete mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend
create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
delete mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend
deleted file mode 100644
index ea0287d..0000000
--- a/meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-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_2.6.34.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.34.bbappend
new file mode 100644
index 0000000..ea0287d
--- /dev/null
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.34.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_2.6.37.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
new file mode 100644
index 0000000..84e31e9
--- /dev/null
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
@@ -0,0 +1,15 @@
+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 = "7dd88fc03db50b131e4a96e6af8036a836ccc300"
+SRCREV_machine_atom-pc = "1ccece1d42a598fef0f5f9666c9c81315302c129"
+SRCREV_machine_routerstationpro = "8b5f5129292bb218435ac9ffa1fb9943bdc7d456"
+SRCREV_machine_mpc8315e-rdb = "dcf359635969abdbdd15f60b702ab17ed6174892"
+SRCREV_machine_beagleboard = "9cb5c3fb1634e541cacceeb8c8cabe88afa5b080"
+
+COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
+COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
+COMPATIBLE_MACHINE_beagleboard = "beagleboard"
+COMPATIBLE_MACHINE_atom-pc = "atom-pc"
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend
deleted file mode 100644
index 84e31e9..0000000
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-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 = "7dd88fc03db50b131e4a96e6af8036a836ccc300"
-SRCREV_machine_atom-pc = "1ccece1d42a598fef0f5f9666c9c81315302c129"
-SRCREV_machine_routerstationpro = "8b5f5129292bb218435ac9ffa1fb9943bdc7d456"
-SRCREV_machine_mpc8315e-rdb = "dcf359635969abdbdd15f60b702ab17ed6174892"
-SRCREV_machine_beagleboard = "9cb5c3fb1634e541cacceeb8c8cabe88afa5b080"
-
-COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-COMPATIBLE_MACHINE_beagleboard = "beagleboard"
-COMPATIBLE_MACHINE_atom-pc = "atom-pc"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] meta-intel/linux-yocto: update to match the renamed linux-yocto recipes
2011-06-14 20:47 ` [PATCH] meta-intel/linux-yocto: update to match the renamed linux-yocto recipes Bruce Ashfield
@ 2011-06-15 0:04 ` Darren Hart
2011-06-15 1:54 ` Bruce Ashfield
0 siblings, 1 reply; 5+ messages in thread
From: Darren Hart @ 2011-06-15 0:04 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: yocto, saul.wold
On 06/14/2011 01:47 PM, Bruce Ashfield wrote:
> The linux-yocto recipes have been renamed to include explicit
> version numbers. The meta-intel bbappends must be updated to
> follow the new naming convention.
>
> As a consequence of the recipe renames any SRCREV specificiations
> that were part of a machine.conf have been moved to the corresponding
> bbappend file. This allows the 2.6.34 and 2.6.37 SRCREVs to co-exist.
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
...
> diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
> index 6634102..baf3310 100644
> --- a/meta-crownbay/conf/machine/crownbay.conf
> +++ b/meta-crownbay/conf/machine/crownbay.conf
> @@ -14,7 +14,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
> KERNEL_IMAGETYPE = "bzImage"
>
> PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
> -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
> +#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
I assume this was an accident? If I don't hear from you shortly I'll
commit without this change and we can add it back if it was intentional.
It wasn't in the commit message, so I'm assuming not.
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] meta-intel/linux-yocto: update to match the renamed linux-yocto recipes
2011-06-15 0:04 ` Darren Hart
@ 2011-06-15 1:54 ` Bruce Ashfield
0 siblings, 0 replies; 5+ messages in thread
From: Bruce Ashfield @ 2011-06-15 1:54 UTC (permalink / raw)
To: Darren Hart; +Cc: yocto, saul.wold
On 11-06-14 8:04 PM, Darren Hart wrote:
> On 06/14/2011 01:47 PM, Bruce Ashfield wrote:
>> The linux-yocto recipes have been renamed to include explicit
>> version numbers. The meta-intel bbappends must be updated to
>> follow the new naming convention.
>>
>> As a consequence of the recipe renames any SRCREV specificiations
>> that were part of a machine.conf have been moved to the corresponding
>> bbappend file. This allows the 2.6.34 and 2.6.37 SRCREVs to co-exist.
>>
>> Signed-off-by: Bruce Ashfield<bruce.ashfield@windriver.com>
>
> ...
>
>> diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
>> index 6634102..baf3310 100644
>> --- a/meta-crownbay/conf/machine/crownbay.conf
>> +++ b/meta-crownbay/conf/machine/crownbay.conf
>> @@ -14,7 +14,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
>> KERNEL_IMAGETYPE = "bzImage"
>>
>> PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
>> -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
>> +#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
>
>
> I assume this was an accident? If I don't hear from you shortly I'll
> commit without this change and we can add it back if it was intentional.
> It wasn't in the commit message, so I'm assuming not.
Drop this. I was on the way out, and had made this change to
speed up my builds.
Thanks!
Bruce
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-06-15 1:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-14 20:47 [PATCH v3] meta-yocto/meta-intel: linux-yocto recipe renames Bruce Ashfield
2011-06-14 20:47 ` [PATCH] meta-intel/linux-yocto: update to match the renamed linux-yocto recipes Bruce Ashfield
2011-06-15 0:04 ` Darren Hart
2011-06-15 1:54 ` Bruce Ashfield
2011-06-14 20:47 ` [PATCH] meta-yocto/linux-yocto: " Bruce Ashfield
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.