Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET
@ 2012-03-21 17:07 Markos Chandras
  2012-03-21 17:46 ` Thomas Petazzoni
  0 siblings, 1 reply; 5+ messages in thread
From: Markos Chandras @ 2012-03-21 17:07 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
 package/xfsprogs/xfsprogs.mk |   98 +++++------------------------------------
 1 files changed, 12 insertions(+), 86 deletions(-)

diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 52fec09..64e8be6 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -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))
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET
  2012-03-21 17:07 [Buildroot] [PATCH] xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET Markos Chandras
@ 2012-03-21 17:46 ` Thomas Petazzoni
  2012-03-22  9:17   ` Markos Chandras
  0 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2012-03-21 17:46 UTC (permalink / raw)
  To: buildroot

Hello,

Thanks for this work!

Le Wed, 21 Mar 2012 17:07:15 +0000,
Markos Chandras <markos.chandras@imgtec.com> a ?crit :

>  #############################################################
> -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

>  XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VERSION).tar.gz

This line is not needed, it's the default.

> +XFSPROGS_INSTALL_STAGING = NO
> +XFSPROGS_INSTALL_TARGET = YES

Not needed, it's the default.

>  
> -$(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

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
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET
  2012-03-21 17:46 ` Thomas Petazzoni
@ 2012-03-22  9:17   ` Markos Chandras
  0 siblings, 0 replies; 5+ messages in thread
From: Markos Chandras @ 2012-03-22  9:17 UTC (permalink / raw)
  To: buildroot

On 03/21/2012 05:46 PM, Thomas Petazzoni wrote:

> Hello,
> 
> Thanks for this work!
> 
> Le Wed, 21 Mar 2012 17:07:15 +0000,
> Markos Chandras <markos.chandras@imgtec.com> a ?crit :
> 
>>  #############################################################
>> -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
> 
>>  XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VERSION).tar.gz
> 
> This line is not needed, it's the default.
> 
>> +XFSPROGS_INSTALL_STAGING = NO
>> +XFSPROGS_INSTALL_TARGET = YES
> 
> Not needed, it's the default.
> 
>> 
>> -$(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
> 
> 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
> --
> 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

-- 
markos

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET
@ 2012-03-22  9:34 Markos Chandras
  2012-04-05 15:10 ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: Markos Chandras @ 2012-03-22  9:34 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
 package/xfsprogs/xfsprogs.mk |   99 +++++-------------------------------------
 1 files changed, 11 insertions(+), 88 deletions(-)

diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 52fec09..c59d4d8 100644
--- 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))
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET
  2012-03-22  9:34 Markos Chandras
@ 2012-04-05 15:10 ` Peter Korsgaard
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2012-04-05 15:10 UTC (permalink / raw)
  To: buildroot

>>>>> "Markos" == Markos Chandras <markos.chandras@imgtec.com> writes:

 Markos> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-04-05 15:10 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-21 17:07 [Buildroot] [PATCH] xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET Markos Chandras
2012-03-21 17:46 ` Thomas Petazzoni
2012-03-22  9:17   ` Markos Chandras
  -- strict thread matches above, loose matches on Subject: below --
2012-03-22  9:34 Markos Chandras
2012-04-05 15:10 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox