merge of '79b32dd15f1426dc8a2c0f2fea8b3e6caefff570'

     and 'd0dad3c0880bea593e98565689d54952ead355ab'

5 files changed, 48 insertions, 3 deletions

diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb
new file mode 100644
index 0000000000..5d7b0981b8
--- /dev/null
+++ b/packages/images/beagleboard-demo-image.bb
@@ -0,0 +1,33 @@
+# Demo image for beagleboard
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+
+export IMAGE_BASENAME = "Beagleboard-demo-image"
+
+DEPENDS = "task-base"
+IMAGE_INSTALL = "\
+    ${XSERVER} \
+    task-base-extended \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    ${ANGSTROM_EXTRA_INSTALL} \
+    angstrom-zeroconf-audio \
+    gpe-scap \
+    psplash \
+    e-wm exhibit \
+    xterm xmms epiphany-firefox-replacement \
+    hicolor-icon-theme gnome-icon-theme \
+    jaaa octave nmap iperf gnuplot \
+    abiword gnumeric gimp minimo \
+    powertop \
+"
+
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
diff --git a/packages/libsndfile/files/.mtn2git_empty b/packages/libsndfile/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsndfile/files/.mtn2git_empty
diff --git a/packages/libsndfile/files/configure-fix.patch b/packages/libsndfile/files/configure-fix.patch
new file mode 100644
index 0000000000..1fcbb8c790
--- /dev/null
+++ b/packages/libsndfile/files/configure-fix.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure.ac	2008-06-02 20:33:03.191936504 +0200
++++ libsndfile-1.0.17/configure.ac	2008-06-02 20:33:15.120002907 +0200
+@@ -31,6 +31,7 @@
+ SHARED_VERSION_INFO="1:17:0"
+ 
+ AC_PROG_CC
++AC_PROG_CXX
+ AM_PROG_LIBTOOL
+ 
+ AC_CHECK_PROG(autogen, autogen, yes, no)
diff --git a/packages/libsndfile/libsndfile1_1.0.17.bb b/packages/libsndfile/libsndfile1_1.0.17.bb
index b15f84f94f..670f75b3fc 100644
--- a/packages/libsndfile/libsndfile1_1.0.17.bb
+++ b/packages/libsndfile/libsndfile1_1.0.17.bb
@@ -3,9 +3,11 @@ HOMEPAGE = "http://www.mega-nerd.com/libsndfile"
 AUTHOR = "Erik de Castro Lopo"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
+
+SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \
+           file://configure-fix.patch;patch=1"
 
-SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz"
 S = "${WORKDIR}/libsndfile-${PV}"
 
 inherit autotools lib_package pkgconfig
diff --git a/packages/linux/linux-davinci_2.6.x+git-davinci.bb b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
index 3138436a0e..50c2eaad58 100644
--- a/packages/linux/linux-davinci_2.6.x+git-davinci.bb
+++ b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
@@ -3,7 +3,7 @@ require linux-omap.inc
 # uncomment the below to get the latest and greatest and avoid a full reparse
 # or override in it local.conf like this: DAVINCI_SRCREV_pn-linux-davinci = "${@bb.fetch.get_srcrev(d)}"
 #DAVINCI_SRCREV = "${@bb.fetch.get_srcrev(d)}"
-DAVINCI_SRCREV ?= "713dc561fa98efb6cbac3f641c43d30ce8b840dd"
+DAVINCI_SRCREV ?= "e23e6d5c446074082d93285f21cf95ed0d537a6f"
 SRCREV = "${DAVINCI_SRCREV}"
 
 PV = "2.6.25"