* [PR PATCH] mergerfs: update to 2.31.0
@ 2020-11-13 1:01 ndowens
2020-11-14 0:37 ` [PR PATCH] [Closed]: " ndowens
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: ndowens @ 2020-11-13 1:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages mergerfs
https://github.com/void-linux/void-packages/pull/26340
mergerfs: update to 2.31.0
A patch file from https://github.com/void-linux/void-packages/pull/26340.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mergerfs-26340.patch --]
[-- Type: text/x-diff, Size: 3718 bytes --]
From af3b611139d2b70eb96a4ce2eb813c4d07ea9ee9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 12 Nov 2020 19:01:19 -0600
Subject: [PATCH] mergerfs: update to 2.31.0
---
.../mergerfs/patches/0001-install_fix.patch | 32 +++++++++++++++++++
srcpkgs/mergerfs/patches/001_install.patch | 16 ----------
srcpkgs/mergerfs/template | 12 +++----
3 files changed, 37 insertions(+), 23 deletions(-)
create mode 100644 srcpkgs/mergerfs/patches/0001-install_fix.patch
delete mode 100644 srcpkgs/mergerfs/patches/001_install.patch
diff --git a/srcpkgs/mergerfs/patches/0001-install_fix.patch b/srcpkgs/mergerfs/patches/0001-install_fix.patch
new file mode 100644
index 00000000000..a8de8865b05
--- /dev/null
+++ b/srcpkgs/mergerfs/patches/0001-install_fix.patch
@@ -0,0 +1,32 @@
+From 584927af025144e4de064b6d274d3e99eec85993 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Thu, 12 Nov 2020 18:58:23 -0600
+Subject: [PATCH] install_fix
+
+---
+ libfuse/Makefile | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git libfuse/Makefile libfuse/Makefile
+index 61a1a11..99ccf9f 100644
+--- libfuse/Makefile
++++ libfuse/Makefile
+@@ -106,13 +106,8 @@ strip:
+ strip --strip-all build/mount.mergerfs
+ strip --strip-all build/mergerfs-fusermount
+
+-install-utils: mergerfs-fusermount mount.mergerfs strip
+- install -D build/mergerfs-fusermount "$(INSTALLBINDIR)/mergerfs-fusermount"
+- install -D build/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs"
+- chown root "$(INSTALLBINDIR)/mergerfs-fusermount"
+- chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount"
+-
+-install: $(INSTALLUTILS)
++install:
++ echo ""
+
+ .PHONY: objects strip utils install install-utils
+
+--
+2.29.2
+
diff --git a/srcpkgs/mergerfs/patches/001_install.patch b/srcpkgs/mergerfs/patches/001_install.patch
deleted file mode 100644
index 9cbca6a8a0d..00000000000
--- a/srcpkgs/mergerfs/patches/001_install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libfuse/Makefile 2020-02-23 04:40:32.000000000 +0100
-+++ libfuse/Makefile 2020-03-09 16:30:59.282571220 +0100
-@@ -93,11 +93,8 @@
- strip --strip-all build/mount.mergerfs
- strip --strip-all build/mergerfs-fusermount
-
--install: mergerfs-fusermount mount.mergerfs strip
-- install -D build/mergerfs-fusermount "$(INSTALLBINDIR)/mergerfs-fusermount"
-- install -D build/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs"
-- chown root:root "$(INSTALLBINDIR)/mergerfs-fusermount"
-- chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount"
-+install:
-+ echo "---------"
-
- .PHONY: objects strip
-
diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template
index 918b136a505..cdfdab4a030 100644
--- a/srcpkgs/mergerfs/template
+++ b/srcpkgs/mergerfs/template
@@ -1,23 +1,21 @@
# Template file for 'mergerfs'
pkgname=mergerfs
-version=2.29.0
+version=2.31.0
revision=1
build_style=gnu-makefile
+make_use_env=yes
hostmakedepends="automake libtool pkg-config which"
+makedepends="fuse-devel"
short_desc="FUSE union filesystem"
maintainer="Orphaned <orphan@voidlinux.org>"
license="ISC"
homepage="https://github.com/trapexit/mergerfs"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f16f7c90d9db35b9f8fadbb529c4bf0f7d65d18fd2e7443a662cbfa7a8dbd4f9
+checksum=753cee325b333eebd448795e2702f50b24b24e12a86c547fe8eceff4b3311cd4
pre_build() {
- vsed -i 's|^CXXFLAGS[[:blank:]]*=|override CXXFLAGS +=|g' Makefile
- vsed -i 's|^LDFLAGS[[:blank:]]*=|override LDFLAGS +=|g' Makefile
-
# we build from source, spoof release tarball
- echo "$version" > VERSION
- ./tools/update-version
+ vsed -i "s|^VERSION=.*|VERSION=$pkgver|" tools/update-version
}
post_install() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: mergerfs: update to 2.31.0
2020-11-13 1:01 [PR PATCH] mergerfs: update to 2.31.0 ndowens
@ 2020-11-14 0:37 ` ndowens
2020-11-14 1:19 ` [PR PATCH] [Updated] " ndowens
2020-11-14 14:51 ` [PR PATCH] [Merged]: " Hoshpak
2 siblings, 0 replies; 4+ messages in thread
From: ndowens @ 2020-11-14 0:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
There's a closed pull request on the void-packages repository
mergerfs: update to 2.31.0
https://github.com/void-linux/void-packages/pull/26340
Description:
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] mergerfs: update to 2.31.0
2020-11-13 1:01 [PR PATCH] mergerfs: update to 2.31.0 ndowens
2020-11-14 0:37 ` [PR PATCH] [Closed]: " ndowens
@ 2020-11-14 1:19 ` ndowens
2020-11-14 14:51 ` [PR PATCH] [Merged]: " Hoshpak
2 siblings, 0 replies; 4+ messages in thread
From: ndowens @ 2020-11-14 1:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages mergerfs
https://github.com/void-linux/void-packages/pull/26340
mergerfs: update to 2.31.0
A patch file from https://github.com/void-linux/void-packages/pull/26340.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mergerfs-26340.patch --]
[-- Type: text/x-diff, Size: 3728 bytes --]
From 03ee1fa7e38fc8f67cea669cc7159bd46b5a522f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 12 Nov 2020 19:01:19 -0600
Subject: [PATCH] mergerfs: update to 2.31.0
[ci skip]
---
.../mergerfs/patches/0001-install_fix.patch | 32 +++++++++++++++++++
srcpkgs/mergerfs/patches/001_install.patch | 16 ----------
srcpkgs/mergerfs/template | 12 +++----
3 files changed, 37 insertions(+), 23 deletions(-)
create mode 100644 srcpkgs/mergerfs/patches/0001-install_fix.patch
delete mode 100644 srcpkgs/mergerfs/patches/001_install.patch
diff --git a/srcpkgs/mergerfs/patches/0001-install_fix.patch b/srcpkgs/mergerfs/patches/0001-install_fix.patch
new file mode 100644
index 00000000000..a8de8865b05
--- /dev/null
+++ b/srcpkgs/mergerfs/patches/0001-install_fix.patch
@@ -0,0 +1,32 @@
+From 584927af025144e4de064b6d274d3e99eec85993 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Thu, 12 Nov 2020 18:58:23 -0600
+Subject: [PATCH] install_fix
+
+---
+ libfuse/Makefile | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git libfuse/Makefile libfuse/Makefile
+index 61a1a11..99ccf9f 100644
+--- libfuse/Makefile
++++ libfuse/Makefile
+@@ -106,13 +106,8 @@ strip:
+ strip --strip-all build/mount.mergerfs
+ strip --strip-all build/mergerfs-fusermount
+
+-install-utils: mergerfs-fusermount mount.mergerfs strip
+- install -D build/mergerfs-fusermount "$(INSTALLBINDIR)/mergerfs-fusermount"
+- install -D build/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs"
+- chown root "$(INSTALLBINDIR)/mergerfs-fusermount"
+- chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount"
+-
+-install: $(INSTALLUTILS)
++install:
++ echo ""
+
+ .PHONY: objects strip utils install install-utils
+
+--
+2.29.2
+
diff --git a/srcpkgs/mergerfs/patches/001_install.patch b/srcpkgs/mergerfs/patches/001_install.patch
deleted file mode 100644
index 9cbca6a8a0d..00000000000
--- a/srcpkgs/mergerfs/patches/001_install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libfuse/Makefile 2020-02-23 04:40:32.000000000 +0100
-+++ libfuse/Makefile 2020-03-09 16:30:59.282571220 +0100
-@@ -93,11 +93,8 @@
- strip --strip-all build/mount.mergerfs
- strip --strip-all build/mergerfs-fusermount
-
--install: mergerfs-fusermount mount.mergerfs strip
-- install -D build/mergerfs-fusermount "$(INSTALLBINDIR)/mergerfs-fusermount"
-- install -D build/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs"
-- chown root:root "$(INSTALLBINDIR)/mergerfs-fusermount"
-- chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount"
-+install:
-+ echo "---------"
-
- .PHONY: objects strip
-
diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template
index 918b136a505..cdfdab4a030 100644
--- a/srcpkgs/mergerfs/template
+++ b/srcpkgs/mergerfs/template
@@ -1,23 +1,21 @@
# Template file for 'mergerfs'
pkgname=mergerfs
-version=2.29.0
+version=2.31.0
revision=1
build_style=gnu-makefile
+make_use_env=yes
hostmakedepends="automake libtool pkg-config which"
+makedepends="fuse-devel"
short_desc="FUSE union filesystem"
maintainer="Orphaned <orphan@voidlinux.org>"
license="ISC"
homepage="https://github.com/trapexit/mergerfs"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f16f7c90d9db35b9f8fadbb529c4bf0f7d65d18fd2e7443a662cbfa7a8dbd4f9
+checksum=753cee325b333eebd448795e2702f50b24b24e12a86c547fe8eceff4b3311cd4
pre_build() {
- vsed -i 's|^CXXFLAGS[[:blank:]]*=|override CXXFLAGS +=|g' Makefile
- vsed -i 's|^LDFLAGS[[:blank:]]*=|override LDFLAGS +=|g' Makefile
-
# we build from source, spoof release tarball
- echo "$version" > VERSION
- ./tools/update-version
+ vsed -i "s|^VERSION=.*|VERSION=$pkgver|" tools/update-version
}
post_install() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: mergerfs: update to 2.31.0
2020-11-13 1:01 [PR PATCH] mergerfs: update to 2.31.0 ndowens
2020-11-14 0:37 ` [PR PATCH] [Closed]: " ndowens
2020-11-14 1:19 ` [PR PATCH] [Updated] " ndowens
@ 2020-11-14 14:51 ` Hoshpak
2 siblings, 0 replies; 4+ messages in thread
From: Hoshpak @ 2020-11-14 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
There's a merged pull request on the void-packages repository
mergerfs: update to 2.31.0
https://github.com/void-linux/void-packages/pull/26340
Description:
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-14 14:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-13 1:01 [PR PATCH] mergerfs: update to 2.31.0 ndowens
2020-11-14 0:37 ` [PR PATCH] [Closed]: " ndowens
2020-11-14 1:19 ` [PR PATCH] [Updated] " ndowens
2020-11-14 14:51 ` [PR PATCH] [Merged]: " Hoshpak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).