Re: [OpenWrt-Devel] [PATCH] xfsprogs: update to 5.5
> On May 20, 2020, at 6:49 AM, Petr Štetiar wrote: > > Rosen Penev [2020-04-05 19:02:51]: > > Missing commit description and BTW to me this looks like another candidate for > move into packages feed. I sent a different patch doing just that. > > -- ynezz ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] xfsprogs: update to 5.5
Rosen Penev [2020-04-05 19:02:51]: Missing commit description and BTW to me this looks like another candidate for move into packages feed. -- ynezz ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] xfsprogs: update to 5.5
Op 6 apr. 2020, om 04:02 heeft Rosen Penev het volgende geschreven: > > Signed-off-by: Rosen Penev > --- > package/utils/xfsprogs/Makefile | 57 +-- > .../xfsprogs/patches/100-no-selftest.patch| 14 - > .../utils/xfsprogs/patches/110-subdirs.patch | 12 ++-- > .../xfsprogs/patches/120-disable_assert.patch | 8 +-- > ...six_memalign-instead-of-deprecated-v.patch | 2 +- > .../patches/140-copy-file-range.patch | 48 > package/utils/xfsprogs/patches/140-mman.patch | 13 + > 7 files changed, 50 insertions(+), 104 deletions(-) > delete mode 100644 package/utils/xfsprogs/patches/100-no-selftest.patch > delete mode 100644 package/utils/xfsprogs/patches/140-copy-file-range.patch > create mode 100644 package/utils/xfsprogs/patches/140-mman.patch > > diff --git a/package/utils/xfsprogs/Makefile b/package/utils/xfsprogs/Makefile > index f717185bb6..335c8f7119 100644 > --- a/package/utils/xfsprogs/Makefile > +++ b/package/utils/xfsprogs/Makefile > @@ -8,15 +8,16 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=xfsprogs > -PKG_CPE_ID:=cpe:/a:sgi:xfsprogs > -PKG_RELEASE:=4 > -PKG_VERSION:=4.11.0 > -PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs > -PKG_HASH:=c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 > +PKG_VERSION:=5.5.0 > +PKG_RELEASE:=1 > > PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz > +PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs > +PKG_HASH:=cfbb0b136799c48cb79435facd0969c5a60a587a458e2d16f9752771027efbec > + > PKG_INSTALL:=1 > PKG_BUILD_PARALLEL:=1 > +PKG_CPE_ID:=cpe:/a:sgi:xfsprogs > > include $(INCLUDE_DIR)/package.mk > > @@ -24,8 +25,8 @@ define Package/xfsprogs/default > SECTION:=utils > CATEGORY:=Utilities > SUBMENU:=Filesystem > - DEPENDS:=+libuuid +libpthread +librt > - URL:=http://oss.sgi.com/projects/xfs > + DEPENDS:=+libuuid +libpthread > + URL:=https://xfs.org/ > endef > > define Package/xfs-admin > @@ -49,46 +50,40 @@ $(call Package/xfsprogs/default) > endef > > CONFIGURE_ARGS += \ > - --enable-gettext=no \ > - --enable-lib64=no \ > - --enable-blkid=no > - > -TARGET_CFLAGS += \ > - -I$(STAGING_DIR)/usr/include \ > - -D_LARGEFILE64_SOURCE \ > - -D_FILE_OFFSET_BITS=64 \ > - -D_GNU_SOURCE > - > -MAKE_FLAGS += \ > - DEBUG= Q= \ > - PCFLAGS="-Wall" \ > - PKG_PLATFORM=linux \ > - ENABLE_GETTEXT=no > - > -define Build/Compile > - $(MAKE) -C $(PKG_BUILD_DIR)/libxfs crc32table.h CFLAGS="$(HOST_CFLAGS) > -I$(PKG_BUILD_DIR)/include" > - $(call Build/Compile/Default) > -endef > + --disable-gettext \ > + --disable-blkid \ > + --disable-readline \ > + --disable-editline \ > + --disable-termcap \ > + --disable-lib64 \ > + --disable-librt \ > + --disable-ubisan \ > + --disable-addrsan \ > + --disable-threadsan \ > + --disable-scrub \ > + --disable-libicu > + > +TARGET_CFLAGS += -DHAVE_MAP_SYNC > > define Package/xfs-admin/install > - mkdir -p $(1)/sbin > + $(INSTALL_DIR) $(1)/sbin > $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_db $(1)/sbin > $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_admin $(1)/sbin > endef > > define Package/xfs-mkfs/install > - mkdir -p $(1)/usr/sbin > + $(INSTALL_DIR) $(1)/usr/sbin > $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mkfs.xfs $(1)/usr/sbin > endef > > define Package/xfs-fsck/install > - mkdir -p $(1)/usr/sbin > + $(INSTALL_DIR) $(1)/usr/sbin > $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/xfs_repair $(1)/usr/sbin > $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_db $(1)/usr/sbin > endef > > define Package/xfs-growfs/install > - mkdir -p $(1)/usr/sbin > + $(INSTALL_DIR) $(1)/usr/sbin > $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_growfs $(1)/usr/sbin > endef > > diff --git a/package/utils/xfsprogs/patches/100-no-selftest.patch > b/package/utils/xfsprogs/patches/100-no-selftest.patch > deleted file mode 100644 > index 2270166753..00 > --- a/package/utils/xfsprogs/patches/100-no-selftest.patch > +++ /dev/null > @@ -1,14 +0,0 @@ > a/libxfs/Makefile > -+++ b/libxfs/Makefile > -@@ -118,9 +118,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT) > - # don't try linking xfs_repair with a debug libxfs. > - DEBUG = -DNDEBUG > - > --LDIRT = gen_crc32table crc32table.h crc32selftest > -+LDIRT = gen_crc32table crc32table.h > - > --default: crc32selftest ltdepend $(LTLIBRARY) > -+default: ltdepend $(LTLIBRARY) > - > - crc32table.h: gen_crc32table.c > - @echo "[CC] gen_crc32table" > diff --git a/package/utils/xfsprogs/patches/110-subdirs.patch > b/package/utils/xfsprogs/patches/110-subdirs.patch > index 53a6b09ce2..ad57d608ec 100644 > --- a/package/utils/xfsprogs/patches/110-subdirs.patch > +++ b/package/utils/xfsprogs/patches/110-subdirs.patch > @@ -1,12 +1,12 @@ > --- a/Makefile > +++ b/Makefile > -@@ -46,8 +46,7 @@ HDR_SUBDIRS = include libxfs > - > +@@ -62,8 +62,7 @@ HDR_SUBDIRS = include libxfs > + LIBFR
[OpenWrt-Devel] [PATCH] xfsprogs: update to 5.5
Signed-off-by: Rosen Penev --- package/utils/xfsprogs/Makefile | 57 +-- .../xfsprogs/patches/100-no-selftest.patch| 14 - .../utils/xfsprogs/patches/110-subdirs.patch | 12 ++-- .../xfsprogs/patches/120-disable_assert.patch | 8 +-- ...six_memalign-instead-of-deprecated-v.patch | 2 +- .../patches/140-copy-file-range.patch | 48 package/utils/xfsprogs/patches/140-mman.patch | 13 + 7 files changed, 50 insertions(+), 104 deletions(-) delete mode 100644 package/utils/xfsprogs/patches/100-no-selftest.patch delete mode 100644 package/utils/xfsprogs/patches/140-copy-file-range.patch create mode 100644 package/utils/xfsprogs/patches/140-mman.patch diff --git a/package/utils/xfsprogs/Makefile b/package/utils/xfsprogs/Makefile index f717185bb6..335c8f7119 100644 --- a/package/utils/xfsprogs/Makefile +++ b/package/utils/xfsprogs/Makefile @@ -8,15 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xfsprogs -PKG_CPE_ID:=cpe:/a:sgi:xfsprogs -PKG_RELEASE:=4 -PKG_VERSION:=4.11.0 -PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs -PKG_HASH:=c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 +PKG_VERSION:=5.5.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs +PKG_HASH:=cfbb0b136799c48cb79435facd0969c5a60a587a458e2d16f9752771027efbec + PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PKG_CPE_ID:=cpe:/a:sgi:xfsprogs include $(INCLUDE_DIR)/package.mk @@ -24,8 +25,8 @@ define Package/xfsprogs/default SECTION:=utils CATEGORY:=Utilities SUBMENU:=Filesystem - DEPENDS:=+libuuid +libpthread +librt - URL:=http://oss.sgi.com/projects/xfs + DEPENDS:=+libuuid +libpthread + URL:=https://xfs.org/ endef define Package/xfs-admin @@ -49,46 +50,40 @@ $(call Package/xfsprogs/default) endef CONFIGURE_ARGS += \ - --enable-gettext=no \ - --enable-lib64=no \ - --enable-blkid=no - -TARGET_CFLAGS += \ - -I$(STAGING_DIR)/usr/include \ - -D_LARGEFILE64_SOURCE \ - -D_FILE_OFFSET_BITS=64 \ - -D_GNU_SOURCE - -MAKE_FLAGS += \ - DEBUG= Q= \ - PCFLAGS="-Wall" \ - PKG_PLATFORM=linux \ - ENABLE_GETTEXT=no - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/libxfs crc32table.h CFLAGS="$(HOST_CFLAGS) -I$(PKG_BUILD_DIR)/include" - $(call Build/Compile/Default) -endef + --disable-gettext \ + --disable-blkid \ + --disable-readline \ + --disable-editline \ + --disable-termcap \ + --disable-lib64 \ + --disable-librt \ + --disable-ubisan \ + --disable-addrsan \ + --disable-threadsan \ + --disable-scrub \ + --disable-libicu + +TARGET_CFLAGS += -DHAVE_MAP_SYNC define Package/xfs-admin/install - mkdir -p $(1)/sbin + $(INSTALL_DIR) $(1)/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_db $(1)/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_admin $(1)/sbin endef define Package/xfs-mkfs/install - mkdir -p $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mkfs.xfs $(1)/usr/sbin endef define Package/xfs-fsck/install - mkdir -p $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/xfs_repair $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_db $(1)/usr/sbin endef define Package/xfs-growfs/install - mkdir -p $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_growfs $(1)/usr/sbin endef diff --git a/package/utils/xfsprogs/patches/100-no-selftest.patch b/package/utils/xfsprogs/patches/100-no-selftest.patch deleted file mode 100644 index 2270166753..00 --- a/package/utils/xfsprogs/patches/100-no-selftest.patch +++ /dev/null @@ -1,14 +0,0 @@ a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -118,9 +118,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT) - # don't try linking xfs_repair with a debug libxfs. - DEBUG = -DNDEBUG - --LDIRT = gen_crc32table crc32table.h crc32selftest -+LDIRT = gen_crc32table crc32table.h - --default: crc32selftest ltdepend $(LTLIBRARY) -+default: ltdepend $(LTLIBRARY) - - crc32table.h: gen_crc32table.c - @echo "[CC] gen_crc32table" diff --git a/package/utils/xfsprogs/patches/110-subdirs.patch b/package/utils/xfsprogs/patches/110-subdirs.patch index 53a6b09ce2..ad57d608ec 100644 --- a/package/utils/xfsprogs/patches/110-subdirs.patch +++ b/package/utils/xfsprogs/patches/110-subdirs.patch @@ -1,12 +1,12 @@ --- a/Makefile +++ b/Makefile -@@ -46,8 +46,7 @@ HDR_SUBDIRS = include libxfs - +@@ -62,8 +62,7 @@ HDR_SUBDIRS = include libxfs + LIBFROG_SUBDIR = libfrog DLIB_SUBDIRS = libxlog libxcmd libhandle LIB_SUBDIRS = libxfs $(DLIB_SUBDIRS) --TOOL_SUBDIRS = copy db estimate fsck growfs io logprint mkfs quota \ -- mdrestore repair rtcp m4 man doc debian +-TOOL_SUBDIRS = co
