Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

5 files changed, 62 insertions, 5 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b6444bd083..f91f259f2f 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -15146,6 +15146,10 @@ sha256=62ed44c8b2d392bdc757981ac37f05d808a0d917e4f9d95de2fbf3c2bdad41a7
 md5=988aa098326d5f2b5b5aa4b3efe8d528
 sha256=c67b759d96471c9337d3b9f0ab2e1308f461a7dba445cfe0c3750db15b7ca77f
 
+[ftp://ftp.gnu.org/gnu/m4/m4-1.4.12.tar.gz]
+md5=0499a958a561781b125c740f18061ea8
+sha256=47e8f9a33ba06fa6710b42d6f6ded41f45027f6f4039b0a3ed887c5116bc2173
+
 [ftp://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz]
 md5=8d1d64dbecf1494690a0f3ba8db4482a
 sha256=a116c52d314c8e3365756cb1e14c6b460d6bd28769121f92373a362497359d88
diff --git a/packages/dsplink/ti-codec-combos_3.16.bb b/packages/dsplink/ti-codec-combos_3.16.bb
index 923e9eeff2..941856d09d 100644
--- a/packages/dsplink/ti-codec-combos_3.16.bb
+++ b/packages/dsplink/ti-codec-combos_3.16.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/omap3530_dvsdk_combos_3_16"
 
 # Yes, the xdc stuff still breaks with a '.' in PWD
 PV = "316"
-PR = "r12"
+PR = "r13"
 
 TARGET = "all"
 
@@ -40,6 +40,13 @@ do_compile() {
         # For now, remove the reference to Rules.make and swap prod for eval, since this only has eval libs included
         sed -i \
         -e '/Rules.make/d' \
+        -e 's:$(FC_INSTALL_DIR)/packages;::g' \
+        -e 's:$(XDAIS_INSTALL_DIR)/packages;::g' \
+        -e 's:$(FC_INSTALL_DIR)/fctools/packages;::g' \
+        -e 's:$(BIOSUTILS_INSTALL_DIR)/packages;::g' \
+        -e 's:$(CMEM_INSTALL_DIR)/packages;::g' \
+        -e 's:$(LINK_INSTALL_DIR)/packages;::g' \
+        -e 's:$(LPM_INSTALL_DIR)/packages;::g' \
         -e s:prod:eval:g \
         ${S}/Makefile
 
@@ -47,6 +54,12 @@ do_compile() {
 	sed -i -e s:/opt/dmsw/cg6x_6_0_16:${TITOOLSDIR}/${TICGTOOLSDIR}:g \
 	${S}/config.bld
 
+	# Add make target to allow package to be prepared for building (normally this package is a binary release)
+        echo "makebuildable:
+	\$(XDC) .make -PR .
+" >> ${S}/Makefile
+
+        oe_runmake makebuildable
 	oe_runmake clean
 	oe_runmake
 }
@@ -64,9 +77,14 @@ do_install () {
 	done
 	
 	# copy the generated data sheets as well for reference
-        for i in $(find . -name "*.DataSheet.*") ; do
+        #for i in $(find . -name "*.DataSheet.*") ; do
+
+        # infact, just copy all the html files (including the server datasheets) from the distro
+        #  - this includes top level html (with codec versions) + some qualiTI codec test reports
+        for i in $(find . -name "*.html") ; do
                 install ${i} ${D}/${datadir}/ti-codec-combos
         done
+
 }
 
 do_stage () {
diff --git a/packages/m4/m4-native_1.4.12.bb b/packages/m4/m4-native_1.4.12.bb
new file mode 100644
index 0000000000..8beb8748e3
--- /dev/null
+++ b/packages/m4/m4-native_1.4.12.bb
@@ -0,0 +1,19 @@
+require m4_${PV}.bb
+
+inherit native
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4"
+
+INHIBIT_AUTOTOOLS_DEPS = "1"
+DEPENDS += "gnu-config-native"
+
+do_configure()  {
+	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
+	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
+	oe_runconf
+}
+
+do_stage() {
+	install -m 0755 src/m4 ${STAGING_BINDIR}/
+}
+
diff --git a/packages/m4/m4_1.4.12.bb b/packages/m4/m4_1.4.12.bb
new file mode 100644
index 0000000000..77d8e822b0
--- /dev/null
+++ b/packages/m4/m4_1.4.12.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
+processor."
+LICENSE = "GPL"
+SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
+S = "${WORKDIR}/m4-${PV}"
+
+inherit autotools
+
+EXTRA_OEMAKE += "'infodir=${infodir}'"
+
+do_configure() {
+	oe_runconf
+}
diff --git a/packages/vala/vala-native_git.bb b/packages/vala/vala-native_git.bb
index b33dbc28ab..66abd5e292 100644
--- a/packages/vala/vala-native_git.bb
+++ b/packages/vala/vala-native_git.bb
@@ -2,12 +2,15 @@ require vala_0.5.7.bb
 # vala from git always needs the latest released version to compile itself
 DEPENDS = "vala-native"
 
-SRCREV = "633493367757a8e5f663c69c975bf525ab8a6d53"
-PV := "0.5.7+0.5.8pre01-git${SRCREV}"
+SRCREV = "e7462e3ed00b75c16c11c27f6d8a640c7f35fafc"
+PV := "0.5.7+0.5.8pre02-gitr${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "${GNOME_GIT}/vala;protocol=git;branch=master"
+SRC_URI = "\
+  ${FREESMARTPHONE_GIT}/vala;protocol=git;branch=master \
+  file://static-dbus-methods.patch;patch=1 \
+"         
 S = "${WORKDIR}/git"
 
 inherit native