From 8bb53d3f261c59353652f0328bfd887d6aa1c112 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 26 May 2010 15:05:09 +0200
Subject: 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@gmail.com>
---
 conf/machine/om-3d7k.conf                  |  3 +-
 conf/machine/om-gta01.conf                 |  3 +-
 conf/machine/om-gta02.conf                 |  4 +--
 recipes/linux/linux-openmoko-2.6.24_git.bb | 26 ++++++++++++++++++
 recipes/linux/linux-openmoko-2.6.28_git.bb | 26 ++++++++++++++++++
 recipes/linux/linux-openmoko-2.6.29_git.bb | 24 ++++++++++++++++
 recipes/linux/linux-openmoko-2.6.32_git.bb | 44 ++++++++++++++++++++++++++++++
 recipes/linux/linux-openmoko-2.6.34_git.bb | 37 +++++++++++++++++++++++++
 recipes/linux/linux-openmoko_2.6.24.bb     | 22 ---------------
 recipes/linux/linux-openmoko_2.6.28.bb     | 22 ---------------
 recipes/linux/linux-openmoko_2.6.29.bb     | 20 --------------
 recipes/linux/linux-openmoko_2.6.32.bb     | 42 ----------------------------
 recipes/linux/linux-openmoko_2.6.34.bb     | 35 ------------------------
 13 files changed, 160 insertions(+), 148 deletions(-)
 create mode 100644 recipes/linux/linux-openmoko-2.6.24_git.bb
 create mode 100644 recipes/linux/linux-openmoko-2.6.28_git.bb
 create mode 100644 recipes/linux/linux-openmoko-2.6.29_git.bb
 create mode 100644 recipes/linux/linux-openmoko-2.6.32_git.bb
 create mode 100644 recipes/linux/linux-openmoko-2.6.34_git.bb
 delete mode 100644 recipes/linux/linux-openmoko_2.6.24.bb
 delete mode 100644 recipes/linux/linux-openmoko_2.6.28.bb
 delete mode 100644 recipes/linux/linux-openmoko_2.6.29.bb
 delete mode 100644 recipes/linux/linux-openmoko_2.6.32.bb
 delete mode 100644 recipes/linux/linux-openmoko_2.6.34.bb

diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf
index 229f34c7d0..0ebd2a0d6d 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 fddb6536e4..0890d7184b 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 ae1aa93a15..47f4ae16e5 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_git.bb b/recipes/linux/linux-openmoko-2.6.24_git.bb
new file mode 100644
index 0000000000..877c5637e8
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.24_git.bb
@@ -0,0 +1,26 @@
+require linux.inc
+require linux-openmoko.inc
+
+KERNEL_RELEASE = "2.6.24"
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
+SRCREV = "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
+OEV = "oe5"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
+PR = "r1"
+
+SRC_URI = "\
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
+  \
+  file://0001-squashfs-with-lzma.patch \
+  file://0002-squashfs-initrd.patch \
+  file://0003-squashfs-force-O2.patch \
+  file://0004-squashfs-Kconfig.patch \
+  file://0005-squashfs-Makefile.patch \
+  \
+  file://openwrt-ledtrig-netdev.patch \
+  file://gta01-fix-battery-class-name.patch \
+  \
+  file://defconfig-oe \
+"
+S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-openmoko-2.6.28_git.bb b/recipes/linux/linux-openmoko-2.6.28_git.bb
new file mode 100644
index 0000000000..ae5b3e5369
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.28_git.bb
@@ -0,0 +1,26 @@
+require linux.inc
+require linux-openmoko.inc
+
+KERNEL_RELEASE = "2.6.28"
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
+SRCREV = "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
+OEV = "oe2"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "\
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
+  file://defconfig-oe.patch;apply=no \
+"
+S = "${WORKDIR}/git"
+
+CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
+CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
+
+do_configure_prepend() {
+	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
+	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
+}
+
+
diff --git a/recipes/linux/linux-openmoko-2.6.29_git.bb b/recipes/linux/linux-openmoko-2.6.29_git.bb
new file mode 100644
index 0000000000..a7140ee70c
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.29_git.bb
@@ -0,0 +1,24 @@
+require linux.inc
+require linux-openmoko.inc
+
+KERNEL_RELEASE = "2.6.29"
+KERNEL_VERSION = "2.6.29-rc3"
+
+SRCREV = "973a41fce60e5f6edfcf0eaf94056a57eee65e16"
+OMV = "oe11"
+PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}"
+PR = "r8"
+
+SRC_URI = "\
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
+  file://fix-install.patch \
+  file://0007-Enable-UBI-UBIFS.patch \
+"
+S = "${WORKDIR}/git"
+
+CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
+CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
+
+do_configure_prepend() { 
+	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
+}
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
new file mode 100644
index 0000000000..499c4a085e
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -0,0 +1,44 @@
+require linux.inc
+require linux-openmoko.inc
+
+KERNEL_RELEASE="2.6.32.13"
+
+SRCREV = "a9254be10ac2294ea20165a87c09ea6afcf66d94"
+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-${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
+  file://0002-accels.patch.patch \
+  file://0003-usbhost.patch.patch \
+  file://0004-ar6000_delay.patch.patch \
+  file://0005-save_regs.patch.patch \
+# defconfig updates
+  file://0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch \
+# patches from Weiss's gdrm-for-merging branch
+  file://0007-DRM-for-platform-devices.patch \
+  file://0008-Glamo-DRM-and-KMS-driver.patch \
+  file://0009-Work-on-Glamo-core-for-DRM.patch \
+  file://0010-JBT6k74-work-for-KMS.patch \
+  file://0011-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch \
+  file://0012-Fix-dynamic-command-queue-allocation.patch \
+  file://0013-Debug-statements-for-testing.patch \
+  file://0014-Fix-claim-of-2D-register-resource.patch \
+"
+
+SRC_URI[stablepatch.md5sum] = "ba6abb1ffee513a1d4f831599ddae490"
+SRC_URI[stablepatch.sha256sum] = "baf6dff5d1c478e65decf2e8b704c60e546ea37c4de59ee8eb6af9dd3d63f145"
+
+S = "${WORKDIR}/git"
+
+CONFIG_NAME_om-gta02 = "gta02_drm_defconfig"
+
+do_configure_prepend() {
+        install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
+}
diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb
new file mode 100644
index 0000000000..22fa3970a3
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34_git.bb
@@ -0,0 +1,37 @@
+require linux.inc
+require linux-openmoko.inc
+
+KERNEL_RELEASE="2.6.34"
+
+SRCREV = "dd1225cc08c3375bf80289ac1965c724881b149a"
+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 \
+# build fix
+  file://wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \
+# patches from Thomas White's gdrm-for-merging branch
+  file://0001-DRM-for-platform-devices.patch \
+  file://0002-Glamo-DRM-and-KMS-driver.patch \
+  file://0003-Work-on-Glamo-core-for-DRM.patch \
+  file://0004-JBT6k74-work-for-KMS.patch \
+  file://0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch \
+  file://0006-Fix-dynamic-command-queue-allocation.patch \
+  file://0007-Debug-statements-for-testing.patch \
+  file://0008-Fix-claim-of-2D-register-resource.patch \
+  file://0009-Use-unlocked_ioctl-rather-than-ioctl.patch \
+# patches from Radek Polak used in qtmoko
+  file://0001-accels.patch.patch \
+  file://0002-usbhost.patch.patch \
+  file://0003-ar6000_delay.patch.patch \
+  file://0004-save_regs.patch.patch \
+"
+
+S = "${WORKDIR}/git"
+
+CONFIG_NAME_om-gta02 = "gta02_drm_defconfig"
+
+do_configure_prepend() {
+        install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
+}
diff --git a/recipes/linux/linux-openmoko_2.6.24.bb b/recipes/linux/linux-openmoko_2.6.24.bb
deleted file mode 100644
index 4c87ef96ad..0000000000
--- a/recipes/linux/linux-openmoko_2.6.24.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-SRCREV = "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
-PR = "r2"
-PR_append = "+gitr${SRCPV}"
-
-SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
-  \
-  file://0001-squashfs-with-lzma.patch \
-  file://0002-squashfs-initrd.patch \
-  file://0003-squashfs-force-O2.patch \
-  file://0004-squashfs-Kconfig.patch \
-  file://0005-squashfs-Makefile.patch \
-  \
-  file://openwrt-ledtrig-netdev.patch \
-  file://gta01-fix-battery-class-name.patch \
-  \
-  file://defconfig-oe \
-"
-S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-openmoko_2.6.28.bb b/recipes/linux/linux-openmoko_2.6.28.bb
deleted file mode 100644
index 687990b7a3..0000000000
--- a/recipes/linux/linux-openmoko_2.6.28.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-SRCREV = "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
-PR = "r1"
-PR_append = "+gitr${SRCPV}"
-
-SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
-  file://defconfig-oe.patch;apply=no \
-"
-S = "${WORKDIR}/git"
-
-CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
-CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
-
-do_configure_prepend() {
-	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
-	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
-}
-
-
diff --git a/recipes/linux/linux-openmoko_2.6.29.bb b/recipes/linux/linux-openmoko_2.6.29.bb
deleted file mode 100644
index da23a40716..0000000000
--- a/recipes/linux/linux-openmoko_2.6.29.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-SRCREV = "973a41fce60e5f6edfcf0eaf94056a57eee65e16"
-PR = "r9"
-PR_append = "+gitr${SRCPV}"
-
-SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
-  file://fix-install.patch \
-  file://0007-Enable-UBI-UBIFS.patch \
-"
-S = "${WORKDIR}/git"
-
-CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
-CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
-
-do_configure_prepend() { 
-	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
-}
diff --git a/recipes/linux/linux-openmoko_2.6.32.bb b/recipes/linux/linux-openmoko_2.6.32.bb
deleted file mode 100644
index bee6570904..0000000000
--- a/recipes/linux/linux-openmoko_2.6.32.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-SRCREV = "a9254be10ac2294ea20165a87c09ea6afcf66d94"
-PR = "r1"
-PR_append = "+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 \
-# build fix
-  file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \
-# patches from Radek Polak used in qtmoko
-  file://0002-accels.patch.patch \
-  file://0003-usbhost.patch.patch \
-  file://0004-ar6000_delay.patch.patch \
-  file://0005-save_regs.patch.patch \
-# defconfig updates
-  file://0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch \
-# patches from Weiss's gdrm-for-merging branch
-  file://0007-DRM-for-platform-devices.patch \
-  file://0008-Glamo-DRM-and-KMS-driver.patch \
-  file://0009-Work-on-Glamo-core-for-DRM.patch \
-  file://0010-JBT6k74-work-for-KMS.patch \
-  file://0011-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch \
-  file://0012-Fix-dynamic-command-queue-allocation.patch \
-  file://0013-Debug-statements-for-testing.patch \
-  file://0014-Fix-claim-of-2D-register-resource.patch \
-"
-
-SRC_URI[stablepatch.md5sum] = "ba6abb1ffee513a1d4f831599ddae490"
-SRC_URI[stablepatch.sha256sum] = "baf6dff5d1c478e65decf2e8b704c60e546ea37c4de59ee8eb6af9dd3d63f145"
-
-S = "${WORKDIR}/git"
-
-CONFIG_NAME_om-gta02 = "gta02_drm_defconfig"
-
-do_configure_prepend() {
-        install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
-}
diff --git a/recipes/linux/linux-openmoko_2.6.34.bb b/recipes/linux/linux-openmoko_2.6.34.bb
deleted file mode 100644
index 87efa06368..0000000000
--- a/recipes/linux/linux-openmoko_2.6.34.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-SRCREV = "dd1225cc08c3375bf80289ac1965c724881b149a"
-PR = "r1"
-PR_append = "+gitr${SRCPV}"
-
-SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.34 \
-# build fix
-  file://wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \
-# patches from Thomas White's gdrm-for-merging branch
-  file://0001-DRM-for-platform-devices.patch \
-  file://0002-Glamo-DRM-and-KMS-driver.patch \
-  file://0003-Work-on-Glamo-core-for-DRM.patch \
-  file://0004-JBT6k74-work-for-KMS.patch \
-  file://0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch \
-  file://0006-Fix-dynamic-command-queue-allocation.patch \
-  file://0007-Debug-statements-for-testing.patch \
-  file://0008-Fix-claim-of-2D-register-resource.patch \
-  file://0009-Use-unlocked_ioctl-rather-than-ioctl.patch \
-# patches from Radek Polak used in qtmoko
-  file://0001-accels.patch.patch \
-  file://0002-usbhost.patch.patch \
-  file://0003-ar6000_delay.patch.patch \
-  file://0004-save_regs.patch.patch \
-"
-
-S = "${WORKDIR}/git"
-
-CONFIG_NAME_om-gta02 = "gta02_drm_defconfig"
-
-do_configure_prepend() {
-        install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
-}
-- 
cgit 1.2.3-korg