merge of 'c4435e84c90ba841930a612af7c532b832a0e612'

     and 'd80795e44adf312443a758931387dd699d47b8de'

3 files changed, 4 insertions, 72 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7cd82349e9..fdef4f9191 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -56,7 +56,7 @@ SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1062"
-SRCREV_pn-linux-openmoko ?= "4194"
+SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -136,8 +136,8 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4235"
-SRCREV_pn-opkg-native ?= "4235"
+SRCREV_pn-opkg ?= "4345"
+SRCREV_pn-opkg-native ?= "4345"
 SRCREV_pn-opkg-sdk ?= "4235"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 6397a5c67c..88ea00a56c 100644
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -4,7 +4,7 @@ require linux-openmoko.inc
 DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
 
 PE = "1"
-PV = "${KERNEL_RELEASE}+git${SRCDATE}"
+PV = "${KERNEL_RELEASE}+git${SRCREV}"
 PR = "r0"
 
 SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable"
diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb
deleted file mode 100644
index 37ab8351f2..0000000000
--- a/packages/linux/linux-openmoko_2.6.24.bb
+++ /dev/null
@@ -1,68 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
-VANILLA_VERSION = "2.6.24"
-KERNEL_RELEASE = "2.6.24"
-
-# need to synchronize with LOCALVERSION, if set
-KERNEL_VERSION = "${KERNEL_RELEASE}"
-
-# re-enabled this when feature is fully implemented in OE
-#SRCREV_FORMAT = "patches-rconfig"
-SRCREV_FORMAT = "patches"
-CONFIG_REV_om-gta01 = "4251"
-CONFIG_REV_om-gta02 = "4251"
-PV = "${VANILLA_VERSION}+svnr${SRCREV}-r${CONFIG_REV}"
-PR = "r5"
-
-KERNEL_IMAGETYPE = "uImage"
-UBOOT_ENTRYPOINT = "30008000"
-
-##############################################################
-# source and patches
-#
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
-           svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \
-           svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;rev=${CONFIG_REV};name=config "
-
-S = "${WORKDIR}/linux-${VANILLA_VERSION}"
-
-##############################################################
-# kernel image resides on a seperate flash partition (for now)
-#
-ALLOW_EMPTY = "1"
-
-COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = 'om-gta01|om-gta02'
-
-CMDLINE = "unused -- bootloader passes ATAG list"
-
-###############################################################
-# module configs specific to this kernel
-#
-
-# usb
-module_autoload_ohci-hcd = "ohci-hcd"
-module_autoload_hci_usb = "hci_usb"
-module_autoload_g_ether = "g_ether"
-# audio
-module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
-module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-mixer-oss = "snd-mixer-oss"
-# sd/mmc
-module_autoload_s3cmci = "s3cmci"
-
-CONFIG_NAME_om-gta01 = "gta01"
-CONFIG_NAME_om-gta02 = "gta02"
-
-do_prepatch() {
-        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-        mv patches patches.openmoko
-        mv .pc .pc.old
-        mv ${WORKDIR}/config/defconfig-${CONFIG_NAME} ${WORKDIR}/defconfig
-}
-
-addtask prepatch after do_unpack before do_patch