summaryrefslogtreecommitdiff
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2010-11-15 11:25:58 -0500
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:22 -0800
commitc70816cb9022dfedd78817bb1dfe20219fe2dd90 (patch)
tree764704dc00eacf53e7a276a0840a32c71160f27f /meta/conf/machine
parent771d890d086534536ff4aa4a386f17e2b697c0be (diff)
downloadopenembedded-core-c70816cb9022dfedd78817bb1dfe20219fe2dd90.tar.gz
openembedded-core-c70816cb9022dfedd78817bb1dfe20219fe2dd90.tar.bz2
openembedded-core-c70816cb9022dfedd78817bb1dfe20219fe2dd90.zip
linux-wrs: rename to linux-yocto
The existing preferred yocto kernel wasn't named appropriately and needs to be updated. In keeping the changes small and isolated, this commit simply renames the recipe and some internal variables. Future commits will refactor the code into more usable blocks. Now that linuy-wrs has been renamed linux-yocto, we need to rename and update an board configurations and append files. Now that linux-wrs has been renamed linux-yocto, we need to update the SRCREVs to have the new name. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/atom-pc.conf2
-rw-r--r--meta/conf/machine/beagleboard.conf2
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/mpc8315e-rdb.conf2
-rw-r--r--meta/conf/machine/routerstationpro.conf2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/machine/atom-pc.conf b/meta/conf/machine/atom-pc.conf
index 61d3d943ab..7ca952a0a2 100644
--- a/meta/conf/machine/atom-pc.conf
+++ b/meta/conf/machine/atom-pc.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
KERNEL_IMAGETYPE = "bzImage"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wrs"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
diff --git a/meta/conf/machine/beagleboard.conf b/meta/conf/machine/beagleboard.conf
index d44b7aaf60..657bd366ca 100644
--- a/meta/conf/machine/beagleboard.conf
+++ b/meta/conf/machine/beagleboard.conf
@@ -22,7 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
# Guesswork
SERIAL_CONSOLE = "115200 ttyS2"
-PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
KERNEL_IMAGETYPE = "uImage"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 1ef639f90e..1b1b8881c6 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -15,6 +15,6 @@ IMAGE_ROOTFS_SIZE_ext3 ?= "280000"
RDEPENDS_kernel-base = ""
# Use a common kernel recipe for all QEMU machines
-PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
diff --git a/meta/conf/machine/mpc8315e-rdb.conf b/meta/conf/machine/mpc8315e-rdb.conf
index e42a9f2a1a..334118668a 100644
--- a/meta/conf/machine/mpc8315e-rdb.conf
+++ b/meta/conf/machine/mpc8315e-rdb.conf
@@ -13,4 +13,4 @@ SERIAL_CONSOLE = "115200 ttyS0"
MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
-PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
diff --git a/meta/conf/machine/routerstationpro.conf b/meta/conf/machine/routerstationpro.conf
index ecacc9b873..485ee3c124 100644
--- a/meta/conf/machine/routerstationpro.conf
+++ b/meta/conf/machine/routerstationpro.conf
@@ -12,7 +12,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \
KERNEL_IMAGETYPE = "vmlinux"
KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
-PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
SERIAL_CONSOLE = "115200 ttyS0"