[oe-commits] org.oe.dev merge of '79b32dd15f1426dc8a2c0f2fea8b3e6caefff570'

[woglinde2 commit]

merge of '79b32dd15f1426dc8a2c0f2fea8b3e6caefff570'
     and 'd0dad3c0880bea593e98565689d54952ead355ab'

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 190c583e92702619da237578aa0be6d527f7da36
ViewMTN: http://monotone.openembedded.org/revision/info/190c583e92702619da237578aa0be6d527f7da36
Files:
1
packages/libsndfile/files
packages/images/beagleboard-demo-image.bb
packages/libsndfile/files/configure-fix.patch
packages/libsndfile/libsndfile1_1.0.17.bb
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/gcc/gcc-cross-initial_4.3.0.bb
Diffs:

#
# mt diff -r79b32dd15f1426dc8a2c0f2fea8b3e6caefff570 -r190c583e92702619da237578aa0be6d527f7da36
#
#
#
# add_dir "packages/libsndfile/files"
# 
# add_file "packages/images/beagleboard-demo-image.bb"
#  content [f70ee41394921debd219b58d972968d5d915bb73]
# 
# add_file "packages/libsndfile/files/configure-fix.patch"
#  content [7c6ff9636c073e65e4c222db64c062f83adb5423]
# 
# patch "packages/libsndfile/libsndfile1_1.0.17.bb"
#  from [55693de79b5f8b9b6de94566887496b36a80b463]
#    to [9ec4a9dc4d5e6d225552245cd680b75d3ae2e142]
# 
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
#  from [c608299f076e0e8fe2a39fc998e317dc08a24004]
#    to [66de65e75200c4c93b249df7c4c2149d952f85b5]
#
============================================================
--- packages/images/beagleboard-demo-image.bb	f70ee41394921debd219b58d972968d5d915bb73
+++ packages/images/beagleboard-demo-image.bb	f70ee41394921debd219b58d972968d5d915bb73
@@ -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
============================================================
--- packages/libsndfile/files/configure-fix.patch	7c6ff9636c073e65e4c222db64c062f83adb5423
+++ packages/libsndfile/files/configure-fix.patch	7c6ff9636c073e65e4c222db64c062f83adb5423
@@ -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)
============================================================
--- packages/libsndfile/libsndfile1_1.0.17.bb	55693de79b5f8b9b6de94566887496b36a80b463
+++ packages/libsndfile/libsndfile1_1.0.17.bb	9ec4a9dc4d5e6d225552245cd680b75d3ae2e142
@@ -3,9 +3,11 @@ LICENSE = "LGPL"
 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"
+SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \
+           file://configure-fix.patch;patch=1"
+
 S = "${WORKDIR}/libsndfile-${PV}"
 
 inherit autotools lib_package pkgconfig
============================================================
--- packages/linux/linux-davinci_2.6.x+git-davinci.bb	c608299f076e0e8fe2a39fc998e317dc08a24004
+++ packages/linux/linux-davinci_2.6.x+git-davinci.bb	66de65e75200c4c93b249df7c4c2149d952f85b5
@@ -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"


#
# mt diff -rd0dad3c0880bea593e98565689d54952ead355ab -r190c583e92702619da237578aa0be6d527f7da36
#
#
#
# patch "packages/gcc/gcc-cross-initial_4.3.0.bb"
#  from [3251effa76d0f82298fc41cdc07649a354e58306]
#    to [4b22e8ec5d3911ce0553e074354f5ad218d7fce8]
#
============================================================
--- packages/gcc/gcc-cross-initial_4.3.0.bb	3251effa76d0f82298fc41cdc07649a354e58306
+++ packages/gcc/gcc-cross-initial_4.3.0.bb	4b22e8ec5d3911ce0553e074354f5ad218d7fce8
@@ -1,9 +1,12 @@ require gcc-cross-initial.inc
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
-		--disable-libssp"
+DEPENDS += "gmp-native mpfr-native"
 
+EXTRA_OECONF += " --disable-libmudflap \
+		  --disable-libgomp \
+		  --disable-libssp"
+
 # Hack till we fix *libc properly
 do_stage_append() {
         ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/