summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-10-09 03:01:37 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-10-09 03:01:37 +0000
commit614c4b2307240f0c7467e69d97a80472942e5902 (patch)
treee721df5f19b227eed0a1c43344e696bb6f5f3ad5
parentbd9b29dbdf3b871551494857a121bec5009d0a4f (diff)
ane-srcrevs.inc: bump openmoko kernels and move linux-openmoko-devel to stable-tracking branch (warning, may be broken)
-rw-r--r--conf/distro/include/sane-srcrevs.inc4
-rw-r--r--packages/linux/linux-openmoko-devel_git.bb15
2 files changed, 6 insertions, 13 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2ff56921e2..72a7c625c8 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -81,8 +81,8 @@ SRCREV_pn-lightmediascanner ?= "68"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "bc2caff9cdef8a16297a2cb196306f88fa5ea2c2"
-SRCREV_pn-linux-openmoko-devel ?= "8119fb41bf9cfd12964fa5e987ff6dbaf5729f75"
+SRCREV_pn-linux-openmoko ?= "a2ef813d2f439a3e9f377d33a2e5baad098afb7e"
+SRCREV_pn-linux-openmoko-devel ?= "04f54c7001fb609e11ff4b2b4575c04188dbefef"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index c68b5c2e69..dac670abf9 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -5,21 +5,14 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for the Openmoko Neo Smartphones
DEFAULT_PREFERENCE = "-1"
-KERNEL_RELEASE = "2.6.24"
+KERNEL_RELEASE = "2.6.26"
KERNEL_VERSION = "${KERNEL_RELEASE}"
-PV = "${KERNEL_RELEASE}+gitr${SRCREV}"
-PR = "r4"
+PV = "${KERNEL_RELEASE}+${PR}-gitr${SRCREV}"
+PR = "r0"
SRC_URI = "\
- git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy \
- \
- file://0001-squashfs-with-lzma.patch;patch=1 \
- file://0002-squashfs-initrd.patch;patch=1 \
- file://0003-squashfs-force-O2.patch;patch=1 \
- file://0004-squashfs-Kconfig.patch;patch=1 \
- file://0005-squashfs-Makefile.patch;patch=1 \
- \
+ git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable-tracking \
file://defconfig-oe \
"
S = "${WORKDIR}/git"