wifi-scripts: add multi-radio config support

[openwrt/staging/nbd.git] / tools / e2fsprogs / Makefile

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index ffe1782eb130dd4e3799bf8b36a9575222eb8831..2c35adfa8f9b0784ab6629c3045e37cdddd45d53 100644 (file)
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -8,24 +8,29 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.43.3
-PKG_MD5SUM:=ec0cd4faac71b2fcf9f73733e4d50ead
-PKG_RELEASE:=1
+PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
+PKG_VERSION:=1.47.0
+PKG_HASH:=0b4fe723d779b0927fb83c9ae709bc7b40f66d7df36433bef143e41c54257084
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/e2fsprogs
+PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
 
 HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CFLAGS += $(FPIC)
+ifneq ($(shell $(HOSTCC) --version | grep clang),)
+  HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0 -Dloff_t=off_t
+endif
+HOST_CFLAGS += $(HOST_FPIC)
 
 HOST_CONFIGURE_ARGS += \
        --disable-elf-shlibs \
-       --enable-libuuid \
+       --disable-libuuid \
        --disable-tls \
-       --disable-nls
+       --disable-nls \
+       --enable-threads=pth \
+       --disable-fuse2fs
 
 define Host/Prepare
        $(call Host/Prepare/Default)
@@ -33,17 +38,13 @@ define Host/Prepare
 endef
 
 define Host/Install
-       $(Host/Install/Default)
-       $(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install
-       mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs
-       $(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/
-       rm -rf $(STAGING_DIR_HOST)/include/uuid
-       $(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
+       $(call Host/Install/Default)
+       $(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/et|' $(STAGING_DIR_HOST)/bin/compile_et
+       $(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/ss|' $(STAGING_DIR_HOST)/bin/mk_cmds
 endef
 
-define Host/Clean
-       rm -f $(STAGING_DIR_HOST)/bin/e2fsck
-       rm -f $(STAGING_DIR_HOST)/bin/tune2fs
+define Host/Uninstall
+       -$(call Host/Compile/Default,uninstall)
 endef
 
 $(eval $(call HostBuild))