[oe-commits] Martin Jansa : linux-openmoko: partial revert of rename to PN_PV sheme
git version control
git at git.openembedded.org
Wed May 26 13:14:11 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8bb53d3f261c59353652f0328bfd887d6aa1c112
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8bb53d3f261c59353652f0328bfd887d6aa1c112
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Wed May 26 15:05:09 2010 +0200
linux-openmoko: partial revert of rename to PN_PV sheme
* details in http://thread.gmane.org/gmane.comp.handhelds.openembedded/32950
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
conf/machine/om-3d7k.conf | 3 +--
conf/machine/om-gta01.conf | 3 +--
conf/machine/om-gta02.conf | 4 +---
...moko_2.6.24.bb => linux-openmoko-2.6.24_git.bb} | 8 ++++++--
...moko_2.6.28.bb => linux-openmoko-2.6.28_git.bb} | 8 ++++++--
...moko_2.6.29.bb => linux-openmoko-2.6.29_git.bb} | 8 ++++++--
...moko_2.6.32.bb => linux-openmoko-2.6.32_git.bb} | 8 +++++---
...moko_2.6.34.bb => linux-openmoko-2.6.34_git.bb} | 6 ++++--
8 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf
index 229f34c..0ebd2a0 100644
--- a/conf/machine/om-3d7k.conf
+++ b/conf/machine/om-3d7k.conf
@@ -6,9 +6,8 @@
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
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 fddb653..0890d71 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -6,9 +6,8 @@
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-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 ae1aa93..47f4ae1 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -6,10 +6,8 @@
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_VERSION_linux-openmoko ?= "2.6.29"
-
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"
diff --git a/recipes/linux/linux-openmoko_2.6.24.bb b/recipes/linux/linux-openmoko-2.6.24_git.bb
similarity index 80%
rename from recipes/linux/linux-openmoko_2.6.24.bb
rename to recipes/linux/linux-openmoko-2.6.24_git.bb
index 4c87ef9..877c563 100644
--- a/recipes/linux/linux-openmoko_2.6.24.bb
+++ b/recipes/linux/linux-openmoko-2.6.24_git.bb
@@ -1,9 +1,13 @@
require linux.inc
require linux-openmoko.inc
+KERNEL_RELEASE = "2.6.24"
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
SRCREV = "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
-PR = "r2"
-PR_append = "+gitr${SRCPV}"
+OEV = "oe5"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
+PR = "r1"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
diff --git a/recipes/linux/linux-openmoko_2.6.28.bb b/recipes/linux/linux-openmoko-2.6.28_git.bb
similarity index 79%
rename from recipes/linux/linux-openmoko_2.6.28.bb
rename to recipes/linux/linux-openmoko-2.6.28_git.bb
index 687990b..ae5b3e5 100644
--- a/recipes/linux/linux-openmoko_2.6.28.bb
+++ b/recipes/linux/linux-openmoko-2.6.28_git.bb
@@ -1,9 +1,13 @@
require linux.inc
require linux-openmoko.inc
+KERNEL_RELEASE = "2.6.28"
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
SRCREV = "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
-PR = "r1"
-PR_append = "+gitr${SRCPV}"
+OEV = "oe2"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
+PR = "r0"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
diff --git a/recipes/linux/linux-openmoko_2.6.29.bb b/recipes/linux/linux-openmoko-2.6.29_git.bb
similarity index 79%
rename from recipes/linux/linux-openmoko_2.6.29.bb
rename to recipes/linux/linux-openmoko-2.6.29_git.bb
index da23a40..a7140ee 100644
--- a/recipes/linux/linux-openmoko_2.6.29.bb
+++ b/recipes/linux/linux-openmoko-2.6.29_git.bb
@@ -1,9 +1,13 @@
require linux.inc
require linux-openmoko.inc
+KERNEL_RELEASE = "2.6.29"
+KERNEL_VERSION = "2.6.29-rc3"
+
SRCREV = "973a41fce60e5f6edfcf0eaf94056a57eee65e16"
-PR = "r9"
-PR_append = "+gitr${SRCPV}"
+OMV = "oe11"
+PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}"
+PR = "r8"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
diff --git a/recipes/linux/linux-openmoko_2.6.32.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
similarity index 89%
rename from recipes/linux/linux-openmoko_2.6.32.bb
rename to recipes/linux/linux-openmoko-2.6.32_git.bb
index bee6570..499c4a0 100644
--- a/recipes/linux/linux-openmoko_2.6.32.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -1,15 +1,17 @@
require linux.inc
require linux-openmoko.inc
+KERNEL_RELEASE="2.6.32.13"
+
SRCREV = "a9254be10ac2294ea20165a87c09ea6afcf66d94"
-PR = "r1"
-PR_append = "+gitr${SRCPV}"
+OEV = "oe2"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.32 \
file://0001-Revert-s3cmci-initialize-default-platform-data-no_wp.patch \
# latest stable patch for ubi fix 943e167cb3e8fb191894bde8a4a75db78531a7c8
- ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.32.13.bz2;patch=1;name=stablepatch \
+ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=stablepatch \
# build fix
file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \
# patches from Radek Polak used in qtmoko
diff --git a/recipes/linux/linux-openmoko_2.6.34.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb
similarity index 93%
rename from recipes/linux/linux-openmoko_2.6.34.bb
rename to recipes/linux/linux-openmoko-2.6.34_git.bb
index 87efa06..22fa397 100644
--- a/recipes/linux/linux-openmoko_2.6.34.bb
+++ b/recipes/linux/linux-openmoko-2.6.34_git.bb
@@ -1,9 +1,11 @@
require linux.inc
require linux-openmoko.inc
+KERNEL_RELEASE="2.6.34"
+
SRCREV = "dd1225cc08c3375bf80289ac1965c724881b149a"
-PR = "r1"
-PR_append = "+gitr${SRCPV}"
+OEV = "oe2"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.34 \
More information about the Openembedded-commits
mailing list