linux-openmoko: rename recipes to common PN_PV scheme, cleanup versioning

* move DESCRIPTION to .inc
* remove OEV, KERNEL_RELEASE and KERNEL_VERSION, keep KERNEL_* from
  kernel.bbclass
* update distro/machine configs where needed

Acked-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

4 files changed, 8 insertions, 25 deletions

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 81d7075fc1..2b34c40bc3 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -53,14 +53,6 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
 # require conf/distro/include/fso-autorev.inc
 
 # override the PACKAGE_ARCH of certain packages for openmoko distro
-#
-# Same kernel used to run on both these machines...
-# Currently not used but left here in case someone wants to switch on
-# quickly
-#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "armv4t"
-#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "armv4t"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "armv4t"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "armv4t"
 
 # Same kernel so same usb
 PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf
index 95bfd40b23..229f34c7d0 100644
--- a/conf/machine/om-3d7k.conf
+++ b/conf/machine/om-3d7k.conf
@@ -6,8 +6,9 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-devel"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_VERSION_linux-openmoko ?= "2.6.29"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index ede2a2009e..fddb6536e4 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -6,16 +6,10 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel
-PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.32"
-
-PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
+PREFERRED_VERSION_linux-openmoko ?= "2.6.29"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
 
 UBOOT_ENTRYPOINT = "30008000"
 
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 9733269d4f..ae1aa93a15 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -6,15 +6,11 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_VERSION_linux-openmoko ?= "2.6.29"
 
-# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel
-PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
-
-PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
 # Override only for shr as it needs mesa-dri_git and ie angstrom has preferred_version set to 7.6
 MACHINE_DRI_MODULES_shr = "glamo"