dirkmueller/glusterfs
SHA256
1
0
Fork 0
forked from pool/glusterfs
Code Pull Requests Activity

Accepting request 559163 from filesystems

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/559163
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glusterfs?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2017-12-23 11:12:01 +00:00 committed by Git OBS Bridge
commit 3d7614f351
7 changed files with 109 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-build-restore-ability-to-control-verbosity-settings.patch Normal file
View File

@ -0,0 +1,40 @@
From d2a7297a226155ff9b0696ca04480f4e9f3bd6bc Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 14 Dec 2017 19:43:43 +0100
Subject: [PATCH] build: restore ability to control verbosity settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
References: https://github.com/gluster/glusterfs/pull/381
`make V=1` is broken — no commands are printed whatsoever. At the
same time, `make V=0` *also* is broken in that no summary lines
("CC  foo.o") are printed, either. Kill the annoying hardcoded
--quiet in configure.ac, since it seems to override everything that
automake offers.
---
configure.ac | 8 --------
1 file changed, 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 81c56d4e6..ed11f35e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,14 +25,6 @@ if make --help 2>&1 | grep -q no-print-directory; then
AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory";
fi
-if make --help 2>&1 | grep -q quiet; then
- AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet"
-fi
-
-if libtool --help 2>&1 | grep -q quiet; then
- AM_LIBTOOLFLAGS="--quiet";
-fi
-
AC_CONFIG_HEADERS([config.h site.h])
AC_CONFIG_FILES([Makefile
--
2.15.1

3
glusterfs-3.12.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3045208401b088414ea7198af3fe5ecbc6833e90f8aea68f318a0d863e76fa9d
size 7187644

3
glusterfs-3.8.15.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22c293cb5d7bb9106dccb0a8e4c446c19f014af0b2c6b37396525819288206bb
size 8570170

58
glusterfs-date.diff
View File

@ -1,58 +0,0 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-10-05 13:17:29.728670235 +0200
Upstream: hell yes
build: remove __DATE__ and __TIME__ flagged by rpmlint
glusterfs.x86_64: W: file-contains-date-and-time /usr/sbin/glusterfsd
glusterfs.x86_64: W: file-contains-date-and-time /usr/sbin/gluster
Your file uses __DATE and __TIME__ this causes the package to rebuild when
not needed
---
cli/src/cli.c | 2 +-
glusterfsd/src/glusterfsd.c | 2 +-
libglusterfs/src/graph.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Index: glusterfs-3.5.0/cli/src/cli.c
===================================================================
--- glusterfs-3.5.0.orig/cli/src/cli.c
+++ glusterfs-3.5.0/cli/src/cli.c
@@ -71,7 +71,7 @@ extern int connected;
/* using argp for command line parsing */
const char *argp_program_version = "" \
- PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ \
+ PACKAGE_NAME" "PACKAGE_VERSION \
"\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n" \
"Copyright (c) 2006-2011 Gluster Inc. " \
"<http://www.gluster.com>\n" \
Index: glusterfs-3.5.0/glusterfsd/src/glusterfsd.c
===================================================================
--- glusterfs-3.5.0.orig/glusterfsd/src/glusterfsd.c
+++ glusterfs-3.5.0/glusterfsd/src/glusterfsd.c
@@ -81,7 +81,7 @@ static char gf_doc[] = "";
static char argp_doc[] = "--volfile-server=SERVER [MOUNT-POINT]\n" \
"--volfile=VOLFILE [MOUNT-POINT]";
const char *argp_program_version = ""
- PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__
+ PACKAGE_NAME" "PACKAGE_VERSION" built on *bleep* "
"\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n"
"Copyright (c) 2006-2013 Red Hat, Inc. <http://www.redhat.com/>\n"
"GlusterFS comes with ABSOLUTELY NO WARRANTY.\n"
Index: glusterfs-3.5.0/libglusterfs/src/graph.c
===================================================================
--- glusterfs-3.5.0.orig/libglusterfs/src/graph.c
+++ glusterfs-3.5.0/libglusterfs/src/graph.c
@@ -40,8 +40,8 @@ _gf_dump_details (int argc, char **argv)
fprintf (gf_log_logfile,
"========================================"
"========================================\n");
- fprintf (gf_log_logfile, "Version : %s %s built on %s %s\n",
- PACKAGE_NAME, PACKAGE_VERSION, __DATE__, __TIME__);
+ fprintf (gf_log_logfile, "Version : %s %s\n",
+ PACKAGE_NAME, PACKAGE_VERSION);
fprintf (gf_log_logfile, "git: %s\n",
GLUSTERFS_REPOSITORY_REVISION);
fprintf (gf_log_logfile, "Starting Time: %s\n", timestr);

17
glusterfs-tirpc.diff
View File

@ -1,6 +1,17 @@
--- configure.ac
+++ configure.ac 2017/11/13 06:44:32
@@ -399,6 +399,21 @@
From: kukuk@suse.de
Date: Mon Nov 13 07:49:33 CET 2017
Fall back to libtirpc if there is no sunrpc support in glibc.
---
configure.ac | 15 +++++++++++++++
1 file changed, 15 insertions(+)
Index: glusterfs-3.12.3/configure.ac
===================================================================
--- glusterfs-3.12.3.orig/configure.ac
+++ glusterfs-3.12.3/configure.ac
@@ -431,6 +431,21 @@ AC_CHECK_HEADERS([openssl/dh.h])
AC_CHECK_HEADERS([openssl/ecdh.h])

31
glusterfs.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Thu Dec 14 18:47:07 UTC 2017 - jengelh@inai.de
- Add 0001-build-restore-ability-to-control-verbosity-settings.patch
- Replace xdr_sizeof.c with an empty file
-------------------------------------------------------------------
Mon Dec 4 14:03:38 UTC 2017 - jengelh@inai.de
- Update to new release 3.12.3
* -- Features introduced in 3.10
* Brick multiplexing
* Support to display op-version information from clients
* Support for rebalance time to completion estimation
* Separation of tier as its own service
* Statedump support for gfapi based applications
* Disabled creation of trash directory by default
* Implemented parallel readdirp with distribute xlator
* -- Features introduced in 3.12:
* Ability to mount sub-directories using the Gluster
FUSE protocol
* GFID to path conversion is enabled by default
* Provided an option to set a limit on number of bricks
multiplexed in a processes
* Enhanced the option to export statfs data for bricks
sharing the same backend filesystem
* Provided a means to resolve GFID split-brain using
the gluster CLI
* Introduction of new api glfs_fd_set_lkowner() to set lock owner
- Remove glusterfs-date.diff (no longer applies)
-------------------------------------------------------------------
Mon Nov 13 07:49:33 CET 2017 - kukuk@suse.de

56
glusterfs.spec
View File

@ -17,7 +17,7 @@
Name: glusterfs
Version: 3.8.15
Version: 3.12.3
Release: 0
Summary: Aggregating distributed file system
License: GPL-2.0 OR LGPL-3.0+
@ -25,9 +25,9 @@ Group: System/Filesystems
Url: http://www.gluster.org/
#Git-Clone: git://github.com/gluster/glusterfs
#Git-Clone: git://github.com/fvzwieten/lsgvt
Source: http://download.gluster.org/pub/gluster/glusterfs/3.8/%version/%name-%version.tar.gz
Patch: glusterfs-tirpc.diff
Patch1: glusterfs-date.diff
Source: https://download.gluster.org/pub/gluster/glusterfs/3.12/3.12.3/glusterfs-%version.tar.gz
Patch1: glusterfs-tirpc.diff
Patch2: 0001-build-restore-ability-to-control-verbosity-settings.patch
BuildRequires: acl-devel
BuildRequires: autoconf
BuildRequires: automake
@ -122,14 +122,6 @@ Group: Development/Languages/Python
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package ganesha
Summary: NFS-Ganesha configuration
Group: System/Libraries
%description ganesha
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package devel
Summary: Development files for glusterfs
Group: Development/Libraries/C and C++
@ -150,8 +142,8 @@ links.
%prep
%setup -q
%patch -p0
%patch1 -p1
%patch -P 1 -P 2 -p1
>contrib/sunrpc/xdr_sizeof.c
%build
./autogen.sh
@ -159,6 +151,7 @@ links.
--disable-static \
--disable-silent-rules
make %{?_smp_mflags}
find . -name 'xdr_sizeof*' -type f -exec ls -lgo {} + || :
%install
%make_install docdir="%_docdir/%name"
@ -176,9 +169,6 @@ install -pm0644 rpc/rpc-lib/src/*.h rpc/xdr/src/*.h \
"%buildroot/%_includedir/%name/rpc/"
install -pm0644 xlators/protocol/server/src/*.h \
"%buildroot/%_includedir/%name/server/"
# - init script; there is no SuSE-release in the build env
mkdir -p "%buildroot/%_initddir"
install -pm0755 extras/init.d/glusterd-SuSE "%buildroot/%_initddir/glusterd"
# - wrapper umount script?
# - logrotate entry
mkdir -p "%buildroot/%_localstatedir/log/%name"
@ -198,22 +188,22 @@ find %buildroot -type f -name "*.la" -delete -print
perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el
mkdir -p "%buildroot/%_unitdir"
rm -Rf "%buildroot%_initddir"
ln -s service "%buildroot%_sbindir/rcglusterd"
chmod u-s "%buildroot%_bindir/fusermount-glusterfs"
ln -s service "%buildroot/%_sbindir/rcglusterd"
chmod u-s "%buildroot/%_bindir/fusermount-glusterfs"
rm -f "%buildroot/%_sbindir/conf.py"
%fdupes %buildroot/%_prefix
%pre
%service_add_pre glusterd.service
%service_add_pre glusterd.service glustereventsd.service glusterfssharedstorage.service
%post
%service_add_post glusterd.service
%service_add_post glusterd.service glustereventsd.service glusterfssharedstorage.service
%preun
%service_del_preun glusterd.service
%service_del_preun glusterd.service glustereventsd.service glusterfssharedstorage.service
%postun
%service_del_postun glusterd.service
%service_del_postun glusterd.service glustereventsd.service glusterfssharedstorage.service
%post -n libgfapi0 -p /sbin/ldconfig
%postun -n libgfapi0 -p /sbin/ldconfig
@ -231,11 +221,13 @@ chmod u-s "%buildroot%_bindir/fusermount-glusterfs"
%files
%doc COPYING-GPLV2 COPYING-LGPLV3 ChangeLog NEWS README.md
%dir %_sysconfdir/%name
%config(noreplace) %_sysconfdir/%name/glusterd.vol
%config(noreplace) %_sysconfdir/%name/eventsconfig.json
%config(noreplace) %_sysconfdir/%name/g*lusterd.vol
%config(noreplace) %_sysconfdir/%name/glusterfs-logrotate
%config %_sysconfdir/%name/gluster-rsyslog*.conf
%config %_sysconfdir/%name/*.example
%config %_sysconfdir/%name/*-logrotate
%config %_sysconfdir/%name/group-*
%_bindir/fusermount-glusterfs
%_bindir/glusterfind
/sbin/mount.%name
@ -245,6 +237,7 @@ chmod u-s "%buildroot%_bindir/fusermount-glusterfs"
%_sbindir/glfsheal
%_sbindir/rcglusterd
%_sbindir/gcron.py
%_sbindir/gf_attach
%_sbindir/gfind_missing_files
%_sbindir/snap_scheduler.py
%_datadir/glusterfs/
@ -253,6 +246,8 @@ chmod u-s "%buildroot%_bindir/fusermount-glusterfs"
%_localstatedir/lib/glusterd
%_localstatedir/log/%name
%_unitdir/glusterd.service
%_unitdir/glustereventsd.service
%_unitdir/glusterfssharedstorage.service
%_libexecdir/ocf
%files -n libgfapi0
@ -273,20 +268,11 @@ chmod u-s "%buildroot%_bindir/fusermount-glusterfs"
%files -n libgfdb0
%_libdir/libgfdb.so.0*
%files ganesha
%dir %_sysconfdir/ganesha
%dir %_libexecdir/ganesha
%_sysconfdir/ganesha/ganesha-ha.conf.sample
%_libexecdir/ganesha/copy-export-ganesha.sh
%_libexecdir/ganesha/create-export-ganesha.sh
%_libexecdir/ganesha/dbus-send.sh
%_libexecdir/ganesha/ganesha-ha.sh
%_libexecdir/ganesha/generate-epoch.py
%files -n python-gluster
%dir %python_sitelib/gluster
%dir %python_sitelib/gluster/glupy
%python_sitelib/gluster/__init__.*
%python_sitelib/gluster/cliutils/
%python_sitelib/gluster/glupy/__init__.*
%files devel