diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2017-09-07 01:11:37 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-09-30 14:24:44 +0200 |
| commit | 8f4084004e24bdd056e4161b6c92407ba18affaa (patch) | |
| tree | 92f28f0b75fc839fcf4d9fecd2b12c7e19b6fbff /pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch | |
| parent | 74db6fabcbae46a4c79cd4025ebac2032679db1c (diff) | |
| download | nixlib-8f4084004e24bdd056e4161b6c92407ba18affaa.tar nixlib-8f4084004e24bdd056e4161b6c92407ba18affaa.tar.gz nixlib-8f4084004e24bdd056e4161b6c92407ba18affaa.tar.bz2 nixlib-8f4084004e24bdd056e4161b6c92407ba18affaa.tar.lz nixlib-8f4084004e24bdd056e4161b6c92407ba18affaa.tar.xz nixlib-8f4084004e24bdd056e4161b6c92407ba18affaa.tar.zst nixlib-8f4084004e24bdd056e4161b6c92407ba18affaa.zip | |
glusterfs: 3.10.2 -> 3.12.1
Changes: * The patch `glusterfs-fix-unsubstituted-autoconf-macros` was deleted because the issue was fixed upstream: https://bugzilla.redhat.com/show_bug.cgi?id=1450588 * The `glusterd-ganesha.c` part of `glusterfs-use-PATH-instead-of-hardcodes` was detleted because `glusterd-ganesha.c` was removed upstream without replacement that has the relevant hardcoded paths. Closes https://github.com/NixOS/nixpkgs/pull/29062
Diffstat (limited to 'pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch')
| -rw-r--r-- | pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch index 8a3da0d6db76..f679fb8f4c1b 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch @@ -1,27 +1,27 @@ -From 965eb1e08e10ff82bb91d485dc24672acc7c72cf Mon Sep 17 00:00:00 2001 +From f523afac49e24ecc0fa4ad85195135689cf445f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Fri, 8 Sep 2017 00:51:53 +0200 +Date: Wed, 27 Sep 2017 21:36:41 +0200 Subject: [PATCH] Fix "glusterfind saves var data under $prefix instead of localstatedir". Fixes #1489610 -Change-Id: I6d71297fb7a5a9d12cc3726b4a4ad94efcd644f9 +Change-Id: Id2362c20f34346c37acfb9eb1ad105d0b7b8b60f --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 0c3a38689..d508fda71 100644 +index f87d8a454..b4d3f5d10 100644 --- a/configure.ac +++ b/configure.ac -@@ -1057,7 +1057,7 @@ if test "x$prefix" = xNONE; then - prefix=$ac_default_prefix +@@ -1118,7 +1118,7 @@ if test "x$exec_prefix" = xNONE; then + exec_prefix="$(eval echo $prefix)" fi - GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs" + GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" -GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" +GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd" prefix=$old_prefix + exec_prefix=$old_exec_prefix - ### Dirty hacky stuff to make LOCALSTATEDIR work -- 2.12.0 |