From 71cb5a569d82ec2e3451d408df95175b269ec4a8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 14 May 2008 11:05:37 +0000 Subject: [PATCH] mtd-utils: update to newer snapshot git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4469 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch | 8 ++++---- meta/packages/mtd/mtd-utils/remove-ubi.patch | 2 +- meta/packages/mtd/mtd-utils_1.1.0+git.bb | 2 +- 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 @@ 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 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 @@ 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 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" 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"