[oe-commits] org.oe.dev merge of '43b7d311b8108ccaa97f5955ea74f245fe291dc0'

[koen commit]

merge of '43b7d311b8108ccaa97f5955ea74f245fe291dc0'
     and 'beea20d8bd60f3598225741e5395f689cd57bdf1'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: f7e73ce5dd06528d50327d38d9e6e865a7758cf5
ViewMTN: http://monotone.openembedded.org/revision/info/f7e73ce5dd06528d50327d38d9e6e865a7758cf5
Files:
1
packages/gstreamer/gst-common.inc
packages/gstreamer/gstreamer_0.10.17.bb
packages/linux/linux-omap2-git/beagleboard/flash.patch
packages/linux/linux-omap2-git/beagleboard/flash2.patch
packages/linux/linux-omap2_git.bb
Diffs:

#
# mt diff -r43b7d311b8108ccaa97f5955ea74f245fe291dc0 -rf7e73ce5dd06528d50327d38d9e6e865a7758cf5
#
#
#
# patch "packages/gstreamer/gst-common.inc"
#  from [860249c91df6da7ad81a6dffba9d5529cc114c67]
#    to [312b6f501cb0d90950525431c523780c57f0b623]
# 
# patch "packages/gstreamer/gstreamer_0.10.17.bb"
#  from [ec06bc77d66c0e2f9c6286fa2dafe211dfacb017]
#    to [ceff85a9459f581a2755200ffe0ecbc98dfc2c79]
#
============================================================
--- packages/gstreamer/gst-common.inc	860249c91df6da7ad81a6dffba9d5529cc114c67
+++ packages/gstreamer/gst-common.inc	312b6f501cb0d90950525431c523780c57f0b623
@@ -10,26 +10,10 @@ OE_LT_RPATH_ALLOW[export]="1"
 OE_LT_RPATH_ALLOW = "any"
 OE_LT_RPATH_ALLOW[export]="1"
 
-do_stage() {
-    rm -rf ${STAGE_TEMP}
-    mkdir -p ${STAGE_TEMP}
-    oe_runmake DESTDIR="${STAGE_TEMP}" install
-    if [ -d ${STAGE_TEMP}/${includedir} ]; then
-        cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
-    fi
-    for i in $(find ${STAGE_TEMP}/${libdir} -name "*.la")
-    do
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
-        destdir=$(dirname $(echo $i | sed -e s,${STAGE_TEMP}/${libdir},${STAGING_LIBDIR},g))
-        oenote "Installing library $i to $destdir"
-        oe_libinstall -s -so $(basename $i .la) $destdir
-    done
-
-    if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
-		install -d ${STAGING_DATADIR}/aclocal
-		cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
-	fi
-	rm -rf ${STAGE_TEMP}
+do_stage() {
+	autotools_stage_all
 }
 
 
============================================================
--- packages/gstreamer/gstreamer_0.10.17.bb	ec06bc77d66c0e2f9c6286fa2dafe211dfacb017
+++ packages/gstreamer/gstreamer_0.10.17.bb	ceff85a9459f581a2755200ffe0ecbc98dfc2c79
@@ -1,6 +1,6 @@ require gstreamer.inc
 require gstreamer.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://po-makefile-fix.patch;patch=1"
 


#
# mt diff -rbeea20d8bd60f3598225741e5395f689cd57bdf1 -rf7e73ce5dd06528d50327d38d9e6e865a7758cf5
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/flash.patch"
# 
# delete "packages/linux/linux-omap2-git/beagleboard/flash2.patch"
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [1c611a9841069aa3ea975876ec119421f07d7b4f]
#    to [fefff33cc8166b4fc84f2c788fef8919f013528e]
#
============================================================
--- packages/linux/linux-omap2_git.bb	1c611a9841069aa3ea975876ec119421f07d7b4f
+++ packages/linux/linux-omap2_git.bb	fefff33cc8166b4fc84f2c788fef8919f013528e
@@ -2,19 +2,17 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
 
-SRCREV = "80b542010d78ccc74c6ee22c9700775736913a3c"
+SRCREV = "040378c1b24ace3b8945318a8c24ef218200912c"
 
 PV = "2.6.26"
 #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}"
-PR = "r55"
+PR = "r56"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
 
 SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
-           file://flash.patch;patch=1 \
-           file://flash2.patch;patch=1 \
 	   file://0001-omap3-cpuidle.patch;patch=1 \ 
            file://0002-omap3-cpuidle.patch;patch=1 \
            file://timer-suppression.patch;patch=1 \
@@ -36,7 +34,6 @@ SRC_URI_append_beagleboard = " file://no
            file://mru-clocks2.diff;patch=1 \
            file://mru-clocks3.diff;patch=1 \	
            file://4bitmmc.diff;patch=1 \
-	   file://400khz-i2c.diff;patch=1 \
            file://no-cortex-deadlock.patch;patch=1 \
            file://01-gptimer_clear_isrs_on_init;patch=1 \
            file://02-gptimer_use_match_for_tick;patch=1 \