merge of '3ecc917729c94ee2f23b012b99f74a8a524154c2'

     and 'cc4ff44ab8858d40dac79ae6b3e11d75dbd68c10'

7 files changed, 25 insertions, 26 deletions

diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index afcec66c51..4f66f92cf0 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -12,6 +12,7 @@ module_autoload_pxamci = "pxamci"
 module_autoload_mmc_block = "mmc_block"
 module_autoload_gumstix_gadget = "gumstix_gadget"
 module_autoload_g_ether = "g_ether"
+module_autoload_smc91x = "smc91x"
 
 UBOOT_ENTRYPOINT = "a0008000"
 
@@ -20,6 +21,10 @@ MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
 
+# Install all kernel modules
+#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-modules"
+
+# Install only selected kernel modules, comment out line above also
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
                              kernel-module-rtc-core \
                              kernel-module-rtc-dev \
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index ee476b3602..abd50b116a 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -23,7 +23,9 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
                           kernel-module-nls-iso8859-1 \
                           kernel-module-nls-cp437 \
                           kernel-module-nls-base \
-                          kernel-module-vfat"
+                          kernel-module-vfat \
+                          kernel-module-ohci-hcd \
+                          "
 
 RDEPENDS_kernel-base = ""
 
diff --git a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
index 51fb846ce9..6fbc7d936f 100644
--- a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
+++ b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
@@ -1,6 +1,6 @@
 require gtk+_${PV}.bb
 inherit native
-DEPENDS = ""
+DEPENDS = "jpeg-native libpng-native"
 S = "${WORKDIR}/gtk+-${PV}"
 FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
 SRC_URI += "file://reduce-dependencies.patch;patch=1"
@@ -14,6 +14,8 @@ EXTRA_OECONF = "\
   --without-x \
   --with-gdktarget=linux-fb \
   --without-libtiff \
+  --with-libjpeg \
+  --with-libpng \
 "
 
 do_compile() {
diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
index 46397afa9b..35bfe66318 100644
--- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
+++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -10,7 +10,9 @@ RDEPENDS = "\
   pulseaudio-module-native-protocol-unix \
   pulseaudio-module-cli-protocol-unix \
 "
-PR = "r0"
+RREPLACES = "openmoko-sound-system"
+RPROVIDES = "openmoko-sound-system"
+PR = "r1"
 
 inherit openmoko-base update-rc.d
 
diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
index a8b41ed318..0693b9bb8a 100644
--- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
+RREPLACES = "openmoko-sound-theme-standard"
+RPROVIDES = "openmoko-sound-theme-standard"
 PV = "0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2 autotools
 
diff --git a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
index 6256363500..2a09c76f09 100644
--- a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
+++ b/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
@@ -9,7 +9,7 @@ UBOOT_OPENMOKO_REV = "2943"
 UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4"
 
 PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
-PR = "r0"
+PR = "r1"
 
 PROVIDES = "virtual/bootloader"
 S = "${WORKDIR}/git"
@@ -30,16 +30,9 @@ do_quilt() {
 }
 
 do_svnrev() {
-	FILE=${S}/tools/setlocalversion
-	OLDFILE=$FILE.old
-	NEWFILE=$FILE.new
-	cp $FILE $OLDFILE
-	LINES=`cat $OLDFILE | wc -l`
-	LINES_WE_WANT=$(($LINES-1))
-	LASTLINE=`cat $OLDFILE | tail -n 1`
-	cat $OLDFILE | head -n $LINES_WE_WANT > $NEWFILE
-	echo ${LASTLINE}_${PR} >> $NEWFILE
-	rm $FILE && mv $NEWFILE $FILE
+        mv -f tools/setlocalversion tools/setlocalversion.old
+        echo -n "echo " >>tools/setlocalversion
+        echo ${PV}      >>tools/setlocalversion
 }
 
 do_configure_prepend() {
diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb
index e1575884c2..3669b409da 100644
--- a/packages/uboot/uboot-openmoko_svn.bb
+++ b/packages/uboot/uboot-openmoko_svn.bb
@@ -5,7 +5,7 @@ SECTION = "bootloader"
 PRIORITY = "optional"
 PROVIDES = "virtual/bootloader"
 PV = "1.2.0+git${SRCDATE}+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRCREV_FORMAT = "patches"
 
@@ -30,16 +30,9 @@ do_quilt() {
 }
 
 do_svnrev() {
-	FILE=${S}/tools/setlocalversion
-	OLDFILE=$FILE.old
-	NEWFILE=$FILE.new
-	cp $FILE $OLDFILE
-	LINES=`cat $OLDFILE | wc -l`
-	LINES_WE_WANT=$(($LINES-1))
-	LASTLINE=`cat $OLDFILE | tail -n 1`
-	cat $OLDFILE | head -n $LINES_WE_WANT > $NEWFILE
-	echo ${LASTLINE}_${PR} >> $NEWFILE
-	rm $FILE && mv $NEWFILE $FILE
+	mv -f tools/setlocalversion tools/setlocalversion.old
+        echo -n "echo " >>tools/setlocalversion
+	echo ${PV}      >>tools/setlocalversion
 }
 
 do_configure_prepend() {