xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET
PATCH 1/1 xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET
--- package/xfsprogs/xfsprogs.mk | 98 +++++------------------------------------ 1 files changed, 12 insertions(+), 86 deletions(-)
package/xfsprogs/xfsprogs.mk +12 -86
@@ -3,96 +3,22 @@ # xfsprogs # ############################################################# -XFSPROGS_VERSION:=3.0.3 +XFSPROGS_VERSION:=3.1.7 XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VERSION).tar.gz 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_INSTALL_STAGING = NO +XFSPROGS_INSTALL_TARGET = YES -$(DL_DIR)/$(XFSPROGS_SOURCE): - $(call DOWNLOAD,$(XFSPROGS_SITE)/$(XFSPROGS_SOURCE)) +XFSPROGS_DEPENDENCIES = util-linux -xfsprogs-source: $(DL_DIR)/$(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=default \ + INSTALL_GROUP=default -$(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_INSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) install +XFSPROGS_UNINSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) uninstall -#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))
Signature · 1 line
1.7.1
PATCH 1/1 xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET
Hello,
Thanks for this work!
Le Wed, 21 Mar 2012 17:07:15 +0000,
Markos Chandras <[email protected]> a ?crit :
package/xfsprogs/xfsprogs.mk line 6
Quoted 3 lines
#############################################################
package/xfsprogs/xfsprogs.mk +1
-1-XFSPROGS_VERSION:=3.0.3 +XFSPROGS_VERSION:=3.1.7
We prefer '=' instead of ':=', and spaces before and after '=', i.e:
XFSPROGS_VERSION = 3.1.7
Quoted 1 line
XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VERSION).tar.gz
This line is not needed, it's the default.
package/xfsprogs/xfsprogs.mk line 11
Quoted 2 lines
package/xfsprogs/xfsprogs.mk +2
-0+XFSPROGS_INSTALL_STAGING = NO +XFSPROGS_INSTALL_TARGET = YES
Not needed, it's the default.
package/xfsprogs/xfsprogs.mk line 19
Quoted 11 lines
-$(DL_DIR)/$(XFSPROGS_SOURCE):
package/xfsprogs/xfsprogs.mk +6
-2- $(call DOWNLOAD,$(XFSPROGS_SITE)/$(XFSPROGS_SOURCE)) +XFSPROGS_DEPENDENCIES = util-linux -xfsprogs-source: $(DL_DIR)/$(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=default \ + INSTALL_GROUP=default
Hum, why default:default and not root:root here? Anyway, our fakeroot script is going to chown everything to root:root.
In terms of indentation, something like:
XFSPROGS_CONF_OPT = \ --enable-lib64=no \ --enable-gettext=no \ INSTALL_USER=root \ INSTALL_GROUP=root
Would be better, IMO, but I'm nitpicking.
Otherwise, looks good (but untested).
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/1 xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET
Quoted 51 lines · Thomas Petazzoni
Hello,
Thanks for this work!
Le Wed, 21 Mar 2012 17:07:15 +0000,
Markos Chandras <[email protected]> a ?crit :package/xfsprogs/xfsprogs.mk line 6
Quoted 3 lines
#############################################################
package/xfsprogs/xfsprogs.mk +1
-1-XFSPROGS_VERSION:=3.0.3 +XFSPROGS_VERSION:=3.1.7We prefer '=' instead of ':=', and spaces before and after '=', i.e:
XFSPROGS_VERSION= 3.1.7Quoted 1 line
XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VERSION).tar.gz
This line is not needed, it's the default.
package/xfsprogs/xfsprogs.mk line 11
Quoted 2 lines
package/xfsprogs/xfsprogs.mk +2
-0+XFSPROGS_INSTALL_STAGING = NO +XFSPROGS_INSTALL_TARGET = YESNot needed, it's the default.
package/xfsprogs/xfsprogs.mk line 19
Quoted 11 lines
-$(DL_DIR)/$(XFSPROGS_SOURCE):
package/xfsprogs/xfsprogs.mk +6
-2- $(call DOWNLOAD,$(XFSPROGS_SITE)/$(XFSPROGS_SOURCE)) +XFSPROGS_DEPENDENCIES = util-linux -xfsprogs-source: $(DL_DIR)/$(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=default \ + INSTALL_GROUP=defaultHum, why default:default and not root:root here? Anyway, our fakeroot script is going to chown everything to root:root.
In terms of indentation, something like:
XFSPROGS_CONF_OPT = \ --enable-lib64=no \ --enable-gettext=no \ INSTALL_USER=root \ INSTALL_GROUP=rootWould be better, IMO, but I'm nitpicking.
Otherwise, looks good (but untested).
Quoted 11 lines
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Hi Thomas,
Thanks for the review. A new patch is coming soon
Signature · 1 line
markos