summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-05-14 11:05:37 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-05-14 11:05:37 +0000
commit71cb5a569d82ec2e3451d408df95175b269ec4a8 (patch)
tree48d772d191aedaa59823803d6f7d3eb67e5f7641 /meta/packages
parent167052a8c5cc9cfd822c748eec5cd5d61e9f92ea (diff)
downloadpoky-71cb5a569d82ec2e3451d408df95175b269ec4a8.tar.gz
mtd-utils: update to newer snapshot
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4469 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch8
-rw-r--r--meta/packages/mtd/mtd-utils/remove-ubi.patch2
-rw-r--r--meta/packages/mtd/mtd-utils_1.1.0+git.bb2
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch b/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
index 2789fcc531..5555654490 100644
--- a/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
+++ b/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
@@ -81,9 +81,7 @@
81 char *compr_name = NULL; 81 char *compr_name = NULL;
82 int compr_prior = -1; 82 int compr_prior = -1;
83 int warn_page_size = 0; 83 int warn_page_size = 0;
84+ struct ignorepath_entry* element = ignorepath; 84+ struct ignorepath_entry* element = ignorepath;
85
86 jffs2_compressors_init();
87 85
88 page_size = sysconf(_SC_PAGESIZE); 86 page_size = sysconf(_SC_PAGESIZE);
89 if (page_size < 0) /* System doesn't know so ... */ 87 if (page_size < 0) /* System doesn't know so ... */
@@ -91,9 +89,11 @@
91 if (page_size != 4096) 89 if (page_size != 4096)
92 warn_page_size = 1; /* warn user if page size not 4096 */ 90 warn_page_size = 1; /* warn user if page size not 4096 */
93 91
92 jffs2_compressors_init();
93
94 while ((opt = getopt_long(argc, argv, 94 while ((opt = getopt_long(argc, argv,
95- "D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0) 95- "D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
96+ "D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0) 96+ "D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
97 { 97 {
98 switch (opt) { 98 switch (opt) {
99 case 'D': 99 case 'D':
diff --git a/meta/packages/mtd/mtd-utils/remove-ubi.patch b/meta/packages/mtd/mtd-utils/remove-ubi.patch
index a788fd0fd5..4928db00be 100644
--- a/meta/packages/mtd/mtd-utils/remove-ubi.patch
+++ b/meta/packages/mtd/mtd-utils/remove-ubi.patch
@@ -29,5 +29,5 @@
29 mkdir -p ${DESTDIR}/${SBINDIR} 29 mkdir -p ${DESTDIR}/${SBINDIR}
30 install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/ 30 install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/
31 mkdir -p ${DESTDIR}/${MANDIR}/man1 31 mkdir -p ${DESTDIR}/${MANDIR}/man1
32 gzip -c mkfs.jffs2.1 > ${DESTDIR}/${MANDIR}/man1/mkfs.jffs2.1.gz 32 gzip -9c mkfs.jffs2.1 > ${DESTDIR}/${MANDIR}/man1/mkfs.jffs2.1.gz
33- make -C $(BUILDDIR)/ubi-utils install 33- make -C $(BUILDDIR)/ubi-utils install
diff --git a/meta/packages/mtd/mtd-utils_1.1.0+git.bb b/meta/packages/mtd/mtd-utils_1.1.0+git.bb
index ce1477ee70..2281a80961 100644
--- a/meta/packages/mtd/mtd-utils_1.1.0+git.bb
+++ b/meta/packages/mtd/mtd-utils_1.1.0+git.bb
@@ -4,7 +4,7 @@ DEPENDS = "zlib lzo"
4HOMEPAGE = "http://www.linux-mtd.infradead.org/" 4HOMEPAGE = "http://www.linux-mtd.infradead.org/"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6 6
7SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=e6088d987c545d60a86e1f44836ab8ba072fffd9 \ 7SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=d9f463a49600b60f313a94d8765da261aabf867a \
8 file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ 8 file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
9 file://remove-ubi.patch;patch=1 \ 9 file://remove-ubi.patch;patch=1 \
10 file://fix-ignoreerrors-git.patch;patch=1" 10 file://fix-ignoreerrors-git.patch;patch=1"