From 0064878fc602368bb630c48a8affac3b3d2b654d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 16 Aug 2005 22:01:19 +0000 Subject: upgrade mtd-utils to a newer snapshot; remove some obsolete patches --- packages/mtd/mtd-utils-native_20050715.bb | 12 -------- packages/mtd/mtd-utils-native_20050801.bb | 12 ++++++++ .../mtd-utils/add-exclusion-to-mkfs-jffs2.patch | 6 ++-- packages/mtd/mtd-utils/more-verbosity.patch | 6 ++-- packages/mtd/mtd-utils/removelinuxinc.patch | 16 ---------- packages/mtd/mtd-utils/stdint.patch | 11 ------- packages/mtd/mtd-utils_20050715.bb | 34 --------------------- packages/mtd/mtd-utils_20050801.bb | 35 ++++++++++++++++++++++ 8 files changed, 53 insertions(+), 79 deletions(-) delete mode 100644 packages/mtd/mtd-utils-native_20050715.bb create mode 100644 packages/mtd/mtd-utils-native_20050801.bb delete mode 100644 packages/mtd/mtd-utils/removelinuxinc.patch delete mode 100644 packages/mtd/mtd-utils/stdint.patch delete mode 100644 packages/mtd/mtd-utils_20050715.bb create mode 100644 packages/mtd/mtd-utils_20050801.bb diff --git a/packages/mtd/mtd-utils-native_20050715.bb b/packages/mtd/mtd-utils-native_20050715.bb deleted file mode 100644 index cd1fb7d11b..0000000000 --- a/packages/mtd/mtd-utils-native_20050715.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv2" -SECTION = "base" -include mtd-utils_${PV}.bb -inherit native -DEPENDS = "zlib-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils" - -do_stage () { - for binary in ${mtd_utils}; do - install -m 0755 util/$binary ${STAGING_BINDIR}/ - done -} diff --git a/packages/mtd/mtd-utils-native_20050801.bb b/packages/mtd/mtd-utils-native_20050801.bb new file mode 100644 index 0000000000..cd1fb7d11b --- /dev/null +++ b/packages/mtd/mtd-utils-native_20050801.bb @@ -0,0 +1,12 @@ +LICENSE = "GPLv2" +SECTION = "base" +include mtd-utils_${PV}.bb +inherit native +DEPENDS = "zlib-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils" + +do_stage () { + for binary in ${mtd_utils}; do + install -m 0755 util/$binary ${STAGING_BINDIR}/ + done +} 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 --#include --#include --#include -- -+#include - #include - - /* _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 - #include - -+#include -+ - /* _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_20050715.bb deleted file mode 100644 index 6b457d52d7..0000000000 --- a/packages/mtd/mtd-utils_20050715.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Tools for managing memory technology devices." -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" - -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 \ - file://more-verbosity.patch;patch=1" -S = "${WORKDIR}/mtd/" - -CFLAGS_prepend = "-I${S}/include " - -do_compile () { - oe_runmake -C util ${mtd_utils} -} - -do_stage () { - install -d ${STAGING_INCDIR}/mtd - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${STAGING_INCDIR}/mtd/ - done -} - -do_install () { - install -d ${D}${bindir} - for binary in ${mtd_utils}; do - install -m 0755 util/$binary ${D}${bindir} - done -} diff --git a/packages/mtd/mtd-utils_20050801.bb b/packages/mtd/mtd-utils_20050801.bb new file mode 100644 index 0000000000..bfc78c19ea --- /dev/null +++ b/packages/mtd/mtd-utils_20050801.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Tools for managing memory technology devices." +SECTION = "base" +DEPENDS = "zlib" +HOMEPAGE = "http://www.linux-mtd.infradead.org/" +LICENSE = "GPLv2" +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 \ + file://more-verbosity.patch;patch=1" +S = "${WORKDIR}/mtd/" + +CFLAGS_prepend = "-I${S}/include " + +do_compile () { + oe_runmake -C util ${mtd_utils} +} + +do_stage () { + install -d ${STAGING_INCDIR}/mtd + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${STAGING_INCDIR}/mtd/ + 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 + install -m 0755 util/$binary ${D}${bindir} + done +} -- cgit v1.2.3