summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-06-10 22:37:12 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-06-10 22:38:24 +0200
commit01aaead0d32e5e43640285d870f22f31557af255 (patch)
tree4bac7dd06c5bc04635973ce75e892a1d5ebd447e
parent083c4c7c198f3a474064b48a7c6ef7821e98e129 (diff)
xfsprogs: update to 4.11.0
-rw-r--r--package/xfsprogs/Makefile14
-rw-r--r--package/xfsprogs/patches/patch-io_Makefile13
-rw-r--r--package/xfsprogs/patches/patch-libxfs_Makefile20
-rw-r--r--package/xfsprogs/patches/patch-quota_Makefile13
4 files changed, 35 insertions, 25 deletions
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 7d13795e6..245abcc59 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -4,29 +4,27 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= xfsprogs
-PKG_VERSION:= 4.7.0
+PKG_VERSION:= 4.11.0
PKG_RELEASE:= 1
-PKG_HASH:= 88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7
+PKG_HASH:= c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2
PKG_DESCR:= utilities for xfs filesystems
PKG_SECTION:= sys/fs
-PKG_DEPENDS:= libuuid libncurses
+PKG_DEPENDS:= libuuid libblkid libncurses
PKG_BUILDDEP:= e2fsprogs ncurses
PKG_NEEDS:= threads
PKG_URL:= http://oss.sgi.com/projects/xfs
-PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
- ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
+PKG_SITES:= https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/
PKG_NOPARALLEL:= 1
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,XFSPROGS,xfsprogs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_LDFLAGS+= -lblkid
INSTALL_STYLE:= manual
-TARGET_LDFLAGS+= -lrt
CONFIGURE_ARGS+= --enable-gettext=no \
- --enable-blkid=no \
+ --enable-blkid=yes \
--with-gnu-ld
CONFIGURE_ENV+= DEBUG=" " OPTIMIZER=" " PLATFORM=linux \
ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes
diff --git a/package/xfsprogs/patches/patch-io_Makefile b/package/xfsprogs/patches/patch-io_Makefile
new file mode 100644
index 000000000..e740615b1
--- /dev/null
+++ b/package/xfsprogs/patches/patch-io_Makefile
@@ -0,0 +1,13 @@
+--- xfsprogs-4.11.0.orig/io/Makefile 2017-05-05 20:47:11.000000000 +0200
++++ xfsprogs-4.11.0/io/Makefile 2017-06-03 20:54:04.368047450 +0200
+@@ -13,8 +13,8 @@ CFILES = init.c \
+ getrusage.c imap.c link.c mmap.c open.c parent.c pread.c prealloc.c \
+ pwrite.c reflink.c seek.c shutdown.c stat.c sync.c truncate.c utimes.c
+
+-LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBPTHREAD)
+-LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE)
++LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBHANDLE) $(LIBPTHREAD)
++LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD) $(LIBHANDLE)
+ LLDFLAGS = -static-libtool-libs
+
+ ifeq ($(HAVE_FADVISE),yes)
diff --git a/package/xfsprogs/patches/patch-libxfs_Makefile b/package/xfsprogs/patches/patch-libxfs_Makefile
index f7fe1ddf3..0983e2947 100644
--- a/package/xfsprogs/patches/patch-libxfs_Makefile
+++ b/package/xfsprogs/patches/patch-libxfs_Makefile
@@ -1,6 +1,6 @@
---- xfsprogs-4.3.0.orig/libxfs/Makefile 2015-09-22 03:42:41.000000000 +0200
-+++ xfsprogs-4.3.0/libxfs/Makefile 2016-09-24 11:13:46.701585463 +0200
-@@ -105,13 +105,13 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT)
+--- xfsprogs-4.11.0.orig/libxfs/Makefile 2017-05-05 20:47:11.000000000 +0200
++++ xfsprogs-4.11.0/libxfs/Makefile 2017-06-02 14:32:27.354798232 +0200
+@@ -118,9 +118,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT)
# don't try linking xfs_repair with a debug libxfs.
DEBUG = -DNDEBUG
@@ -12,17 +12,3 @@
crc32table.h: gen_crc32table.c
@echo " [CC] gen_crc32table"
-- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
-+ $(Q) $(BUILD_CC) $(GCFLAGS) -o gen_crc32table $<
- @echo " [GENERATE] $@"
- $(Q) ./gen_crc32table > crc32table.h
-
-@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c
- # disk.
- crc32selftest: gen_crc32table.c crc32table.h crc32.c
- @echo " [TEST] CRC32"
-- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
-+ $(Q) $(BUILD_CC) $(GCFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
- $(Q) ./$@
-
- # set up include/xfs header directory
diff --git a/package/xfsprogs/patches/patch-quota_Makefile b/package/xfsprogs/patches/patch-quota_Makefile
new file mode 100644
index 000000000..00bc37ef5
--- /dev/null
+++ b/package/xfsprogs/patches/patch-quota_Makefile
@@ -0,0 +1,13 @@
+--- xfsprogs-4.11.0.orig/quota/Makefile 2017-05-05 20:47:11.000000000 +0200
++++ xfsprogs-4.11.0/quota/Makefile 2017-06-03 20:57:53.306759013 +0200
+@@ -14,8 +14,8 @@ CFILES += $(PKG_PLATFORM).c
+ PCFILES = darwin.c freebsd.c irix.c linux.c
+ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
+
+-LLDLIBS = $(LIBXCMD)
+-LTDEPENDENCIES = $(LIBXCMD)
++LLDLIBS = $(LIBXFS) $(LIBXCMD)
++LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD)
+ LLDFLAGS = -static
+
+ ifeq ($(ENABLE_READLINE),yes)