xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 52fec0964fb68fe424fe73bebcde1fcf7e99ada0..c59d4d8e30e6cbe61f3d515fbeeece5b6fc5fc5f 100644 (file)
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -3,96 +3,19 @@
 # xfsprogs
 #
 #############################################################
-XFSPROGS_VERSION:=3.0.3
-XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VERSION).tar.gz
+XFSPROGS_VERSION = 3.1.7
 XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars
-XFSPROGS_DIR=$(BUILD_DIR)/xfsprogs-$(XFSPROGS_VERSION)
-XFSPROGS_CAT:=$(ZCAT)
-XFSPROGS_BINARY:=mkfs/mkfs.xfs
-XFSPROGS_TARGET_BINARY:=sbin/mkfs.xfs
 
-XFSPROGS_STRIP:= fsck/fsck.xfs mkfile/xfs_mkfile rtcp/xfs_rtcp
-XFSPROGS_STRIP_LIBDEP:= \
-       copy/xfs_copy db/xfs_db growfs/xfs_growfs io/xfs_io \
-       logprint/xfs_logprint mkfs/fstyp mkfs/mkfs.xfs \
-       repair/xfs_repair quota/xfs_quota
+XFSPROGS_DEPENDENCIES = util-linux
 
-$(DL_DIR)/$(XFSPROGS_SOURCE):
-        $(call DOWNLOAD,$(XFSPROGS_SITE)/$(XFSPROGS_SOURCE))
+XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes
+XFSPROGS_CONF_OPT = \
+       --enable-lib64=no \
+       --enable-gettext=no \
+       INSTALL_USER=root \
+       INSTALL_GROUP=root
 
-xfsprogs-source: $(DL_DIR)/$(XFSPROGS_SOURCE)
+XFSPROGS_INSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) install
+XFSPROGS_UNINSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) uninstall
 
-$(XFSPROGS_DIR)/.unpacked: $(DL_DIR)/$(XFSPROGS_SOURCE)
-       $(XFSPROGS_CAT) $(DL_DIR)/$(XFSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       support/scripts/apply-patches.sh $(XFSPROGS_DIR) package/xfsprogs/ xfsprogs\*.patch
-       touch $(XFSPROGS_DIR)/.unpacked
-
-#XFSPROGS_CONFIG_SHARED:=--disable-shared
-XFSPROGS_CONFIG_SHARED:=--enable-shared
-
-$(XFSPROGS_DIR)/.configured: $(XFSPROGS_DIR)/.unpacked
-       (cd $(XFSPROGS_DIR); rm -rf config.cache; \
-               ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes \
-               $(TARGET_CONFIGURE_OPTS) \
-               $(TARGET_CONFIGURE_ARGS) \
-               CPPFLAGS="-I$(E2FSPROGS_DIR)/lib" \
-               LDFLAGS="-L$(E2FSPROGS_DIR)/lib" \
-               INSTALL_USER=$(shell whoami) \
-               INSTALL_GROUP=$(shell groups | cut -d" " -f1) \
-               ./configure $(QUIET) \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --exec-prefix=/ \
-               --enable-gettext=no \
-               $(XFSPROGS_CONFIG_SHARED) \
-       )
-       touch $(XFSPROGS_DIR)/.configured
-
-$(XFSPROGS_DIR)/$(XFSPROGS_BINARY): $(XFSPROGS_DIR)/.configured
-       $(MAKE1) PATH=$(TARGET_PATH) CPPFLAGS="-I$(E2FSPROGS_DIR)/lib" \
-               LDFLAGS="-L$(E2FSPROGS_DIR)/lib" -C $(XFSPROGS_DIR)
-ifeq ($(XFSPROGS_CONFIG_SHARED),--enable-shared)
-       ( \
-               cd $(XFSPROGS_DIR); \
-               $(STRIPCMD) $(XFSPROGS_STRIP); \
-               $(STRIPCMD) $(join $(dir $(XFSPROGS_STRIP_LIBDEP)), \
-                               $(addprefix .libs/,$(notdir $(XFSPROGS_STRIP_LIBDEP)))) \
-       )
-       $(STRIPCMD) $(XFSPROGS_DIR)/lib*/.libs/lib*.so.*.*
-else
-       ( \
-               cd $(XFSPROGS_DIR); \
-               $(STRIPCMD) $(XFSPROGS_STRIP) $(XFSPROGS_STRIP_LIBDEP) \
-       )
-       $(STRIPCMD) $(XFSPROGS_DIR)/lib*/lib*.so.*.*
-endif
-       touch -c $(XFSPROGS_DIR)/$(XFSPROGS_BINARY)
-
-$(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY): $(XFSPROGS_DIR)/$(XFSPROGS_BINARY)
-       $(MAKE1) PATH=$(TARGET_PATH) \
-           DIST_ROOT=$(TARGET_DIR) \
-           exec-prefix=/ \
-           -C $(XFSPROGS_DIR) install
-       rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-       touch -c $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
-
-xfsprogs: util-linux $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
-
-xfsprogs-clean:
-       rm -f $(TARGET_DIR)/bin/xfs_* $(TARGET_DIR)/sbin/xfs_* $(TARGET_DIR)/sbin/*.xfs
-       rm -f $(TARGET_DIR)/usr/lib/libhandle.so*
-       rm -f $(TARGET_DIR)/usr/lib/libdisk.so* $(TARGET_DIR)/usr/lib/libxfs.so*
-       -$(MAKE1) -C $(XFSPROGS_DIR) clean
-
-xfsprogs-dirclean:
-       rm -rf $(XFSPROGS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_XFSPROGS),y)
-TARGETS+=xfsprogs
-endif
+$(eval $(call AUTOTARGETS))