[ptxdist] [PATCH v2] xfsprogs: version bump 3.0.5 -> 4.2.0

[ptxdist] [PATCH v2] xfsprogs: version bump 3.0.5 -> 4.2.0

[Lucas Stach]

Big version bump to the just released 4.2.0.

Rules have been updated to remove long deprecated xfs_check, enable
static linking (the old tools had been broken by the ptxdist default
change) and properly configure install paths at the prepare stage
instead of manually overriding the variables at compile time.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
v2: remove old patches
---
 ...progs-fix-build-with-latest-glibc-headers.patch | 52 ----------------------
 patches/xfsprogs-3.0.5/series                      |  1 -
 rules/xfsprogs.in                                  |  8 +---
 rules/xfsprogs.make                                | 26 ++++-------
 4 files changed, 9 insertions(+), 78 deletions(-)
 delete mode 100644 patches/xfsprogs-3.0.5/0001-xfsprogs-fix-build-with-latest-glibc-headers.patch
 delete mode 100644 patches/xfsprogs-3.0.5/series

diff --git a/patches/xfsprogs-3.0.5/0001-xfsprogs-fix-build-with-latest-glibc-headers.patch b/patches/xfsprogs-3.0.5/0001-xfsprogs-fix-build-with-latest-glibc-headers.patch
deleted file mode 100644
index 728ae00..0000000
--- a/patches/xfsprogs-3.0.5/0001-xfsprogs-fix-build-with-latest-glibc-headers.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Eric Sandeen <sandeen@sandeen.net>
-Date: Mon, 1 Feb 2010 10:13:36 -0600
-Subject: [PATCH] xfsprogs: fix build with latest glibc headers
-
-glibc in rawhide has some changes...
-
-* Tue Jan 12 2010 Andreas Schwab <schwab@redhat.com> - 2.11.90-8
-- Update from master.
-  - More POSIX conformance fixes.
-
-* Mon Jan 11 2010 Andreas Schwab <schwab@redhat.com> - 2.11.90-6
-- Update from master.
-  - POSIX conformance fixes (BZ#11125).
-
-which seem to break the xfsprogs build.  I'm no feature test macro
-guru, but the following gets it going again for me.
-
-Signed-off-by: Eric Sandeen <sandeen@redhat.com>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
----
- include/builddefs.in |    2 +-
- include/linux.h      |    1 +
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/include/builddefs.in b/include/builddefs.in
-index ca8f172..cc75b5d 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -102,7 +102,7 @@ GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
- #	   -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl
- 
- ifeq ($(PKG_PLATFORM),linux)
--PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
-+PCFLAGS = -D_GNU_SOURCE -D_XOPEN_SOURCE=500 -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
- DEPENDFLAGS = -D__linux__
- endif
- ifeq ($(PKG_PLATFORM),darwin)
-diff --git a/include/linux.h b/include/linux.h
-index dbfb4cf..b342e55 100644
---- a/include/linux.h
-+++ b/include/linux.h
-@@ -22,6 +22,7 @@
- #include <sys/ioctl.h>
- #include <sys/param.h>
- #include <sys/sysmacros.h>
-+#include <sys/stat.h>
- #include <malloc.h>
- #include <getopt.h>
- #include <endian.h>
--- 
-1.7.2.3
-
diff --git a/patches/xfsprogs-3.0.5/series b/patches/xfsprogs-3.0.5/series
deleted file mode 100644
index 0d3eed0..0000000
--- a/patches/xfsprogs-3.0.5/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-xfsprogs-fix-build-with-latest-glibc-headers.patch
diff --git a/rules/xfsprogs.in b/rules/xfsprogs.in
index ce191f7..656dcf8 100644
--- a/rules/xfsprogs.in
+++ b/rules/xfsprogs.in
@@ -7,6 +7,7 @@ menuconfig XFSPROGS
 	select LIBC_PTHREAD
 	select GCCLIBS_GCC_S
 	select LIBUUID
+	select HOST_LIBUUID
 	help
 	 The xfsprogs package provides the filesystem utilities for use
 	 with the xfs filesystem.
@@ -59,13 +60,6 @@ config XFSPROGS_INSTALL_NCHECK
 	help
 	  Install the xfs_ncheck program
 
-config XFSPROGS_INSTALL_CHECK
-	bool
-	select XFSPROGS_INSTALL_DB
-	prompt "xfs_check"
-	help
-	  Install the xfs_check program
-
 config XFSPROGS_INSTALL_ADMIN
 	bool
 	prompt "xfs_admin"
diff --git a/rules/xfsprogs.make b/rules/xfsprogs.make
index ce1e164..72a0c93 100644
--- a/rules/xfsprogs.make
+++ b/rules/xfsprogs.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2010 by Bart vdr. Meulen <bartvdrmeulen@gmail.com>
+# Copyright (C) 2015 by Lucas Stach <dev@lynxeye.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,11 +17,11 @@ PACKAGES-$(PTXCONF_XFSPROGS) += xfsprogs
 #
 # Paths and names
 #
-XFSPROGS_VERSION:= 3.0.5
-XFSPROGS_MD5	:= d2f981b1ae9348405a331b4c33a08cab
+XFSPROGS_VERSION:= 4.2.0
+XFSPROGS_MD5	:= e1b9438d3e6775b9df52cc9a13e9f9a6
 XFSPROGS	:= xfsprogs-$(XFSPROGS_VERSION)
 XFSPROGS_SUFFIX	:= tar.gz
-XFSPROGS_URL	:= ftp://oss.sgi.com/projects/xfs/cmd_tars-oct_09/$(XFSPROGS).$(XFSPROGS_SUFFIX)
+XFSPROGS_URL	:= ftp://oss.sgi.com/projects/xfs/cmd_tars/$(XFSPROGS).$(XFSPROGS_SUFFIX)
 XFSPROGS_SOURCE	:= $(SRCDIR)/$(XFSPROGS).$(XFSPROGS_SUFFIX)
 XFSPROGS_DIR	:= $(BUILDDIR)/$(XFSPROGS)
 XFSPROGS_LICENSE:= GPLv2, LGPLv2.1
@@ -32,23 +33,16 @@ XFSPROGS_LICENSE:= GPLv2, LGPLv2.1
 XFSPROGS_CONF_TOOL	:= autoconf
 XFSPROGS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--sbindir=/usr/sbin \
+	--libdir=/usr/lib \
+	--datarootdir=/usr/share \
+	--enable-static \
 	--disable-readline \
 	--disable-editline \
 	--disable-termcap \
-	--disable-blkid \
 	--disable-lib64
 
 # ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-XFSPROGS_INSTALL_OPT := \
-	prefix=${XFSPROGS_PKGDIR}/usr \
-	PKG_ROOT_SBIN_DIR=${XFSPROGS_PKGDIR}/sbin \
-	PKG_ROOT_LIB_DIR=${XFSPROGS_PKGDIR}/lib \
-	install
-
-# ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
@@ -86,10 +80,6 @@ ifdef PTXCONF_XFSPROGS_INSTALL_METADUMP
 	@$(call install_copy, xfsprogs, 0, 0, 0755, -, /usr/sbin/xfs_metadump)
 endif
 
-ifdef PTXCONF_XFSPROGS_INSTALL_CHECK
-	@$(call install_copy, xfsprogs, 0, 0, 0755, -, /usr/sbin/xfs_check)
-endif
-
 ifdef PTXCONF_XFSPROGS_INSTALL_NCHECK
 	@$(call install_copy, xfsprogs, 0, 0, 0755, -, /usr/sbin/xfs_ncheck)
 endif
-- 
2.4.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de