merge of 25f8c526f6726d19c4ef8cfc766c7666c58c3c4c

     and 3c94be02c338e9f42138bc4421a6de729400db41

8 files changed, 12 insertions, 58 deletions

diff --git a/packages/meta/meta-opie-dynamic.bb b/packages/meta/meta-opie-dynamic.bb
deleted file mode 100644
index a1a2bb262d..0000000000
--- a/packages/meta/meta-opie-dynamic.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-BROKEN = 1
-#
-# FIXME:
-# we need to get the necessary support from the OE infrastructure
-# to allow the dynamic package to work
-#
-DESCRIPTION = "Meta-package for Opie"
-
-def opie_packages(d):
-	import bb, os
-	files = os.listdir( bb.data.getVar( "TOPDIR", d, True ) )
-	pkgs = [ f for f in files if f.startswith( "opie-" ) and f != "opie-3rdparty" ]
-        return " ".join( pkgs )
-
-OPIE_PACKAGES := "${@opie_packages(d)}"
-
-DEPENDS = "qte libqpe-opie libopie2 manufacturers ${OPIE_PACKAGES}"
-
-LICENSE = MIT
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 6672dd7a18..065a109251 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Opie and QPE"
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
-PR = "r24"
+PR = "r25"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
@@ -273,7 +273,6 @@ opie-mediaplayer2-skin-default \
 opie-mediaplayer2-skin-default-landscape \
 opie-mediaplayer2-skin-pod \
 opie-mediaplayer2-skin-techno \
-opie-mediaplayer2-divx \
 opie-powerchord \
 opie-recorder \
 opie-tonleiter \
diff --git a/packages/mtd/mtd-utils-native_20050715.bb b/packages/mtd/mtd-utils-native_20050801.bb
index cd1fb7d11b..cd1fb7d11b 100644
--- a/packages/mtd/mtd-utils-native_20050715.bb
+++ b/packages/mtd/mtd-utils-native_20050801.bb
diff --git a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
index b63868cbb2..3ac41280bb 100644
--- a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
+++ b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
@@ -1,10 +1,10 @@
 
 #
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+# Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
---- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2	2004-11-27 00:00:13.000000000 +0100
-+++ mtd/util/mkfs.jffs2.c	2005-01-31 22:52:33.830141174 +0100
+--- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch
++++ mtd/util/mkfs.jffs2.c
 @@ -92,7 +92,12 @@
  	struct filesystem_entry *files;	/* Only relevant to directories */
  };
diff --git a/packages/mtd/mtd-utils/more-verbosity.patch b/packages/mtd/mtd-utils/more-verbosity.patch
index 25b98d35bb..cdc842a8f9 100644
--- a/packages/mtd/mtd-utils/more-verbosity.patch
+++ b/packages/mtd/mtd-utils/more-verbosity.patch
@@ -1,10 +1,10 @@
 
 #
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+# Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
---- mtd/util/mkfs.jffs2.c~add-progress	2005-01-31 22:55:34.662944000 +0100
-+++ mtd/util/mkfs.jffs2.c	2005-01-31 23:45:50.604511261 +0100
+--- mtd/util/mkfs.jffs2.c~more-verbosity.patch
++++ mtd/util/mkfs.jffs2.c
 @@ -374,6 +374,9 @@
  	struct filesystem_entry *entry;
  	struct ignorepath_entry* element = ignorepath;
diff --git a/packages/mtd/mtd-utils/removelinuxinc.patch b/packages/mtd/mtd-utils/removelinuxinc.patch
deleted file mode 100644
index 984d1af514..0000000000
--- a/packages/mtd/mtd-utils/removelinuxinc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN mtd.orig/fs/jffs2/compr_rtime.c mtd/fs/jffs2/compr_rtime.c
---- mtd.orig/fs/jffs2/compr_rtime.c	2004-04-02 20:36:01.000000000 -0500
-+++ mtd/fs/jffs2/compr_rtime.c	2004-04-02 20:35:37.000000000 -0500
-@@ -21,11 +21,7 @@
-  *
-  */
- 
--#include <linux/kernel.h>
--#include <linux/types.h>
--#include <linux/errno.h>
--#include <linux/string.h> 
--
-+#include <string.h> 
- #include <stdint.h>
- 
- /* _compress returns the compressed size, -1 if bigger */
diff --git a/packages/mtd/mtd-utils/stdint.patch b/packages/mtd/mtd-utils/stdint.patch
deleted file mode 100644
index ba171fcfde..0000000000
--- a/packages/mtd/mtd-utils/stdint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fs/jffs2/compr_rtime.c	2004-04-01 00:07:53.000000000 +0100
-+++ fs/jffs2/compr_rtime.c	2004-04-01 00:07:53.000000000 +0100
-@@ -26,6 +26,8 @@
- #include <linux/errno.h>
- #include <linux/string.h> 
- 
-+#include <stdint.h>
-+
- /* _compress returns the compressed size, -1 if bigger */
- int jffs2_rtime_compress(unsigned char *data_in, unsigned char *cpage_out, 
- 		   uint32_t *sourcelen, uint32_t *dstlen)
diff --git a/packages/mtd/mtd-utils_20050715.bb b/packages/mtd/mtd-utils_20050801.bb
index 6b457d52d7..bfc78c19ea 100644
--- a/packages/mtd/mtd-utils_20050715.bb
+++ b/packages/mtd/mtd-utils_20050801.bb
@@ -3,10 +3,7 @@ SECTION = "base"
 DEPENDS = "zlib"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
-	     mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
-	     flashcp nandwrite jffs2dump"
-PR = "r2"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2 \
            file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \
@@ -26,6 +23,10 @@ do_stage () {
 	done
 }
 
+mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+             mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
+             flashcp nandwrite jffs2dump"
+
 do_install () {
 	install -d ${D}${bindir}
 	for binary in ${mtd_utils}; do