Pull request for branch xfsprogs-update
The following changes since commit 14aa5ee54f33d05a0bd01f21635e095ba07f83ec:
Peter Korsgaard (1):
mtd-utils: move phony dependencies to toplevel mtd-host target
are available in the git repository at:
git://git.busybox.net/~nkukard/git/buildroot xfsprogs-update
Nigel Kukard (1):
Update xfsprogs
package/xfsprogs/Config.in | 10 +++--- package/xfsprogs/xfsprogs.mk | 9 ++--- package/xfsprogs/xfsprogs.patch | 59 --------------------------------------- 3 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 package/xfsprogs/xfsprogs.patch
Thanks,
Signature · 1 line
Nigel Kukard
PATCH 1/1 Update xfsprogs
--- package/xfsprogs/Config.in | 10 +++--- package/xfsprogs/xfsprogs.mk | 9 ++--- package/xfsprogs/xfsprogs.patch | 59 --------------------------------------- 3 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 package/xfsprogs/xfsprogs.patch
package/xfsprogs/Config.in +5 -5
@@ -1,6 +1,9 @@ -comment "Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED enabled" - depends on BR2_PACKAGE_XFSPROGS +comment "Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED and UCLIBC_HAS_OBSOLETE_BSD_SIGNAL enabled" + depends on BR2_PACKAGE_XFSPROGS + +comment "xfsprogs requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE config BR2_PACKAGE_XFSPROGS bool "xfsprogs"
@@ -11,6 +14,3 @@ config BR2_PACKAGE_XFSPROGS http://oss.sgi.com/projects/xfs/ -comment "xfssprogs requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE -
package/xfsprogs/xfsprogs.mk +4 -5
@@ -3,10 +3,9 @@ # xfsprogs # ############################################################# -XFSPROGS_VERSION:=2.10.2 -XFSPROGS_SOURCE=xfsprogs_$(XFSPROGS_VERSION)-1.tar.gz +XFSPROGS_VERSION:=3.0.3 +XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VERSION).tar.gz XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars -#XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ XFSPROGS_DIR=$(BUILD_DIR)/xfsprogs-$(XFSPROGS_VERSION) XFSPROGS_CAT:=$(ZCAT) XFSPROGS_BINARY:=mkfs/mkfs.xfs
@@ -38,7 +37,6 @@ $(XFSPROGS_DIR)/.configured: $(XFSPROGS_DIR)/.unpacked $(TARGET_CONFIGURE_ARGS) \ CPPFLAGS="-I$(E2FSPROGS_DIR)/lib" \ LDFLAGS="-L$(E2FSPROGS_DIR)/lib" \ - LIBTOOL=$(LIBTOOL_DIR)/libtool \ INSTALL_USER=$(shell whoami) \ INSTALL_GROUP=$(shell groups | cut -d" " -f1) \ ./configure $(QUIET) \
@@ -46,6 +44,7 @@ $(XFSPROGS_DIR)/.configured: $(XFSPROGS_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --exec-prefix=/ \ + --enable-gettext=no \ $(XFSPROGS_CONFIG_SHARED) \ ) touch $(XFSPROGS_DIR)/.configured
@@ -78,7 +77,7 @@ $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY): $(XFSPROGS_DIR)/$(XFSPROGS_BINARY) rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc touch -c $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) -xfsprogs: e2fsprogs libtool-cross $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) +xfsprogs: e2fsprogs libtool $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) xfsprogs-clean: rm -f $(TARGET_DIR)/bin/xfs_* $(TARGET_DIR)/sbin/xfs_* $(TARGET_DIR)/sbin/*.xfs
package/xfsprogs/xfsprogs.patch deleted +0 -59
59 lines not on this page · raw message
Signature · 1 line
1.6.4
PATCH 1/1 Update xfsprogs
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Nigel" == Nigel Kukard <[email protected]> writes:
Nigel> Signed-off-by: Nigel Kukard <[email protected]> Nigel> ---
Nigel> package/xfsprogs/Config.in | 10 +++--- Nigel> package/xfsprogs/xfsprogs.mk | 9 ++--- Nigel> package/xfsprogs/xfsprogs.patch | 59 ---------------------------------------
Nigel> 3 files changed, 9 insertions(+), 69 deletions(-) Nigel> delete mode 100644 package/xfsprogs/xfsprogs.patch
Nigel> diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in Nigel> index 2f462cb..77e4d61 100644
Nigel> --- a/package/xfsprogs/Config.in
Nigel> +++ b/package/xfsprogs/Config.in
Nigel> @@ -1,6 +1,9 @@
Nigel> -comment "xfssprogs requires a toolchain with LARGEFILE support"
Nigel> - depends on !BR2_LARGEFILE
Nigel> -
I don't see any references to the e2fsprogs libuuid?
Nigel> diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk Nigel> index 89db6c1..e87485e 100644
Nigel> --- a/package/xfsprogs/xfsprogs.mk
Nigel> +++ b/package/xfsprogs/xfsprogs.mk
Nigel> rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
Nigel> touch -c $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
Nigel> -xfsprogs: e2fsprogs libtool-cross $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) Nigel> +xfsprogs: e2fsprogs libtool $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
You need to select e2fsprogs in kconfig. Why do you need libtool for the target?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 Update xfsprogs
Quoted 17 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
"Nigel" == Nigel Kukard <[email protected]> writes:
Nigel> Signed-off-by: Nigel Kukard <[email protected]> Nigel> ---
Nigel> package/xfsprogs/Config.in | 10 +++--- Nigel> package/xfsprogs/xfsprogs.mk | 9 ++--- Nigel> package/xfsprogs/xfsprogs.patch | 59 ---------------------------------------Nigel> 3 files changed, 9 insertions(+), 69 deletions(-) Nigel> delete mode 100644
package/xfsprogs/xfsprogs.patchNigel> diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in Nigel> index 2f462cb..77e4d61 100644
Nigel> --- a/package/xfsprogs/Config.in
Nigel> +++ b/package/xfsprogs/Config.in
Nigel> @@ -1,6 +1,9 @@
Quoted 6 lines
Nigel> -comment "xfssprogs requires a toolchain with LARGEFILE support"
Nigel> - depends on !BR2_LARGEFILE
Nigel> -I don't see any references to the e2fsprogs libuuid?
I'll change it to be auto selected just like BR2_PACKAGE_E2FSPROGS is
Quoted 11 lines
Nigel> diff --git
a/package/xfsprogs/xfsprogs.mkb/package/xfsprogs/xfsprogs.mkNigel> index 89db6c1..e87485e 100644
Nigel> ---a/package/xfsprogs/xfsprogs.mk
Nigel> +++b/package/xfsprogs/xfsprogs.mk
Nigel> rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
Nigel> touch -c $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)Nigel> -xfsprogs: e2fsprogs libtool-cross $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) Nigel> +xfsprogs: e2fsprogs libtool $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
You need to select e2fsprogs in kconfig.
select BR2_PACKAGE_E2FSPROGS
its already there. I have now added libuuid aswell.
Quoted 3 lines
Why do you need libtool for the
target?
I didn't add libtool-cross, I was told to use "libtool" instead in future. Maybe the original author of xfsprogs.mk can answer why it was there?
When I have tested it without libtool I'll send another pull request.