kernel: Added required dependencies for socket match.

[openwrt/openwrt.git] / tools / mtd-utils / Makefile

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 9a639fea411a2a0ea6aa6537c1a8fb7febb5365c..ff000b99e3ab05aeee77ac99eb0b93b687da2310 100644 (file)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,53 +7,41 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd-utils
-PKG_VERSION:=1.4.5
+PKG_VERSION:=2.0.2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5319b84974fcb71504aed2d1b8285e9c0a4a4bb8
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_CAT:=zcat
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/mtd-utils/
+PKG_HASH:=fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
-CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT
 ifneq ($(HOST_OS),Linux)
-CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h -I$(CURDIR)/include -include fls.h
+  HOST_CFLAGS += \
+       -I$(CURDIR)/include \
+       -Dloff_t=off_t \
+       -D__BYTE_ORDER=BYTE_ORDER \
+       -include endian.h \
+       -DNO_NATIVE_SUPPORT \
+       -include fls.h
 endif
 
-MTD_MAKEOPTS = \
-       CFLAGS="$(CFLAGS)" \
-       LDFLAGS="$(HOST_LDFLAGS) -static" \
-       WITHOUT_LZO=1 WITHOUT_XATTR=1 \
-       LZMA_STATIC_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
-       SUBDIRS="" \
-       BUILDDIR="$(HOST_BUILD_DIR)"
+HOST_CONFIGURE_VARS+= \
+       UUID_CFLAGS="-I$(STAGING_DIR_HOST)/include/e2fsprogs/uuid"
 
-define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR)/lib \
-               $(MTD_MAKEOPTS) \
-               TARGETS="libmtd.a libcrc32.a" \
-               LIBS="libmtd libcrc32"
-       $(MAKE) -C $(HOST_BUILD_DIR) \
-               $(MTD_MAKEOPTS) \
-               TARGETS=mkfs.jffs2
-       $(MAKE) -C $(HOST_BUILD_DIR)/ubi-utils \
-               $(MTD_MAKEOPTS) \
-               TARGETS=ubinize
-       $(MAKE) -C $(HOST_BUILD_DIR)/mkfs.ubifs \
-               $(MTD_MAKEOPTS) \
-               BUILDDIR="$(HOST_BUILD_DIR)/mkfs.ubifs"
-endef
+HOST_CONFIGURE_ARGS+= \
+       --disable-tests \
+       --without-xattr \
+       --without-lzo
+
+HOST_MAKE_FLAGS += \
+       PROGRAMS="mkfs.jffs2 ubinize mkfs.ubifs"
 
 define Host/Install
        $(CP) \
                $(HOST_BUILD_DIR)/mkfs.jffs2 \
-               $(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
+               $(HOST_BUILD_DIR)/mkfs.ubifs \
                $(HOST_BUILD_DIR)/ubinize \
                $(STAGING_DIR_HOST)/bin/
 endef