linux-openmoko: indivate SRCREV in kernel binary version, add dedicated recipe for...

diff --git a/packages/linux/linux-openmoko-devel_svn.bb b/packages/linux/linux-openmoko-devel_svn.bb
new file mode 100644 (file)
index 0000000..eca9a33
--- /dev/null
+++ b/packages/linux/linux-openmoko-devel_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
+
+require linux-openmoko.inc
+
+SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
+SRC_URI += "file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1"
+
+VANILLA_VERSION = "2.6.22.5"
+MOKOR = "moko11+svnr${SRCREV}"
+PV = "${VANILLA_VERSION}-${MOKOR}"
+PR = "r0"

diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index ab2f295..d6b464c 100644 (file)
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -1,4 +1,3 @@
-DESCRIPTION = "2.6 Linux Development Kernel for FIC SmartPhones shipping w/ OpenMoko"
 SECTION = "kernel"
 AUTHOR = "Harald Welte <laforge@openmoko.org>"
 HOMEPAGE = "http://www.openmoko.org"
@@ -13,6 +12,8 @@ DEFCONFIG = "defconfig-${VANILLA_VERSION}-${MACHINE}"
 ##############################################################
 # source and patches
 #
+SRCREV_FORMAT = "patches"
+
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            file://${DEFCONFIG} \
            file://logo_linux_clut224.ppm"

diff --git a/packages/linux/linux-openmoko_2.6.21.6.bb b/packages/linux/linux-openmoko_2.6.21.6.bb
deleted file mode 100644 (file)
index 2efc846..0000000
--- a/packages/linux/linux-openmoko_2.6.21.6.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require linux-openmoko.inc
-
-SRC_URI += "svn://svn.openmoko.org/branches/src/target/kernel/2.6.21.x;module=patches;proto=http"
-SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
-
-MOKOR = "moko11"
-PR = "${MOKOR}-r2"
-
-VANILLA_VERSION = "2.6.21.6"
-

diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index 4f2aa39..e4608a7 100644 (file)
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -1,9 +1,11 @@
+DESCRIPTION = "Linux 2.6.x (stable) kernel for FIC SmartPhones shipping w/ OpenMoko"
+
 require linux-openmoko.inc
 
 SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
 SRC_URI += "file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1"
 
-MOKOR = "moko11"
-PR = "${MOKOR}-r2"
-
 VANILLA_VERSION = "2.6.22.5"
+MOKOR = "moko11+svnr${SRCREV}"
+PV = "${VANILLA_VERSION}-${MOKOR}"
+PR = "r2"