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

65 files changed, 1262 insertions, 405 deletions

diff --git a/packages/automake/automake-native_1.10.bb b/packages/automake/automake-native_1.10.bb
index a7857c562d..92c861f49c 100644
--- a/packages/automake/automake-native_1.10.bb
+++ b/packages/automake/automake-native_1.10.bb
@@ -1,5 +1,3 @@
 PV := "${PV}"
 
 require automake-native.inc
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/packages/automake/automake_1.10.bb b/packages/automake/automake_1.10.bb
index e4e8f3385b..42e0d66d9e 100644
--- a/packages/automake/automake_1.10.bb
+++ b/packages/automake/automake_1.10.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-DEFAULT_PREFERENCE = "-1"
 PR = "r1"
 
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
-	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
-
+SRC_URI = "\
+  ${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
+  ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \
+"
 S = "${WORKDIR}/automake-${PV}"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
diff --git a/packages/base-passwd/base-passwd-3.5.9/configure.patch b/packages/base-passwd/base-passwd-3.5.9/configure.patch
deleted file mode 100644
index a9adb1e9e2..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- base-passwd/configure.in~configure
-+++ base-passwd/configure.in
-@@ -1,5 +1,6 @@
- dnl Initialize the autoconf process
--AC_INIT(update-passwd.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([update-passwd.c])
- AC_CONFIG_HEADER(config.h)
- AC_PREFIX_DEFAULT(/usr)
- 
-@@ -12,5 +13,6 @@
- AC_CHECK_FUNCS(putgrent)
- 
- dnl Finally output everything
--AC_OUTPUT(Makefile)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
diff --git a/packages/base-passwd/base-passwd-3.5.9/mysql.patch b/packages/base-passwd/base-passwd-3.5.9/mysql.patch
deleted file mode 100644
index b641f41238..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/mysql.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- base-passwd/group.master.orig	2005-07-08 06:36:07.717990112 +0200
-+++ base-passwd/group.master	2005-07-08 06:36:32.000000000 +0200
-@@ -36,4 +36,5 @@
- staff:*:50:
- games:*:60:
- users:*:100:
-+mysql:*:64001:
- nogroup:*:65534:
diff --git a/packages/base-passwd/base-passwd-3.5.9/nobash.patch b/packages/base-passwd/base-passwd-3.5.9/nobash.patch
deleted file mode 100644
index 2bde9bf33b..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/nobash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- base-passwd/passwd.master~nobash
-+++ base-passwd/passwd.master
-@@ -1,4 +1,4 @@
--root::0:0:root:/root:/bin/bash
-+root::0:0:root:/root:/bin/sh
- daemon:*:1:1:daemon:/usr/sbin:/bin/sh
- bin:*:2:2:bin:/bin:/bin/sh
- sys:*:3:3:sys:/dev:/bin/sh
diff --git a/packages/base-passwd/base-passwd-3.5.9/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/root-home.patch
deleted file mode 100644
index 85d96b6185..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/root-home.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- base-passwd/passwd.master.orig	2005-07-08 06:26:22.000000000 +0200
-+++ base-passwd/passwd.master	2005-07-08 06:31:58.000000000 +0200
-@@ -1,4 +1,4 @@
--root::0:0:root:/root:/bin/sh
-+root::0:0:root:/home/root:/bin/sh
- daemon:*:1:1:daemon:/usr/sbin:/bin/sh
- bin:*:2:2:bin:/bin:/bin/sh
- sys:*:3:3:sys:/dev:/bin/sh
diff --git a/packages/base-passwd/base-passwd-3.5.9/slugos/README b/packages/base-passwd/base-passwd-3.5.9/slugos/README
deleted file mode 100644
index 1abe54b5a2..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/slugos/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch overrides the root-home.patch for all DISTROs
-derived from slugos (DISTROs which set slugos in OVERRIDES)
-
-The patch sets a root password on /etc/passwd, this password is
-
-opeNSLUg
-
-This allows ssh (dropbear) login to an OpenSlug NSLU2 using that
-password.
-
-The password is NO MORE SECURE than the previous empty string,
-however, because ssh logins can now succeed the NSLU2 is LESS
-secure!  This password must be changed as soon as possible after
-initial configuration of the NSLU2.
diff --git a/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch
deleted file mode 100644
index 97dab68f33..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- base-passwd/passwd.master.orig	2005-07-08 06:26:22.000000000 +0200
-+++ base-passwd/passwd.master	2005-07-08 06:31:58.000000000 +0200
-@@ -1,4 +1,4 @@
--root::0:0:root:/root:/bin/sh
-+root:Xm./49bYkrkuo:0:0:root:/root:/bin/sh
- daemon:*:1:1:daemon:/usr/sbin:/bin/sh
- bin:*:2:2:bin:/bin:/bin/sh
- sys:*:3:3:sys:/dev:/bin/sh
diff --git a/packages/base-passwd/base-passwd_3.5.19.bb b/packages/base-passwd/base-passwd_3.5.20.bb
index 65ee129e0b..78079a0aa6 100644
--- a/packages/base-passwd/base-passwd_3.5.19.bb
+++ b/packages/base-passwd/base-passwd_3.5.20.bb
@@ -2,17 +2,16 @@ DESCRIPTION = "Base system password/group files."
 SECTION = "base"
 LICENSE = "GPL"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
-	   file://nobash.patch;patch=1 \
-	   file://root-home.patch;patch=1 \
-	   file://mysql.patch;patch=1"
-
+SRC_URI = "\
+  ${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
+  file://nobash.patch;patch=1 \
+  file://root-home.patch;patch=1 \
+  file://mysql.patch;patch=1 \
+"
 S = "${WORKDIR}/base-passwd"
 
 inherit autotools
 
-FILES_${PN}-doc += "${docdir}"
-
 do_install () {
 	install -d -m 755 ${D}${sbindir}
 	install -p -m 755 update-passwd ${D}${sbindir}/
@@ -42,6 +41,7 @@ do_install_append_openmn() {
 	echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
 }
 
+FILES_${PN}-doc += "${docdir}"
 
 pkg_postinst () {
 	set -e
diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb
deleted file mode 100644
index 4ea4e7f839..0000000000
--- a/packages/base-passwd/base-passwd_3.5.9.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "Base system password/group files."
-SECTION = "base"
-PR = "r3"
-LICENSE = "GPL"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://nobash.patch;patch=1 \
-	   file://root-home.patch;patch=1 \
-	   file://mysql.patch;patch=1"
-
-S = "${WORKDIR}/base-passwd"
-
-inherit autotools
-
-FILES_${PN}-doc += "${docdir}"
-
-do_install () {
-	install -d -m 755 ${D}${sbindir}
-	install -p -m 755 update-passwd ${D}${sbindir}/
-	install -d -m 755 \
-		${D}${mandir}/man8 ${D}${mandir}/pl/man8
-	install -p -m 644 man/update-passwd.8 \
-		${D}${mandir}/man8/
-	install -p -m 644 man/update-passwd.pl.8 \
-		${D}${mandir}/pl/man8/update-passwd.8
-	gzip -9 ${D}${mandir}/man8/* \
-		${D}${mandir}/pl/man8/*
-	install -d -m 755 ${D}${datadir}/base-passwd
-	install -p -m 644 passwd.master \
-		${D}${datadir}/base-passwd/
-	install -p -m 644 group.master \
-		${D}${datadir}/base-passwd/
-
-	install -d -m 755 ${D}${docdir}/${PN}
-	install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
-	gzip -9 ${D}${docdir}/${PN}/*
-	install -p -m 644 README ${D}${docdir}/${PN}/
-	install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
-}
-
-
-do_install_append_openmn() {
-	echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
-}
-
-
-pkg_postinst () {
-	set -e
-
-	if [ ! -e $D${sysconfdir}/passwd ] ; then
-		cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd
-	fi
-
-	if [ ! -e $D${sysconfdir}/group ] ; then
-		cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
-	fi
-	exit 0
-}
diff --git a/packages/base-passwd/base-passwd-3.5.19/mysql.patch b/packages/base-passwd/files/mysql.patch
index b641f41238..b641f41238 100644
--- a/packages/base-passwd/base-passwd-3.5.19/mysql.patch
+++ b/packages/base-passwd/files/mysql.patch
diff --git a/packages/base-passwd/base-passwd-3.5.19/nobash.patch b/packages/base-passwd/files/nobash.patch
index 2bde9bf33b..2bde9bf33b 100644
--- a/packages/base-passwd/base-passwd-3.5.19/nobash.patch
+++ b/packages/base-passwd/files/nobash.patch
diff --git a/packages/base-passwd/base-passwd-3.5.19/root-home.patch b/packages/base-passwd/files/root-home.patch
index 85d96b6185..85d96b6185 100644
--- a/packages/base-passwd/base-passwd-3.5.19/root-home.patch
+++ b/packages/base-passwd/files/root-home.patch
diff --git a/packages/base-passwd/base-passwd-3.5.19/slugos/README b/packages/base-passwd/files/slugos/README
index 1abe54b5a2..1abe54b5a2 100644
--- a/packages/base-passwd/base-passwd-3.5.19/slugos/README
+++ b/packages/base-passwd/files/slugos/README
diff --git a/packages/base-passwd/base-passwd-3.5.19/slugos/root-home.patch b/packages/base-passwd/files/slugos/root-home.patch
index 97dab68f33..97dab68f33 100644
--- a/packages/base-passwd/base-passwd-3.5.19/slugos/root-home.patch
+++ b/packages/base-passwd/files/slugos/root-home.patch
diff --git a/packages/cdrtools/cdrtools-native_2.01.bb b/packages/cdrtools/cdrtools-native_2.01.bb
index 9b148517d2..87045f4699 100644
--- a/packages/cdrtools/cdrtools-native_2.01.bb
+++ b/packages/cdrtools/cdrtools-native_2.01.bb
@@ -4,11 +4,12 @@
 
 LICENSE="GPL"
 DESCRIPTION="A set of tools for CD recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
+HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html"
 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2"
+SRC_URI="http://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2"
 
 S="${WORKDIR}/cdrtools-${PV}"
+PR = "r1"
 
 inherit native
 
diff --git a/packages/cups/cups_1.2.10.bb b/packages/cups/cups_1.2.10.bb
deleted file mode 100644
index 2361565a91..0000000000
--- a/packages/cups/cups_1.2.10.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require cups.inc
-
-PR = "r3"
-
diff --git a/packages/cups/cups_1.2.12.bb b/packages/cups/cups_1.2.12.bb
index 662f0ec8ff..bbe3c5d84f 100644
--- a/packages/cups/cups_1.2.12.bb
+++ b/packages/cups/cups_1.2.12.bb
@@ -1,5 +1,2 @@
 require cups.inc
-
 PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/packages/dpkg/dpkg-native.inc b/packages/dpkg/dpkg-native.inc
index 5d14527341..771476ff2f 100644
--- a/packages/dpkg/dpkg-native.inc
+++ b/packages/dpkg/dpkg-native.inc
@@ -2,12 +2,16 @@ require dpkg.inc
 
 inherit native
 
-DEPENDS = "bzip2-native zlib-native virtual/update-alternatives-native"
+DEPENDS = "perl-native bzip2-native zlib-native virtual/update-alternatives-native"
+RDEPENDS = ""
 
 SRC_URI += "file://noman.patch;patch=1"
 FILESPATH += "dpkg-${PV}"
 
-PERL_LIBDIR = "${STAGING_LIBDIR}/perl"
+# We need to do this so our perl is picked up.
+do_configure_prepend() {
+	export PERL=${STAGING_BINDIR}/perl
+}
 
 EXTRA_OECONF = "--without-static-progs \
 		--without-dselect \
diff --git a/packages/dsplink/gstreamer-ti_svn.bb b/packages/dsplink/gstreamer-ti_svn.bb
index 9ba7b2f623..52f1fc04df 100644
--- a/packages/dsplink/gstreamer-ti_svn.bb
+++ b/packages/dsplink/gstreamer-ti_svn.bb
@@ -1,7 +1,7 @@
 DEPENDS = "ti-codec-engine ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly libid3tag liboil libmad"
 
 SRC_URI = "svn://omapzoom.org/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https"
-SRCREV = "121"
+SRCREV = "126"
 
 PR = "r1"
 
diff --git a/packages/efl1/elementary_svn.bb b/packages/efl1/elementary_svn.bb
index eb880aedca..82a099f00d 100644
--- a/packages/efl1/elementary_svn.bb
+++ b/packages/efl1/elementary_svn.bb
@@ -2,16 +2,17 @@ DESCRIPTION = "EFL based widget set for mobile devices"
 LICENSE = "LGPL"
 DEPENDS = "evas ecore edje eet edbus"
 PV = "0.0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 inherit efl
 
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary;proto=http"
 S = "${WORKDIR}/elementary"
-PACKAGES =+ "${PN}-tests"
 
-RDEPENDS = "elementary-themes"
-RRECOMMENDS = "elementary-tests"
+RDEPENDS_${PN} = "elementary-themes"
+RRECOMMENDS_${PN} = "elementary-tests"
 
 do_compile_append() {
         sed -i -e s:${STAGING_DIR_TARGET}::g \
diff --git a/packages/ezx/ezx-gen-blob/gen-blob b/packages/ezx/ezx-gen-blob/gen-blob
deleted file mode 100644
index 1131a211ca..0000000000
--- a/packages/ezx/ezx-gen-blob/gen-blob
+++ /dev/null
diff --git a/packages/ezx/ezx-gen-blob_20080707.bb b/packages/ezx/ezx-gen-blob_20080707.bb
deleted file mode 100644
index 50fcd8b105..0000000000
--- a/packages/ezx/ezx-gen-blob_20080707.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Generic Blob [Bootloader] for the Motorola EZX platform"
-SECTION = "bootloaders"
-AUTHOR = "Daniel Riberio"
-HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PROVIDES = "virtual/bootloader"
-
-SRC_URI = "file://gen-blob"
-S = "${WORKDIR}"
-
-do_deploy() {
-	dd if=${WORKDIR}/gen-blob bs=1k seek=2 conv=sync of=${WORKDIR}/gen-blob-a1200
-
-	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 gen-blob ${DEPLOY_DIR_IMAGE}/gen-blob-for-1stgen.${SRCDATE}
-	install -m 0644 gen-blob-a1200 ${DEPLOY_DIR_IMAGE}/gen-blob-for-2ndgen.${SRCDATE}
-}
-
-do_install() {
-	dd if=${WORKDIR}/gen-blob bs=1k seek=2 conv=sync of=${WORKDIR}/gen-blob-a1200
-
-	install -d ${D}/${datadir}/openezx
-	install -m 0644 gen-blob ${D}${datadir}/openezx/gen-blob-for-1stgen.${SRCDATE}
-	install -m 0644 gen-blob-a1200 ${D}${datadir}/openezx/gen-blob-for-2ndgen.${SRCDATE}
-}
-
-addtask deploy before do_build after do_compile
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "${datadir}"
-
diff --git a/packages/ezx/ezx-gen-blob_svn.bb b/packages/ezx/ezx-gen-blob_svn.bb
index fb0def2c20..add64e16ed 100644
--- a/packages/ezx/ezx-gen-blob_svn.bb
+++ b/packages/ezx/ezx-gen-blob_svn.bb
@@ -1,37 +1,39 @@
 DESCRIPTION = "Generic Blob [Bootloader] for the Motorola EZX platform"
 SECTION = "bootloaders"
-AUTHOR = "Daniel Riberio"
+AUTHOR = "OpenEZX Team"
 HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob"
-PRIORITY = "optional"
 LICENSE = "GPL"
 PROVIDES = "virtual/bootloader"
-PV = "0.1.0+${SRCREV}"
+DEPENDS = "openezx-kernel"
+PV = "1.0.0+${SRCREV}"
 PR = "r0"
 
-DEFAULT_PREFERENCE = "-1"
+SRC_URI = "\
+  svn://svn.openezx.org/trunk/src/blob/;module=gen-blob;proto=