7 files changed, 41 insertions, 6 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a4d04886c7..a90ad9e9b6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -66,7 +66,7 @@ SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "2893"
 SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
-SRCREV_pn-openmoko-sound-theme-standard ?= "2974"
+SRCREV_pn-openmoko-sound-theme-standard2 ?= "2974"
 SRCREV_pn-openmoko-stylus-demo ?= "2324"
 SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"
@@ -86,5 +86,5 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-settings-daemon ?= "1615"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "44"
-SRCREV_pn-webkit-gtk ?= "25582-r25571"
+SRCREV_pn-webkit-gtk ?= "25582"
 SRCREV_pn-xoo ?= "1623"
diff --git a/conf/machine/gumstix-connex.conf b/conf/machine/gumstix-connex.conf
index a431762d0a..5bca152500 100644
--- a/conf/machine/gumstix-connex.conf
+++ b/conf/machine/gumstix-connex.conf
@@ -1,5 +1,7 @@
 require conf/machine/include/gumstix.inc
 
+RDEPENDS_kernel-base = ""
+
 MACHINE_FEATURES += " usbgadget "
 
 GUMSTIX_400MHZ = "y"
diff --git a/conf/machine/gumstix-verdex.conf b/conf/machine/gumstix-verdex.conf
index ab24552646..dc44342e65 100644
--- a/conf/machine/gumstix-verdex.conf
+++ b/conf/machine/gumstix-verdex.conf
@@ -1,5 +1,7 @@
 require conf/machine/include/gumstix.inc
 
+RDEPENDS_kernel-base = ""
+
 PACKAGE_EXTRA_ARCHS += " iwmmxt "
 
 MACHINE_FEATURES += " usbhost "
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index 7418054f49..ee476b3602 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -25,5 +25,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
                           kernel-module-nls-base \
                           kernel-module-vfat"
 
+RDEPENDS_kernel-base = ""
+
 require conf/machine/include/tune-arm926ejs.inc
 
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index b708305a1c..deaa99d5ad 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-PR = "${EZX}-r15"
+PR = "${EZX}-r16"
 
 require linux.inc
 
@@ -40,7 +40,6 @@ SRC_URI = " \
     file://patches/ezx-eoc.patch;patch=1 \
     file://patches/a1200-eoc.patch;patch=1 \
     file://patches/e6-eoc.patch;patch=1 \
-    file://patches/ezx-backlight.patch;patch=1 \
     file://patches/a780-flip.patch;patch=1 \
     file://patches/e680-locksw.patch;patch=1 \
     file://patches/a780-leds.patch;patch=1 \
@@ -63,6 +62,13 @@ SRC_URI = " \
     file://defconfig \
     \
     "
+
+BACKLIGHTPATCH = " file://patches/ezx-backlight.patch;patch=1 "
+BACKLIGHTPATCH_rokre6 = ""
+
+SRC_URI += "${BACKLIGHTPATCH}"
+
+
 S = "${WORKDIR}/linux-${PV}"
 
 
@@ -91,7 +97,7 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDL
 #CMDLINE_NFSROOT_USB = "${CMDLINE_CON} ${CMDLINE_NFSROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
 
 # 1024x1024 is the maximum kernel size for boot-over-usb
-KERNEL_IMAGE_MAXSIZE = "1294336"
+#KERNEL_IMAGE_MAXSIZE = "1294336"
 
 ###############################################################
 # module configs specific to this kernel
diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
new file mode 100644
index 0000000000..a8b41ed318
--- /dev/null
+++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.1+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2 autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
+S = "${WORKDIR}/sounds"
+
+do_install() {
+        find ${WORKDIR} -name ".svn" | xargs rm -rf
+        install -d ${D}${datadir}/openmoko/sounds
+        for i in *.mp3; do
+                cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
+        done
+        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do
+                cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
+        done
+}
+
+FILES_${PN} = "${datadir}"
+
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 4c605dc11d..2583416617 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -69,7 +69,7 @@ RDEPENDS_task-openmoko-ui = "\
   \
   openmoko-session2 \
   openmoko-sound-system \
-  openmoko-sound-theme-standard \
+  openmoko-sound-theme-standard2 \
   neod \
   gpe-scap \
 "