summaryrefslogtreecommitdiff
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
parent167052a8c5cc9cfd822c748eec5cd5d61e9f92ea (diff)
downloadopenembedded-core-71cb5a569d82ec2e3451d408df95175b269ec4a8.tar.gz
openembedded-core-71cb5a569d82ec2e3451d408df95175b269ec4a8.tar.bz2
openembedded-core-71cb5a569d82ec2e3451d408df95175b269ec4a8.tar.xz
openembedded-core-71cb5a569d82ec2e3451d408df95175b269ec4a8.zip
mtd-utils: update to newer snapshot
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4469 311d38ba-8fff-0310-9ca6-ca027cbcb966
-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 2789fcc53..555565449 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 @@
char *compr_name = NULL;
int compr_prior = -1;
int warn_page_size = 0;
-+ struct ignorepath_entry* element = ignorepath;
-
- jffs2_compressors_init();
++ struct ignorepath_entry* element = ignorepath;
page_size = sysconf(_SC_PAGESIZE);
if (page_size < 0) /* System doesn't know so ... */
@@ -91,9 +89,11 @@
if (page_size != 4096)
warn_page_size = 1; /* warn user if page size not 4096 */
+ jffs2_compressors_init();
+
while ((opt = getopt_long(argc, argv,
- "D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
-+ "D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
++ "D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
{
switch (opt) {
case 'D':
diff --git a/meta/packages/mtd/mtd-utils/remove-ubi.patch b/meta/packages/mtd/mtd-utils/remove-ubi.patch
index a788fd0fd..4928db00b 100644
--- a/meta/packages/mtd/mtd-utils/remove-ubi.patch
+++ b/meta/packages/mtd/mtd-utils/remove-ubi.patch
@@ -29,5 +29,5 @@
mkdir -p ${DESTDIR}/${SBINDIR}
install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/
mkdir -p ${DESTDIR}/${MANDIR}/man1
- gzip -c mkfs.jffs2.1 > ${DESTDIR}/${MANDIR}/man1/mkfs.jffs2.1.gz
+ gzip -9c mkfs.jffs2.1 > ${DESTDIR}/${MANDIR}/man1/mkfs.jffs2.1.gz
- 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 ce1477ee7..2281a8096 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"
HOMEPAGE = "http://www.linux-mtd.infradead.org/"
LICENSE = "GPLv2"
-SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=e6088d987c545d60a86e1f44836ab8ba072fffd9 \
+SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=d9f463a49600b60f313a94d8765da261aabf867a \
file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
file://remove-ubi.patch;patch=1 \
file://fix-ignoreerrors-git.patch;patch=1"