merge of 4ae75badc5589c35fd33c90369b77e8d0a4d0c46

     and b2d6befb14a575e840b80779b3ee9e578a4bb3ce

10 files changed, 19 insertions, 13 deletions

diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
index b669d2b665..f6aaddd55e 100644
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ b/packages/angstrom/angstrom-bootmanager-image.bb
@@ -8,7 +8,7 @@ RDEPENDS = "angstrom-base-depends angstrom-bootmanager"
 
 export IMAGE_BASENAME = "bootmanager-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "angstrom-base-depends angstrom-bootmanager"
+export IPKG_INSTALL = "${RDEPENDS}"
 
 inherit image_ipk
 
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index 84a4845569..b2b5565eb6 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -8,7 +8,7 @@ RDEPENDS = "angstrom-base-depends"
 
 export IMAGE_BASENAME = "bootstrap-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "angstrom-base-depends"
+export IPKG_INSTALL = "${RDEPENDS}"
 
 inherit image_ipk
 
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
index 0419ea1b9a..df7f90987e 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -6,16 +6,17 @@ PR = "r0"
 export IMAGE_BASENAME = "gpe-image"
 
 DEPENDS = "task-angstrom"
-RDEPENDS = "${IPKG_INSTALL}"
-
-export IPKG_INSTALL = "\
+RDEPENDS = "\
     angstrom-base-depends \
-    angstrom-X-base-depends \
+    angstrom-x11-base-depends \
     angsgrom-gpe-task-base \
     angstrom-gpe-task-settings \
     angstrom-gpe-task-pim \
     ${ANGSTROM_EXTRA_INSTALL}"
 
+
+export IPKG_INSTALL = "${RDEPENDS}"
+
 #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index d058457e98..7447dc02e2 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -4,7 +4,7 @@ ALLOW_EMPTY = "1"
 
 PACKAGES = "\
     angstrom-base-depends \
-    angstrom-X-base-depends \
+    angstrom-x11-base-depends \
     angsgrom-gpe-task-base \
     angstrom-gpe-task-settings \
     angstrom-gpe-task-pim \
@@ -24,7 +24,7 @@ RDEPENDS_angstrom-base-depends = "\
     angstrom-version \	
     "
 
-RDEPENDS_angstrom-X-base-depends := "\
+RDEPENDS_angstrom-x11-base-depends := "\
     diet-x11 \
     virtual/xserver"
 
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 19e37660b2..4e3805b676 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r4"
+PR = "r5"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 93c58aca53..044383cb84 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -4,7 +4,7 @@ include gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index 74ad11033f..32e22e16f8 100644
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -63,8 +63,13 @@ python __anonymous () {
     import bb, re
     if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
         bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+    elif (re.match('linux-uclibcgnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+    elif (re.match('linux-gnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+           bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
     elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
         bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
+
 }
 
 do_configure () {
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 793aa4bb76..6e332dceca 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index 62bacda147..02e984358f 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 BINV = "3.4.4"
 PV = "3.4.4+csl-arm-2005q3"
-PR = "r1"
+PR = "r2"
 
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb
index 18b3ce1bd4..071b403695 100644
--- a/packages/mplayer/mplayer_1.0pre8.bb
+++ b/packages/mplayer/mplayer_1.0pre8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses mplayer-common"
+DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses lame"
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \