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

4 files changed, 65 insertions, 53 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a4072a35bd..9381bee39a 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -862,6 +862,10 @@ sha256=bce6638d95fa8d32b109176a7cef6aa71e40c130068fac71b0df369d1a36c82c
 md5=ed2183311aacf5714afbd825f3671417
 sha256=a319f936af9df20cd173d2e4c486cb6f1a011287ebcbd429a7f38c3214f555f3
 
+[ftp://ftp.buici.com/pub/apex/apex-1.5.14.tar.gz]
+md5=22fb46e76c8221c7bcc9734602367460
+sha256=472e12897931d9e5dcf2d1e3332acfc467aafd0f62e612896a9c71dd0d16d950
+
 [ftp://ftp.buici.com/pub/apex/apex-1.5.8.tar.gz]
 md5=bb96cc8d50b4f00ee653f0800643ea8a
 sha256=4ad287720b87213154fa272afee5f442b0d8d61c1f56e43d0d056ae25849a926
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 722a5c9dc9..deea7d3627 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -87,7 +87,8 @@ do
 		      epdfview \
 		      epiphany \
 		      evince \
-		      fakeroot \
+		      exo \
+              fakeroot \
 		      fennec \
 		      ffmpeg \
 		      fftw \
@@ -155,7 +156,8 @@ do
 		      midori \
 		      mileage \
 		      mono \
-		      mpfr \
+		      mousepad \
+              mpfr \
 		      mplayer \
 		      mtd-utils \
 		      mythtv \
@@ -168,7 +170,8 @@ do
 		      openredalert \
 		      openvpn \
 		      opie-notes \
-		      pairs \
+		      orage \
+              pairs \
 		      pciutils \
 		      pdamaze \
 		      perl \
@@ -210,7 +213,8 @@ do
 		      task-proper-tools \
 		      texinfo \
 		      thttpd \
-		      tightvnc \
+		      thunar \
+              tightvnc \
 		      timesleuth \
 		      totem \
 		      tron \
@@ -232,7 +236,22 @@ do
 		      xf86-video-ati \
 		      xf86-video-fbdev \
 		      xf86-video-vesa \
-		      xmms \
+		      xfce-mcs-manager
+              xfce-mcs-manager \
+              xfce-mcs-plugins \
+              xfce-terminal \
+              xfce-utils \
+              xfce4-appfinder \
+              xfce4-dev-tools \
+              xfce4-icon-theme \
+              xfce4-mixer \
+              xfce4-panel \
+              xfce4-session \
+              xfdesktop \
+              xfprint \
+              xfwm4 \
+              xfwm4-themes \
+              xmms \
 		      xserver-kdrive \
 		      xserver-xorg \
 		      zauralign \
diff --git a/packages/boost/boost-36.inc b/packages/boost/boost-36.inc
index 826ad81299..62dc504b84 100644
--- a/packages/boost/boost-36.inc
+++ b/packages/boost/boost-36.inc
@@ -15,47 +15,44 @@ BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
 BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
+BOOST_LIBS = "\
+	date_time \
+	filesystem \
+	graph \
+	iostreams \
+	program_options \
+	regex \
+	serialization \
+	signals \
+	system \
+	test \
+	thread \
+	"
+
 S = "${WORKDIR}/${BOOST_P}"
 
 # Make a package for each library, plus -dev and -python
-PACKAGES = "${PN}-dbg"
-BOOSTLIBS = ""
-
-PACKAGES += "boost-date-time"
-FILES_boost-date-time = "${libdir}/libboost_date_time*.so*"
-
-BOOSTLIBS += "boost-filesystem"
-FILES_boost-filesystem = "${libdir}/libboost_filesystem*.so*"
-
-BOOSTLIBS += "boost-prg-exec-monitor"
-FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor*.so*"
-
-BOOSTLIBS += "boost-program-options"
-FILES_boost-program-options = "${libdir}/libboost_program_options*.so*"
-
-BOOSTLIBS += "boost-regex"
-FILES_boost-regex = "${libdir}/libboost_regex*.so*"
-
-BOOSTLIBS += "boost-signals"
-FILES_boost-signals = "${libdir}/libboost_signals*.so*"
-
-BOOSTLIBS += "boost-test-exec-monitor"
-FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor*.so*"
-
-BOOSTLIBS += "boost-thread-mt"
-FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so*"
-
-BOOSTLIBS += "boost-unit-test-framework"
-FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework*.so*"
-
-BOOSTLIBS += "boost-iostreams"
-FILES_boost-iostreams = "${libdir}/libboost_iostreams*.so*"
-
-BOOSTLIBS += "boost-serialization"
-FILES_boost-serialization = "${libdir}/libboost_serialization*.so*"
+PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}"
+python __anonymous () {
+	import bb
+
+	packages = []
+	extras = [] 
+	for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ):
+		pkg = "boost-%s" % lib.replace("_", "-")
+		extras.append("--with-%s" % lib)
+		packages.append(pkg)
+		if not bb.data.getVar("FILES_%s" % pkg, d, 1):
+			bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so*" % lib, d)
+	bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d)
+	bb.data.setVar("BJAM_EXTRA", " ".join(extras), d)
+}
 
-BOOSTLIBS += "boost-wserialization"
-FILES_boost-wserialization = "${libdir}/libboost_wserialization*.so*"
+# Override the contents of specific packages
+FILES_boost-serialization = "${libdir}/libboost_serialization*.so* \
+	${libdir}/libboost_wserialization*.so*"
+FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so \
+	${libdir}/libboost_unit_test_framework*.so*"
 
 # Python - remove this and set:
 #PYTHON_ROOT = "/dev/null"
@@ -64,18 +61,16 @@ DEPENDS += "python"
 PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}"
 PYTHON_VERSION = "2.5"
 
-BOOSTLIBS += "boost-python"
+PACKAGES += "boost-python"
 FILES_boost-python = "${libdir}/libboost_python*.so*"
 
-PACKAGES += "${BOOSTLIBS}"
-
 # -dev last to pick up the remaining stuff
 PACKAGES += "${PN}-dev"
 FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
 
 # "boost" is a metapackage which pulls in all boost librabries
 PACKAGES += "${PN}"
-RRECOMMENDS_${PN} += "${BOOSTLIBS}"
+RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
 
 # Oh yippee, a new build system, it's sooo cooool I could eat my own
 # foot.  inlining=on lets the compiler choose, I think.  At least this
@@ -122,12 +117,6 @@ BJAM_TOOLS   = "-sTOOLS=gcc \
 		'--layout=system' \
 		"
 
-BJAM_EXTRA = '\
-              --with-thread \
-              --with-date_time \
-              --with-filesystem \
-             '
-
 BJAM_OPTS    = '${BJAM_TOOLS} \
 		--builddir=${S}/${TARGET_SYS} \
 		--with-python-root=${PYTHON_ROOT} \
diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb
index 20a8f0ad47..fdc3136ac4 100644
--- a/packages/boost/boost_1.36.0.bb
+++ b/packages/boost/boost_1.36.0.bb
@@ -2,7 +2,7 @@ include boost-36.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r1"
+FILE_PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
            file://arm-intrinsics.patch;patch=1 \