Skip to contentSkip to conversation

meta-crownbay: upgrade to master

PATCH New Tom Zanussi 1 participant 1 message Dec 20, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meta-crownbay: upgrade to master

Upgrade the meta-crownbay BSP to current master.

This updates the layer to reflect the naming changes that took place between laverne and the current master, and allows the BSP to be built for master.

---
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    6 +++---
 meta-crownbay/conf/machine/crownbay.conf           |    6 +++---
 .../recipes-kernel/linux/linux-wrs_git.bbappend    |    7 -------
 .../linux/linux-yocto-stable_git.bbappend          |    7 +++++++
 4 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 meta-crownbay/recipes-kernel/linux/linux-wrs_git.bbappend
 create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend
meta-crownbay/conf/machine/crownbay-noemgd.conf +3 -3
index 535cf55..0cf7d66 100644
@@ -16,7 +16,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 
 KERNEL_IMAGETYPE = "bzImage"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wrs"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
@@ -41,5 +41,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-SRCREV_machine_pn-linux-wrs_crownbay-noemgd = "f0afe10edaed24575eb115ad69c366fc24ea9380"
-SRCREV_meta_pn-linux-wrs = "2f315f96f26a93d22fe0fc524de629e7c46b8469"
+SRCREV_machine_pn-linux-yocto-stable_crownbay-noemgd ?= "f0afe10edaed24575eb115ad69c366fc24ea9380"
+SRCREV_meta_pn-linux-yocto-stable_crownbay-noemgd ?= "2f315f96f26a93d22fe0fc524de629e7c46b8469"
meta-crownbay/conf/machine/crownbay.conf +3 -3
index de59bc0..959d4c7 100644
@@ -16,7 +16,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 
 KERNEL_IMAGETYPE = "bzImage"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wrs"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-emgd"
@@ -45,5 +45,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-SRCREV_machine_pn-linux-wrs_crownbay = "f0afe10edaed24575eb115ad69c366fc24ea9380"
-SRCREV_meta_pn-linux-wrs = "2f315f96f26a93d22fe0fc524de629e7c46b8469"
+SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "f0afe10edaed24575eb115ad69c366fc24ea9380"
+SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "2f315f96f26a93d22fe0fc524de629e7c46b8469"
meta-crownbay/recipes-kernel/linux/linux-wrs_git.bbappend deleted +0 -7
deleted file mode 100644
index aebe789..0000000
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS := "${THISDIR}/${PN}"
-
-COMPATIBLE_MACHINE_crownbay = "crownbay"
-WRMACHINE_crownbay  = "crownbay"
-
-COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
-WRMACHINE_crownbay-noemgd  = "crownbay"
meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend new file +7 -0
new file mode 100644
index 0000000..4136536
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+
+COMPATIBLE_MACHINE_crownbay = "crownbay"
+KMACHINE_crownbay  = "crownbay"
+
+COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
+KMACHINE_crownbay-noemgd  = "crownbay"
Signature · 1 line
1.7.0.4