summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-02-26 00:24:04 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-02-26 02:26:38 (GMT)
commit16f47f04a2baaeaf9b5a9b381fc7a3c7755d6ff6 (patch)
treeec5448428342cf912e4d4cc849be6e349f194abe
parent72041c637930a3098cd211b72c8e1979db559108 (diff)
downloadmeta-intel-bernard-1.0rc1.tar.gz
meta-crownbay: 2.6.37 changesbernard-5.0rc1bernard-1.0rc1
This adds the code necessary to move meta-crownbay over to linux-yocto. A follow-on patch will actually do the switchover once the kernel srcrevs are known. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-crownbay/conf/machine/crownbay-noemgd.conf5
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf7
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend3
3 files changed, 14 insertions, 1 deletions
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index a334202..277c5ff 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -17,6 +17,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
17KERNEL_IMAGETYPE = "bzImage" 17KERNEL_IMAGETYPE = "bzImage"
18 18
19PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable" 19PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable"
20#PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
21#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
20PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 22PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
21PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 23PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
22PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 24PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
@@ -41,5 +43,8 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
41GLIBC_ADDONS = "nptl" 43GLIBC_ADDONS = "nptl"
42GLIBC_EXTRA_OECONF = "--with-tls" 44GLIBC_EXTRA_OECONF = "--with-tls"
43 45
46SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
47SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "e1f85a470934a0cf6abde5d95533e74501822c6b"
48
44SRCREV_machine_pn-linux-yocto-stable_crownbay-noemgd ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" 49SRCREV_machine_pn-linux-yocto-stable_crownbay-noemgd ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
45SRCREV_meta_pn-linux-yocto-stable_crownbay-noemgd ?= "e1f85a470934a0cf6abde5d95533e74501822c6b" 50SRCREV_meta_pn-linux-yocto-stable_crownbay-noemgd ?= "e1f85a470934a0cf6abde5d95533e74501822c6b"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index e6c4315..0d61380 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -16,7 +16,9 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
16 16
17KERNEL_IMAGETYPE = "bzImage" 17KERNEL_IMAGETYPE = "bzImage"
18 18
19PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable" 19PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-stable"
20#PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
21#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
20PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 22PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
21PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 23PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
22PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-emgd" 24PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-emgd"
@@ -45,5 +47,8 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
45GLIBC_ADDONS = "nptl" 47GLIBC_ADDONS = "nptl"
46GLIBC_EXTRA_OECONF = "--with-tls" 48GLIBC_EXTRA_OECONF = "--with-tls"
47 49
50SRCREV_machine_pn-linux-yocto_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
51SRCREV_meta_pn-linux-yocto_crownbay ?= "e1f85a470934a0cf6abde5d95533e74501822c6b"
52
48SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" 53SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695"
49SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "e1f85a470934a0cf6abde5d95533e74501822c6b" 54SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "e1f85a470934a0cf6abde5d95533e74501822c6b"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend
new file mode 100644
index 0000000..32bbd10
--- /dev/null
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend
@@ -0,0 +1,3 @@
1FILESEXTRAPATHS := "${THISDIR}/${PN}"
2COMPATIBLE_MACHINE_crownbay = "crownbay"
3KMACHINE_crownbay = "yocto/standard/crownbay"