summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-09-09 13:10:01 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-09-09 13:10:01 +0000
commitd213cadddbea1d1b79d5ade1e7775ac2ab2f585d (patch)
treee6dceb06035c0a1ce6503ecb366b90c089dd1c3c /packages/linux
parentefc87660039a5bcc0b3ed193377a3140b60c5357 (diff)
parent09858a04b00382d8932c45c48f086eb5610df069 (diff)
merge of '541a0c310166fc18c9883d31cbdbca82af3c977c'
and 'c762de4b1817cfe0d3121333cf187eb52e720fab'
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-openmoko-devel_svn.bb11
-rw-r--r--packages/linux/linux-openmoko.inc3
-rw-r--r--packages/linux/linux-openmoko_2.6.21.6.bb10
-rw-r--r--packages/linux/linux-openmoko_2.6.22.5.bb8
4 files changed, 18 insertions, 14 deletions
diff --git a/packages/linux/linux-openmoko-devel_svn.bb b/packages/linux/linux-openmoko-devel_svn.bb
new file mode 100644
index 0000000000..eca9a337ac
--- /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 ab2f2959d2..d6b464c301 100644
--- 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
index 2efc84681a..0000000000
--- 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 4f2aa396c3..e4608a7565 100644
--- 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"