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

76 files changed, 414 insertions, 77 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5bc3c458f0..278994f7e4 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -226,6 +226,10 @@ sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e
 md5=59ca16f600e96c8c104a485ff7c322c6
 sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e
 
+[http://directfb.org/downloads/Core/DirectFB-1.2.8.tar.gz]
+md5=ac13d21682aa368df4e177ae5b51ad2d
+sha256=cbf94eb10e9c305c81b24e298e55c7825df5ab9060d82443f7b9734f760f859d
+
 [http://www.directfb.org/downloads/Extras/DirectFB-examples-0.9.25.tar.gz]
 md5=835e850fddba8d8214d39ddd0646c3e8
 sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa
@@ -10602,6 +10606,10 @@ sha256=bedfd45364948a08ecaa212c5eda6667a83ac8bb547e2eb8478ade885898cad7
 md5=f720686c841e9fefc06db76458fd9908
 sha256=1f8259a3a8ae583170816f5028329f3a7157f87f927da9c0a911a5fb9be263a1
 
+[http://www.netsurf-browser.org/projects/releases/hubbub-0.0.1-src.tar.gz]
+md5=58c6e2b5a5906f3f0bf136c0c71b5403
+sha256=3ba0bdf71376429bb3ce8ae51595fc25e6a5147cdcc26e47b6da17386eb78cdf
+
 [http://cvs.haskell.org/Hugs/downloads/Nov2003/hugs98-Nov2003.tar.gz]
 md5=e80a6739ead9a260087fe4d3fc6a8359
 sha256=9f90613de73e1b8e90d9bbcb09046e83680f15a46fc630c3e26e9aa4ca0e6a1d
@@ -13858,6 +13866,14 @@ sha256=15b0492ac252f6e8ce57c106bda0722413196d16d198c97f20a05908d1b977af
 md5=ba76f68b7e3bd284ac2c2a1b9c5ecb06
 sha256=2389a9b8220f776033f728a8d46352cfee5c8705066e34887bfb188f9f0d3856
 
+[http://www.netsurf-browser.org/projects/releases/libnsbmp-0.0.1-src.tar.gz]
+md5=61e1e5703580c1bc7d950a1aacea7bad
+sha256=424d12aae7a6ea8c90438cf4ccff486dc01a3a2a7b68eb602ee2b8c28178b6d1
+
+[http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz]
+md5=a547da766fccacd00fd05190baf644da
+sha256=54f316f530caaacd55dc23f546537759382a45ac6378ead249b5a5d51cf4db52
+
 [http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
 md5=85b6a42a9e17a23c01b2f2ed0ece0563
 sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78
@@ -14070,6 +14086,10 @@ sha256=7a61e8b686ae7d659835175018da3a1baa959329b77c18e6e9381a197937296f
 md5=7075f580606a84e63b7d6d9fa3124c31
 sha256=7ff5f355bb254a3d4ed4541377e6304432ee8678e7c9ec29e7d43488903004c9
 
+[http://www.netsurf-browser.org/projects/releases/libparserutils-0.0.1-src.tar.gz]
+md5=5999c2d52f8c07eeef2a8808fee4f858
+sha256=5aed4edfd2023ed3ccd566fe76131d10faf43c8c3efa2e90978eed37c5503165
+
 [http://www.at.tcpdump.org/release/libpcap-0.9.3.tar.gz]
 md5=0ad921c881fdd3d278046afcd352a151
 sha256=f20d19b1f32e4ee465169ff1e17a3755bfda8c697cfed11fe36cbf6959c80441
@@ -17318,6 +17338,10 @@ sha256=844ba97e745a0b9f37afc7daa323cafcef00108cd0254667da0a00558eb323a7
 md5=36f7b3120e00c9c74cb6619334de419f
 sha256=6eed89b661ae9f2ac0d383414ca964abea8a115f8fba0f7ab37b49b565ffb2a8
 
+[http://www.netsurf-browser.org/downloads/releases/netsurf-2.1-src.tar.gz]
+md5=f0a34fd076b492c1a13b45432e8d7e49
+sha256=cda2cf41c852938c226c47c2b995d527387120141f68b416ea745e50a7165a81
+
 [http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.6/network-manager-applet-0.6.5.tar.bz2]
 md5=1c94a41e2399d261985a75f0cd3b895b
 sha256=9cca3e34e23f00c82bc5e7237aa81639874e90d43a689e26fbfd938279ca31c9
@@ -22486,15 +22510,15 @@ sha256=c087b112da0afd1c50ba8a8a2727c4cabfb1e5a57f43701c5abdc05865072649
 md5=ee6b84cc7b598b4e1a00a4a8c6676d4e
 sha256=d4d17102e014d3183a11719896061dc464c3d9a836caaf47b3b57da4ac23b52d
 
-[http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.11.tar.gz]
+[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.11.tar.gz]
 md5=8f9ca6140f428dc9adec9fa1c270a2dd
 sha256=dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
 
-[http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz]
+[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.8.tar.gz]
 md5=ffbad7e8e6dcbe385820b8ffba23b622
 sha256=3c841fd89599ffb770cdf2844426980d75dc3dab12e0f707e4cbb51937f6125e
 
-[http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/syslog-ng-2.0.5.tar.gz]
+[http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-2.0.5.tar.gz]
 md5=c161eefc450fabc246c1a10997c6c6a5
 sha256=34862f87d9d404ad4874d95ee871334f5bc2acad65420f672ad2ee286ab660a1
 
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index 415f8a4d68..2ca00da9c7 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -11,7 +11,7 @@ MACHINE_KERNEL_PR = "r11"
 MACHINE_KERNEL_PR_collie = "r8"
 MACHINE_KERNEL_PR_tosa = "r4"
 
-MACHINE_KERNEL_PR_pn-linux-kexecboot = "r12"
+MACHINE_KERNEL_PR_pn-linux-kexecboot = "r13"
 
 KERNEL_IMAGE_MAXSIZE = "1294336"
 KERNEL_IMAGE_MAXSIZE_collie = "1048576"
diff --git a/recipes/cherokee/cherokee-nossl_0.5.3.bb b/recipes/cherokee/cherokee-nossl_0.5.3.bb
index 409366004a..3ea9068456 100644
--- a/recipes/cherokee/cherokee-nossl_0.5.3.bb
+++ b/recipes/cherokee/cherokee-nossl_0.5.3.bb
@@ -2,7 +2,7 @@ require cherokee_${PV}.bb
 
 DEPENDS = "libpcre"
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/cherokee-${PV}', '${FILE_DIRNAME}/cherokee', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "cherokee-${PV}:cherokee:"
 
 S = "${WORKDIR}/cherokee-${PV}"
 
diff --git a/recipes/db/db3-native_3.2.9.bb b/recipes/db/db3-native_3.2.9.bb
index 492f7407d1..f16b19f642 100644
--- a/recipes/db/db3-native_3.2.9.bb
+++ b/recipes/db/db3-native_3.2.9.bb
@@ -4,5 +4,4 @@ CONFLICTS = "db-native"
 inherit native
 require db3_${PV}.bb
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/db3-${PV}', '${FILE_DIRNAME}/db3', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
diff --git a/recipes/directfb/directfb-1.2.8/ts_lib_autotools.patch b/recipes/directfb/directfb-1.2.8/ts_lib_autotools.patch
new file mode 100644
index 0000000000..7c34b567d9
--- /dev/null
+++ b/recipes/directfb/directfb-1.2.8/ts_lib_autotools.patch
@@ -0,0 +1,22 @@
+---
+ configure.in |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+Index: DirectFB-1.2.8/configure.in
+===================================================================
+--- DirectFB-1.2.8.orig/configure.in
++++ DirectFB-1.2.8/configure.in
+@@ -1288,8 +1288,11 @@ fi
+ 
+ enable_tslib=no
+ if test "$checkfor_tslib" = "yes"; then
+-  PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no,
+-    AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
++  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
++  if test "$enable_tslib" = "no"; then
++    PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no,
++      AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
++  fi
+ fi
+ 
+ enable_ucb1x00_ts=no
diff --git a/recipes/directfb/directfb_1.2.8.bb b/recipes/directfb/directfb_1.2.8.bb
new file mode 100644
index 0000000000..bf0b95e280
--- /dev/null
+++ b/recipes/directfb/directfb_1.2.8.bb
@@ -0,0 +1,27 @@
+require directfb.inc
+
+RV = "1.2-0"
+
+DEPENDS += "sysfsutils"
+
+SRC_URI = " \
+    http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
+    file://directfb-1.2.x-fix-pkgconfig-cflags.patch;patch=1 \
+    file://mkdfiff.patch;patch=1 \
+    file://dont-use-linux-config.patch;patch=1 \
+    file://ts_lib_autotools.patch;patch=1 \
+"
+
+EXTRA_OECONF = "\
+  --enable-freetype=yes \
+  --enable-zlib \
+  --with-gfxdrivers=none \
+  --disable-libmpeg3 \
+  --disable-sdl \
+  --disable-vnc \
+  --disable-x11 \
+"
+
+LDFLAGS_append = ""
+
+LEAD_SONAME = "libdirectfb-1.2.so.0"
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
index 9d0afa864b..5f94c08dd4 100644
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
@@ -2,5 +2,4 @@ SECTION = "base"
 require e2fsprogs-libs_${PV}.bb
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
index 3db9e02f28..2632db485d 100644
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
@@ -2,7 +2,6 @@ SECTION = "base"
 require e2fsprogs-libs_${PV}.bb
 inherit native
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 DEPENDS = "gettext-native"
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
index af49b0d7dd..13fd2beb0c 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -11,7 +11,6 @@ SRC_URI += "file://no-hardlinks.patch;patch=1 \
 
 EXTRA_OECONF = ""
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 DEPENDS = ""
 
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
index e79958cb2f..4ff399b10f 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
@@ -7,7 +7,6 @@ DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF = ""
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 DEPENDS = ""
 
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
index b29064f5c8..295136328e 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
@@ -6,7 +6,6 @@ SRC_URI += "file://mkinstalldirs.patch;patch=1"
 
 EXTRA_OECONF = ""
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 DEPENDS = ""
 
diff --git a/recipes/e2tools/e2tools-native_0.0.16.bb b/recipes/e2tools/e2tools-native_0.0.16.bb
index e37eed2b18..f23a0b12a2 100644
--- a/recipes/e2tools/e2tools-native_0.0.16.bb
+++ b/recipes/e2tools/e2tools-native_0.0.16.bb
@@ -3,7 +3,6 @@ require e2tools_${PV}.bb
 inherit native
 
 DEPENDS = "e2fsprogs-libs-native e2fsprogs-native"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2tools-${PV}', '${FILE_DIRNAME}/e2tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
 
 e2links = "e2ln e2ls e2mkdir e2mv e2rm e2tail"
diff --git a/recipes/eglibc/eglibc-initial.inc b/recipes/eglibc/eglibc-initial.inc
index 5fbb5dbda5..7a5a7b22f4 100644
--- a/recipes/eglibc/eglibc-initial.inc
+++ b/recipes/eglibc/eglibc-initial.inc
@@ -1,7 +1,6 @@
 SECTION = "libs"
 DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
 PACKAGES_DYNAMIC = ""
diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass
index 22ff52b3ff..f2acc961fa 100644
--- a/recipes/eglibc/eglibc-package.bbclass
+++ b/recipes/eglibc/eglibc-package.bbclass
@@ -24,7 +24,7 @@ python __anonymous () {
 ENABLE_BINARY_LOCALE_GENERATION ?= "0"
 
 # BINARY_LOCALE_ARCHES is a space separated list of regular expressions
-BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64"
+BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc"
 
 PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
 PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*"
@@ -289,6 +289,8 @@ python package_do_split_gconvs () {
 		target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
 		if target_arch in ("i486", "i586", "i686"):
 			target_arch = "i386"
+		elif target_arch == "powerpc":
+			target_arch = "ppc"
 		kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1)
 		if kernel_ver is None:
 			qemu = "qemu-%s  -s 1048576" % target_arch
diff --git a/recipes/freesmartphone/frameworkd-devel_git.bb b/recipes/freesmartphone/frameworkd-devel_git.bb
index f5f6c0bc2d..a6439ee653 100644
--- a/recipes/freesmartphone/frameworkd-devel_git.bb
+++ b/recipes/freesmartphone/frameworkd-devel_git.bb
@@ -1,5 +1,5 @@
 require frameworkd_git.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "frameworkd:"
 PROVIDES = "frameworkd"
 RPROVIDES = "frameworkd"
 PV = "0.8.5.x+gitr${SRCREV}"
diff --git a/recipes/genext2fs/genext2fs-native_1.3.bb b/recipes/genext2fs/genext2fs-native_1.3.bb
index 2e26fa0110..50b371b97e 100644
--- a/recipes/genext2fs/genext2fs-native_1.3.bb
+++ b/recipes/genext2fs/genext2fs-native_1.3.bb
@@ -1,6 +1,5 @@
 require genext2fs_${PV}.bb
 inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/genext2fs-${PV}', '${FILE_DIRNAME}/genext2fs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 do_stage () {
 	install -m 0755 genext2fs ${STAGING_BINDIR}/
diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc
index 5528cf8edb..cd65924047 100644
--- a/recipes/glibc/glibc-initial.inc
+++ b/recipes/glibc/glibc-initial.inc
@@ -1,7 +1,7 @@
 SECTION = "libs"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "glibc-2.4:"
 
 PACKAGES = ""
 PACKAGES_DYNAMIC = ""
diff --git a/recipes/glibc/glibc-initial_2.2.5.bb b/recipes/glibc/glibc-initial_2.2.5.bb
index 84412bd596..c7dde2310e 100644
--- a/recipes/glibc/glibc-initial_2.2.5.bb
+++ b/recipes/glibc/glibc-initial_2.2.5.bb
@@ -2,4 +2,3 @@ require glibc_${PV}.bb
 require glibc-initial.inc
 
 DEFAULT_PREFERENCE_sh3 = "-99"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.b