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

diff --cc classes/rootfs_ipk.bbclass
Simple merge

diff --cc conf/checksums.ini
Simple merge

diff --cc packages/dsplink/dsplink.inc
index a880d3b,506b34b..91e4870
--- 1/packages/dsplink/dsplink.inc
--- 2/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@@ -13,32 -13,12 +13,35 @@@ export DSPLINK="${S}
  
  require ti-paths.inc
  
 +DSPLINKPLATFORM ?= "DAVINCI"
 +DSPLINKPLATFORM_omap5912osk = "OMAP"
 +DSPLINKPLATFORM_beagleboard = "OMAP3530"
 +DSPLINKPLATFORM_davinci-sffsdr = "DAVINCI"
 +DSPLINKPLATFORM_davinci-dvevm = "DAVINCI"
 +
 +DSPLINKDSP ?= "C64XX"
 +
 +DSPLINKSOC ?= "DM6446"
 +DSPLINKSOC_beagleboard = "3530"
 +
 +DSPCFG ?= "DM6446GEMSHMEM"
 +DSPCFG_beagleboard ?= "OMAP3530SHMEM"
 +
 +GPPOS ?= "DAVINCILSP"
 +GPPOS_beagleboard = "OMAPLSP"
 +
 +export DSPLINKPLATFORM 
 +export DSPLINKDSP
 +export DSPLINKSOC
 +export DSPCFG
 +export GPPOS
 +
  do_configure () {
        # Run perl script to create appropriate makefiles (v1.60 and up)
+       (
+       cd ${DSPLINK}
        perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 --dspcfg_0=${DSPCFG} --dspos_0=DSPBIOS5XX  --gppos=${GPPOS} --comps=ponslrm
+       )
  }
  
  PARALLEL_MAKE = ""

diff --cc packages/eglibc/eglibc_svn.bb
Simple merge

diff --cc packages/gstreamer/gst-plugins-ugly_0.10.7.bb
index 2100e3e,054f0df..ea8ada3
--- 1/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
--- 2/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
@@@ -1,10 -1,9 +1,9 @@@
  require gst-plugins.inc
- PR = "r0"
+ PR = "r1"
  
 -DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 +DEPENDS += "gst-plugins-base libsidplay"
  
  SRC_URI += "\
- #  file://cross-compile.patch;patch=1 \
    file://gstmad_16bit.patch;patch=1 \
    file://gstsid_autofoo_HACK.patch;patch=1 \
  "

diff --cc packages/samba/samba-essential_3.0.20.bb
index 5d66b5a,5486e0f..f545d66
--- 1/packages/samba/samba-essential_3.0.20.bb
--- 2/packages/samba/samba-essential_3.0.20.bb
+++ b/packages/samba/samba-essential_3.0.20.bb
@@@ -1,9 -1,9 +1,9 @@@
  require samba-essential.inc
  inherit update-rc.d
  
- PR = "r6"
+ PR = "r7"
  
 -SRC_URI = "file://config-lfs.patch;patch=1 \
 +SRC_URI += "file://config-lfs.patch;patch=1 \
           file://init-essential \
             file://quota.patch;patch=1;pnum=0 \
           file://smb-essential.conf \

diff --cc site/powerpc-common
Simple merge