aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Dietze <mdietze@gmail.com>2013-03-01 23:29:19 +0100
committerMartin Dietze <mdietze@gmail.com>2013-03-02 17:27:30 +0100
commit889579dc45ac2e62b4e41e1508dc96b074bf082d (patch)
treebc74b71685e30f4a3707b9100e750075c1bb7c72
parentb01a466d2bbe58e255229d214794b30674ebe579 (diff)
downloadopenembedded-889579dc45ac2e62b4e41e1508dc96b074bf082d.zip
openembedded-889579dc45ac2e62b4e41e1508dc96b074bf082d.tar.gz
openembedded-889579dc45ac2e62b4e41e1508dc96b074bf082d.tar.bz2
mtd-utils: re-added older version 20041113 for nylon
-rw-r--r--conf/distro/nylon.conf5
-rw-r--r--recipes/mtd/mtd-utils-native_0.0.0+cvs20041113.bb2
-rw-r--r--recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20041113.patch111
-rw-r--r--recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch107
-rw-r--r--recipes/mtd/mtd-utils/removelinuxinc.patch16
-rw-r--r--recipes/mtd/mtd-utils/stdint.patch11
-rw-r--r--recipes/mtd/mtd-utils/target-endian.patch11
-rw-r--r--recipes/mtd/mtd-utils_0.0.0+cvs20041113.bb37
8 files changed, 299 insertions, 1 deletions
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index ae2f28d..7b053ca 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -37,7 +37,10 @@ PREFERRED_VERSION_glibc = "2.3.3"
PREFERRED_VERSION_glibc-initial = "2.3.2"
PREFERRED_VERSION_shorewall = "2.0.9-monolithic"
PREFERRED_VERSION_ppp-dsl = "0.1-monolithic"
-PREFERRED_VERSION_mtd-utils = "1.0.0+git"
+PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20041113"
+PREFERRED_VERSION_mtd-utils-native = "1.0.0+git"
+# FIXME: there is no download URL anymore for the sources
+# PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20060223"
PREFERRED_VERSION_kismet = "2005-01-R1"
PREFERRED_VERSION_automake-native = "1.10.2"
diff --git a/recipes/mtd/mtd-utils-native_0.0.0+cvs20041113.bb b/recipes/mtd/mtd-utils-native_0.0.0+cvs20041113.bb
new file mode 100644
index 0000000..6f9d71e
--- /dev/null
+++ b/recipes/mtd/mtd-utils-native_0.0.0+cvs20041113.bb
@@ -0,0 +1,2 @@
+require mtd-utils_${PV}.bb
+require mtd-utils-native.inc
diff --git a/recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20041113.patch b/recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20041113.patch
new file mode 100644
index 0000000..b440ac8
--- /dev/null
+++ b/recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20041113.patch
@@ -0,0 +1,111 @@
+-- packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20041113.patch bca43dc8d675cfc41d5fe5538ee3a3e98424d119
+++ packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20041113.patch bca43dc8d675cfc41d5fe5538ee3a3e98424d119
+@ -0,0 +1,107 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch
++++ mtd/util/mkfs.jffs2.c
+@@ -89,7 +89,12 @@
+ struct filesystem_entry *files; /* Only relevant to directories */
+ };
+
++struct ignorepath_entry {
++ struct ignorepath_entry* next; /* Points to the next ignorepath element */
++ char name[PATH_MAX]; /* Name of the entry */
++};
+
++static struct ignorepath_entry* ignorepath = 0;
+ static int out_fd = -1;
+ static char default_rootdir[] = ".";
+ static char *rootdir = default_rootdir;
+@@ -363,6 +368,7 @@
+ char *hpath, *tpath;
+ struct dirent *dp, **namelist;
+ struct filesystem_entry *entry;
++ struct ignorepath_entry* element = ignorepath;
+
+
+ if (lstat(hostpath, &sb)) {
+@@ -372,6 +378,15 @@
+ entry = add_host_filesystem_entry(targetpath, hostpath,
+ sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
+
++ while ( element ) {
++ if ( strcmp( element->name, hostpath ) == 0 ) {
++ printf( "Note: ignoring directories below '%s'\n", hostpath );
++ return entry;
++ break;
++ }
++ element = element->next;
++ }
++
+ n = scandir(hostpath, &namelist, 0, alphasort);
+ if (n < 0) {
+ perror_msg_and_die("opening directory %s", hostpath);
+@@ -1139,6 +1154,7 @@
+ {"root", 1, NULL, 'r'},
+ {"pagesize", 1, NULL, 's'},
+ {"eraseblock", 1, NULL, 'e'},
++ {"ignore", 1, NULL, 'i'},
+ {"output", 1, NULL, 'o'},
+ {"help", 0, NULL, 'h'},
+ {"verbose", 0, NULL, 'v'},
+@@ -1180,6 +1196,7 @@
+ " -L, --list-compressors Show the list of the avaiable compressors\n"
+ " -t, --test-compression Call decompress and compare with the original (for test)\n"
+ " -n, --no-cleanmarkers Don't add a cleanmarker to every eraseblock\n"
++ " -i, --ignore=PATH Ignore sub directory and file tree below PATH when recursing over the file system\n"
+ " -o, --output=FILE Output to FILE (default: stdout)\n"
+ " -l, --little-endian Create a little-endian filesystem\n"
+ " -b, --big-endian Create a big-endian filesystem\n"
+@@ -1202,13 +1219,14 @@
+ struct stat sb;
+ FILE *devtable = NULL;
+ struct filesystem_entry *root;
+- char *compr_name = NULL;
+- int compr_prior = -1;
++ char *compr_name = NULL;
++ int compr_prior = -1;
++ struct ignorepath_entry* element = ignorepath;
+
+- jffs2_compressors_init();
++ jffs2_compressors_init();
+
+ while ((opt = getopt_long(argc, argv,
+- "D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:", long_options, &c)) >= 0)
++ "D:d:r:s:i:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:", long_options, &c)) >= 0)
+ {
+ switch (opt) {
+ case 'D':
+@@ -1231,6 +1249,27 @@
+ page_size = strtol(optarg, NULL, 0);
+ break;
+
++ case 'i':
++ printf( "Note: Adding '%s' to ignore Path\n", optarg );
++ if ( !ignorepath ) {
++ ignorepath = xmalloc( sizeof( struct ignorepath_entry ) );
++ ignorepath->next = 0;
++ strcpy( &ignorepath->name[0], optarg );
++ } else {
++ while ( element->next ) element = element->next;
++ element->next = xmalloc( sizeof( struct ignorepath_entry ) );
++ element->next->next = 0;
++ strcpy( &element->next->name[0], optarg );
++ }
++ printf( "--------- Dumping ignore path list ----------------\n" );
++ element=ignorepath;
++ while ( element ) {
++ printf( " * '%s'\n", &element->name[0] );
++ element = element->next;
++ }
++ printf( "---------------------------------------------------\n" );
++ break;
++
+ case 'o':
+ if (out_fd != -1) {
+ error_msg_and_die("output filename specified more than once");
+
diff --git a/recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch b/recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
new file mode 100644
index 0000000..cb819e1
--- /dev/null
+++ b/recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
@@ -0,0 +1,107 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch
++++ mtd/util/mkfs.jffs2.c
+@@ -89,7 +89,12 @@
+ struct filesystem_entry *files; /* Only relevant to directories */
+ };
+
++struct ignorepath_entry {
++ struct ignorepath_entry* next; /* Points to the next ignorepath element */
++ char name[PATH_MAX]; /* Name of the entry */
++};
+
++static struct ignorepath_entry* ignorepath = 0;
+ static int out_fd = -1;
+ static char default_rootdir[] = ".";
+ static char *rootdir = default_rootdir;
+@@ -363,6 +368,7 @@
+ char *hpath, *tpath;
+ struct dirent *dp, **namelist;
+ struct filesystem_entry *entry;
++ struct ignorepath_entry* element = ignorepath;
+
+
+ if (lstat(hostpath, &sb)) {
+@@ -372,6 +378,15 @@
+ entry = add_host_filesystem_entry(targetpath, hostpath,
+ sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
+
++ while ( element ) {
++ if ( strcmp( element->name, hostpath ) == 0 ) {
++ printf( "Note: ignoring directories below '%s'\n", hostpath );
++ return entry;
++ break;
++ }
++ element = element->next;
++ }
++
+ n = scandir(hostpath, &namelist, 0, alphasort);
+ if (n < 0) {
+ perror_msg_and_die("opening directory %s", hostpath);
+@@ -1139,6 +1154,7 @@
+ {"root", 1, NULL, 'r'},
+ {"pagesize", 1, NULL, 's'},
+ {"eraseblock", 1, NULL, 'e'},
++ {"ignore", 1, NULL, 'i'},
+ {"output", 1, NULL, 'o'},
+ {"help", 0, NULL, 'h'},
+ {"verbose", 0, NULL, 'v'},
+@@ -1180,6 +1196,7 @@
+ " -L, --list-compressors Show the list of the avaiable compressors\n"
+ " -t, --test-compression Call decompress and compare with the original (for test)\n"
+ " -n, --no-cleanmarkers Don't add a cleanmarker to every eraseblock\n"
++ " -i, --ignore=PATH Ignore sub directory and file tree below PATH when recursing over the file system\n"
+ " -o, --output=FILE Output to FILE (default: stdout)\n"
+ " -l, --little-endian Create a little-endian filesystem\n"
+ " -b, --big-endian Create a big-endian filesystem\n"
+@@ -1202,13 +1219,14 @@
+ struct stat sb;
+ FILE *devtable = NULL;
+ struct filesystem_entry *root;
+- char *compr_name = NULL;
+- int compr_prior = -1;
++ char *compr_name = NULL;
++ int compr_prior = -1;
++ struct ignorepath_entry* element = ignorepath;
+
+- jffs2_compressors_init();
++ jffs2_compressors_init();
+
+ while ((opt = getopt_long(argc, argv,
+- "D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:", long_options, &c)) >= 0)
++ "D:d:r:s:i:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:", long_options, &c)) >= 0)
+ {
+ switch (opt) {
+ case 'D':
+@@ -1231,6 +1249,27 @@
+ page_size = strtol(optarg, NULL, 0);
+ break;
+
++ case 'i':
++ printf( "Note: Adding '%s' to ignore Path\n", optarg );
++ if ( !ignorepath ) {
++ ignorepath = xmalloc( sizeof( struct ignorepath_entry ) );
++ ignorepath->next = 0;
++ strcpy( &ignorepath->name[0], optarg );
++ } else {
++ while ( element->next ) element = element->next;
++ element->next = xmalloc( sizeof( struct ignorepath_entry ) );
++ element->next->next = 0;
++ strcpy( &element->next->name[0], optarg );
++ }
++ printf( "--------- Dumping ignore path list ----------------\n" );
++ element=ignorepath;
++ while ( element ) {
++ printf( " * '%s'\n", &element->name[0] );
++ element = element->next;
++ }
++ printf( "---------------------------------------------------\n" );
++ break;
++
+ case 'o':
+ if (out_fd != -1) {
+ error_msg_and_die("output filename specified more than once");
diff --git a/recipes/mtd/mtd-utils/removelinuxinc.patch b/recipes/mtd/mtd-utils/removelinuxinc.patch
new file mode 100644
index 0000000..984d1af
--- /dev/null
+++ b/recipes/mtd/mtd-utils/removelinuxinc.patch
@@ -0,0 +1,16 @@
+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/recipes/mtd/mtd-utils/stdint.patch b/recipes/mtd/mtd-utils/stdint.patch
new file mode 100644
index 0000000..ba171fc
--- /dev/null
+++ b/recipes/mtd/mtd-utils/stdint.patch
@@ -0,0 +1,11 @@
+--- 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/recipes/mtd/mtd-utils/target-endian.patch b/recipes/mtd/mtd-utils/target-endian.patch
new file mode 100644
index 0000000..567730c
--- /dev/null
+++ b/recipes/mtd/mtd-utils/target-endian.patch
@@ -0,0 +1,11 @@
+--- mtd/util/flash_eraseall.c 2004-09-12 00:00:13.000000000 +0200
++++ mtd-new/util/flash_eraseall.c 2005-08-16 11:36:46.262783496 +0200
+@@ -54,7 +54,7 @@
+ static void display_help (void);
+ static void display_version (void);
+ static struct jffs2_unknown_node cleanmarker;
+-static int target_endian = __BYTE_ORDER;
++int target_endian = __BYTE_ORDER;
+
+ int main (int argc, char *argv[])
+ {
diff --git a/recipes/mtd/mtd-utils_0.0.0+cvs20041113.bb b/recipes/mtd/mtd-utils_0.0.0+cvs20041113.bb
new file mode 100644
index 0000000..1c9bcfb
--- /dev/null
+++ b/recipes/mtd/mtd-utils_0.0.0+cvs20041113.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Tools for managing memory technology devices."
+SECTION = "base"
+DEPENDS = "zlib"
+HOMEPAGE = "http://www.linux-mtd.infradead.org/"
+LICENSE = "GPLv2"
+PR = "r2"
+SRCDATE = "20041113"
+
+SRC_URI = "http://www.the-little-red-haired-girl.org/pub/nylon/thirdparty/mtd-snapshot-20041113.tar.bz2 \
+ file://add-exclusion-to-mkfs-jffs2-20041113.patch;patch=1" \
+ file://target-endian.patch;patch=1"
+
+S = "${WORKDIR}/mtd"
+
+
+CFLAGS_prepend = "-I${S}/include "
+
+do_compile () {
+ oe_runmake -C util
+}
+
+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 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 -m 0755 util/$binary ${D}${bindir}
+ done
+}
+