From patchwork Tue Nov 10 21:52:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Roederer X-Patchwork-Id: 542630 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 470A3140D8F for ; Wed, 11 Nov 2015 08:53:08 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1F5F328BFBA; Tue, 10 Nov 2015 22:51:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 670A228BEA5 for ; Tue, 10 Nov 2015 22:50:53 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_FROM_MX=-3.1; rate: -7.6 Received: from mail.geroedel.de (settle.geroedel.de [91.143.80.133]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 10 Nov 2015 22:50:50 +0100 (CET) Received: from backuphost ([192.168.15.2] helo=feeble.bln.roederer.dhs.org) by mail.geroedel.de with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZwGqF-0006Hx-Pv for openwrt-devel@lists.openwrt.org; Tue, 10 Nov 2015 22:52:43 +0100 Received: from strike.bln.roederer.dhs.org ([2001:6f8:115c:80:16da:e9ff:feee:6621] helo=strike.localnet) by feeble.bln.roederer.dhs.org with esmtp (Exim 4.80) (envelope-from ) id 1ZwGqF-0005SJ-5Y for openwrt-devel@lists.openwrt.org; Tue, 10 Nov 2015 22:52:39 +0100 From: Sven Roederer To: 'OpenWrt Development List' Date: Tue, 10 Nov 2015 22:52:38 +0100 Message-ID: <3190506.7XWsd81730@strike> User-Agent: KMail/4.14.1 (Linux/3.16.0-44-generic; KDE/4.14.1; x86_64; ; ) MIME-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.15.2 X-SA-Exim-Mail-From: devel-sven@geroedel.de X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mail.geroedel.de) Subject: [OpenWrt-Devel] [PATCH] update mtd-utils to 1.5.2 and fix build X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" - update mtd-utils to 1.5.2 (git a494d30ab1ae40cb7665680cadf5af3ca3830a73) - remove patches that came upstream - fixes build from scratch as of broken patches Signed-off-by: Sven Roederer diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile index b4c9c66..660f06d 100644 --- a/tools/mtd-utils/Makefile +++ b/tools/mtd-utils/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtd-utils -PKG_VERSION:=1.5.1 +PKG_VERSION:=1.5.2 -PKG_SOURCE_VERSION:=92686f212c9a4e16891c6a3c57629cbf4f0f8360 +PKG_SOURCE_VERSION:=a494d30ab1ae40cb7665680cadf5af3ca3830a73 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_MIRROR_MD5SUM:=9fe0518213feddacd1842935dddeb6c8 +PKG_MIRROR_MD5SUM:=0785919dc5888e9397a8bb77e7e0e19c PKG_CAT:=zcat HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/tools/mtd-utils/patches/110-portability.patch b/tools/mtd- utils/patches/110-portability.patch index 4ad209a..c4cdab9 100644 --- a/tools/mtd-utils/patches/110-portability.patch +++ b/tools/mtd-utils/patches/110-portability.patch @@ -150,27 +150,6 @@ #include #include "version.h" -@@ -117,11 +116,6 @@ extern "C" { - fprintf(stderr, "%s: warning!: " fmt "\n", PROGRAM_NAME, ##__VA_ARGS__); \ - } while(0) - --#if defined(__UCLIBC__) --/* uClibc versions before 0.9.34 don't have rpmatch() */ --#if __UCLIBC_MAJOR__ == 0 && \ -- (__UCLIBC_MINOR__ < 9 || \ -- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34)) - #undef rpmatch - #define rpmatch __rpmatch - static inline int __rpmatch(const char *resp) -@@ -129,8 +123,6 @@ static inline int __rpmatch(const char * - return (resp[0] == 'y' || resp[0] == 'Y') ? 1 : - (resp[0] == 'n' || resp[0] == 'N') ? 0 : -1; - } --#endif --#endif - - /** - * prompt the user for confirmation --- a/include/mtd/ubifs-media.h +++ b/include/mtd/ubifs-media.h @@ -33,7 +33,15 @@ diff --git a/tools/mtd-utils/patches/137-no_extern_inline.patch b/tools/mtd- utils/patches/137-no_extern_inline.patch deleted file mode 100644 index d871d67..0000000 --- a/tools/mtd-utils/patches/137-no_extern_inline.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/mkfs.ubifs/hashtable/hashtable_itr.c -+++ b/mkfs.ubifs/hashtable/hashtable_itr.c -@@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h) - } - - /*****************************************************************************/ --/* key - return the key of the (key,value) pair at the current position */ --/* value - return the value of the (key,value) pair at the current position */ -- --void * --hashtable_iterator_key(struct hashtable_itr *i) --{ return i->e->k; } -- --void * --hashtable_iterator_value(struct hashtable_itr *i) --{ return i->e->v; } -- --/*****************************************************************************/ - /* advance - advance the iterator to the next element - * returns zero if advanced to end of table */ - ---- a/mkfs.ubifs/hashtable/hashtable_itr.h -+++ b/mkfs.ubifs/hashtable/hashtable_itr.h -@@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h); - /* hashtable_iterator_key - * - return the value of the (key,value) pair at the current position */ - --extern inline void * -+static inline void * - hashtable_iterator_key(struct hashtable_itr *i) - { - return i->e->k; -@@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_ - /*****************************************************************************/ - /* value - return the value of the (key,value) pair at the current position */ - --extern inline void * -+static inline void * - hashtable_iterator_value(struct hashtable_itr *i) - { - return i->e->v; diff --git a/tools/mtd-utils/patches/300- libfec_use_standard_unsigned_long.patch b/tools/mtd-utils/patches/300- libfec_use_standard_unsigned_long.patch deleted file mode 100644 index 73a68b5..0000000 --- a/tools/mtd-utils/patches/300-libfec_use_standard_unsigned_long.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/lib/libfec.c -+++ b/lib/libfec.c -@@ -61,8 +61,6 @@ struct timeval { - }; - #define gettimeofday(x, dummy) { (x)->ticks = clock() ; } - #define DIFF_T(a,b) (1+ 1000000*(a.ticks - b.ticks) / CLOCKS_PER_SEC ) --typedef unsigned long u_long ; --typedef unsigned short u_short ; - #else /* typically, unix systems */ - #include - #define DIFF_T(a,b) \ -@@ -75,12 +73,12 @@ typedef unsigned short u_short ; - t = x.tv_usec + 1000000* (x.tv_sec & 0xff ) ; \ - } - #define TOCK(t) \ -- { u_long t1 ; TICK(t1) ; \ -+ { unsigned long t1 ; TICK(t1) ; \ - if (t1 < t) t = 256000000 + t1 - t ; \ - else t = t1 - t ; \ - if (t == 0) t = 1 ;} - --u_long ticks[10]; /* vars for timekeeping */ -+unsigned long ticks[10]; /* vars for timekeeping */ - #else - #define DEB(x) - #define DDB(x) -@@ -625,7 +623,7 @@ init_fec(void) - #define FEC_MAGIC 0xFECC0DEC - - struct fec_parms { -- u_long magic ; -+ unsigned long magic ; - int k, n ; /* parameters of the code */ - gf *enc_matrix ; - } ;