Changeset 47790


Ignore:
Timestamp:
2015-12-05T16:44:58+01:00 (2 years ago)
Author:
hauke
Message:

update mtd-utils to 1.5.2

Signed-off-by: Sven Roederer <devel-sven@…>
[use the final version of 1.5.2 instead, fix header of jffs2_lzma_(de,)compress()]
Signed-off-by: Hauke Mehrtens <hauke@…>

Location:
trunk/tools/mtd-utils
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/mtd-utils/Makefile

    r47010 r47790  
    88 
    99PKG_NAME:=mtd-utils 
    10 PKG_VERSION:=1.5.1 
     10PKG_VERSION:=1.5.2 
    1111 
    12 PKG_SOURCE_VERSION:=92686f212c9a4e16891c6a3c57629cbf4f0f8360 
     12PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1 
    1313PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz 
    1414PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git 
    1515PKG_SOURCE_PROTO:=git 
    1616PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 
    17 PKG_MIRROR_MD5SUM:=9fe0518213feddacd1842935dddeb6c8 
     17PKG_MIRROR_MD5SUM:= 
    1818PKG_CAT:=zcat 
    1919 
  • trunk/tools/mtd-utils/patches/110-portability.patch

    r45760 r47790  
    151151 #include "version.h" 
    152152  
    153 @@ -117,11 +116,6 @@ extern "C" { 
    154         fprintf(stderr, "%s: warning!: " fmt "\n", PROGRAM_NAME, ##__VA_ARGS__); \ 
    155  } while(0) 
    156   
    157 -#if defined(__UCLIBC__) 
    158 -/* uClibc versions before 0.9.34 don't have rpmatch() */ 
    159 -#if __UCLIBC_MAJOR__ == 0 && \ 
    160 -               (__UCLIBC_MINOR__ < 9 || \ 
    161 -               (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34)) 
    162  #undef rpmatch 
    163  #define rpmatch __rpmatch 
    164  static inline int __rpmatch(const char *resp) 
    165 @@ -129,8 +123,6 @@ static inline int __rpmatch(const char * 
    166      return (resp[0] == 'y' || resp[0] == 'Y') ? 1 : 
    167         (resp[0] == 'n' || resp[0] == 'N') ? 0 : -1; 
    168  } 
    169 -#endif 
    170 -#endif 
    171   
    172  /** 
    173   * prompt the user for confirmation 
    174153--- a/include/mtd/ubifs-media.h 
    175154+++ b/include/mtd/ubifs-media.h 
  • trunk/tools/mtd-utils/patches/130-lzma_jffs2.patch

    r45760 r47790  
    22+++ b/Makefile 
    33@@ -4,6 +4,7 @@ 
    4  VERSION = 1.5.1 
     4 VERSION = 1.5.2 
    55  
    66 CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS) 
     
    124124+ 
    125125+STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out, 
    126 +                             uint32_t *sourcelen, uint32_t *dstlen, void *model) 
     126+                             uint32_t *sourcelen, uint32_t *dstlen) 
    127127+{ 
    128128+       SizeT compress_size = (SizeT)(*dstlen); 
     
    149149+ 
    150150+STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out, 
    151 +                                uint32_t srclen, uint32_t destlen, void *model) 
     151+                                uint32_t srclen, uint32_t destlen) 
    152152+{ 
    153153+       int ret; 
  • trunk/tools/mtd-utils/patches/136-mkfs.ubifs-xz-support.patch

    r45760 r47790  
    22+++ b/Makefile 
    33@@ -4,7 +4,7 @@ 
    4  VERSION = 1.5.1 
     4 VERSION = 1.5.2 
    55  
    66 CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS) 
Note: See TracChangeset for help on using the changeset viewer.