Compare commits
15 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2bff6285ef | ||
|
|
a40663631b | ||
|
|
77fdb97a93 | ||
|
|
08fdd39e4a | ||
|
|
e6d8514877 | ||
|
|
9e2d1bd99e | ||
|
|
0a794949c8 | ||
|
|
c1384a450c | ||
|
|
a6cf2b2e3a | ||
|
|
267721b2de | ||
|
|
7b20f7a7b6 | ||
|
|
56c87a0f0d | ||
|
|
ce098d50ee | ||
|
|
49171be524 | ||
|
|
a950cb4a3d |
3 changed files with 194 additions and 12 deletions
126
0003-makefile-am-subdirs.patch
Normal file
126
0003-makefile-am-subdirs.patch
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
diff -ruN glusterfs-11.2/api/examples/Makefile.am glusterfs-11.2-mod/api/examples/Makefile.am
|
||||
--- glusterfs-11.2/api/examples/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/api/examples/Makefile.am 2025-07-02 12:31:15.002167956 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
# The bits needed for glfsxmp
|
||||
EXTRA_PROGRAMS = glfsxmp
|
||||
glfsxmp_SOURCES = glfsxmp.c
|
||||
diff -ruN glusterfs-11.2/contrib/fuse-util/Makefile.am glusterfs-11.2-mod/contrib/fuse-util/Makefile.am
|
||||
--- glusterfs-11.2/contrib/fuse-util/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/contrib/fuse-util/Makefile.am 2025-07-02 12:31:32.290546271 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
bin_PROGRAMS = fusermount-glusterfs
|
||||
|
||||
fusermount_glusterfs_SOURCES = fusermount.c mount_util.c $(CONTRIBDIR)/fuse-lib/mount-common.c
|
||||
diff -ruN glusterfs-11.2/libglusterfs/src/Makefile.am glusterfs-11.2-mod/libglusterfs/src/Makefile.am
|
||||
--- glusterfs-11.2/libglusterfs/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/libglusterfs/src/Makefile.am 2025-07-02 12:26:47.776161392 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
noinst_PYTHON = generator.py gen-defaults.py $(top_srcdir)/events/eventskeygen.py
|
||||
|
||||
libglusterfs_la_CFLAGS = $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \
|
||||
diff -ruN glusterfs-11.2/xlators/cluster/afr/src/Makefile.am glusterfs-11.2-mod/xlators/cluster/afr/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/cluster/afr/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/cluster/afr/src/Makefile.am 2025-07-02 12:26:21.567940962 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
xlator_LTLIBRARIES = afr.la
|
||||
xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
|
||||
|
||||
diff -ruN glusterfs-11.2/xlators/cluster/dht/src/Makefile.am glusterfs-11.2-mod/xlators/cluster/dht/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/cluster/dht/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/cluster/dht/src/Makefile.am 2025-07-02 12:26:07.943843179 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
xlator_LTLIBRARIES = dht.la nufa.la switch.la
|
||||
|
||||
AM_CFLAGS = -Wall $(GF_CFLAGS)
|
||||
diff -ruN glusterfs-11.2/xlators/cluster/ec/src/Makefile.am glusterfs-11.2-mod/xlators/cluster/ec/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/cluster/ec/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/cluster/ec/src/Makefile.am 2025-07-02 12:25:45.287655225 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
xlator_LTLIBRARIES = ec.la
|
||||
xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
|
||||
|
||||
diff -ruN glusterfs-11.2/xlators/features/changelog/lib/src/Makefile.am glusterfs-11.2-mod/xlators/features/changelog/lib/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/features/changelog/lib/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/features/changelog/lib/src/Makefile.am 2025-07-02 12:25:15.015401482 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
libgfchangelog_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \
|
||||
-DDATADIR=\"$(localstatedir)\"
|
||||
|
||||
diff -ruN glusterfs-11.2/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am glusterfs-11.2-mod/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am 2025-07-02 12:24:16.783001896 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
csp_LTLIBRARIES = cloudsyncs3.la
|
||||
cspdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/cloudsync-plugins
|
||||
|
||||
diff -ruN glusterfs-11.2/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am glusterfs-11.2-mod/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am 2025-07-02 12:24:00.726984102 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
csp_LTLIBRARIES = cloudsynccvlt.la
|
||||
cspdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/cloudsync-plugins
|
||||
|
||||
diff -ruN glusterfs-11.2/xlators/features/cloudsync/src/Makefile.am glusterfs-11.2-mod/xlators/features/cloudsync/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/features/cloudsync/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/features/cloudsync/src/Makefile.am 2025-07-02 12:24:45.054966491 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
SUBDIRS = cloudsync-plugins
|
||||
|
||||
xlator_LTLIBRARIES = cloudsync.la
|
||||
diff -ruN glusterfs-11.2/xlators/features/thin-arbiter/src/Makefile.am glusterfs-11.2-mod/xlators/features/thin-arbiter/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/features/thin-arbiter/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/features/thin-arbiter/src/Makefile.am 2025-07-02 12:22:10.366019070 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
xlator_LTLIBRARIES = thin-arbiter.la
|
||||
|
||||
xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
|
||||
diff -ruN glusterfs-11.2/xlators/features/utime/src/Makefile.am glusterfs-11.2-mod/xlators/features/utime/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/features/utime/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/features/utime/src/Makefile.am 2025-07-02 12:21:54.421923762 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
xlator_LTLIBRARIES = utime.la
|
||||
xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
|
||||
|
||||
diff -ruN glusterfs-11.2/xlators/mgmt/glusterd/src/Makefile.am glusterfs-11.2-mod/xlators/mgmt/glusterd/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/mgmt/glusterd/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/mgmt/glusterd/src/Makefile.am 2025-07-02 12:20:49.141466838 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
if WITH_SERVER
|
||||
xlator_LTLIBRARIES = glusterd.la
|
||||
endif
|
||||
diff -ruN glusterfs-11.2/xlators/mount/fuse/src/Makefile.am glusterfs-11.2-mod/xlators/mount/fuse/src/Makefile.am
|
||||
--- glusterfs-11.2/xlators/mount/fuse/src/Makefile.am 2025-06-10 16:27:14.000000000 +0300
|
||||
+++ glusterfs-11.2-mod/xlators/mount/fuse/src/Makefile.am 2025-07-02 12:19:50.029047303 +0300
|
||||
@@ -1,3 +1,5 @@
|
||||
+AUTOMAKE_OPTIONS = subdir-objects
|
||||
+
|
||||
noinst_HEADERS_linux = $(CONTRIBDIR)/fuse-include/fuse_kernel.h\
|
||||
$(CONTRIBDIR)/fuse-include/mount_util.h\
|
||||
$(CONTRIBDIR)/fuse-lib/mount-gluster-compat.h
|
||||
|
|
@ -195,17 +195,17 @@
|
|||
Summary: Distributed File System
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
Name: glusterfs
|
||||
Version: 11.1
|
||||
Release: 1%{?prereltag:%{prereltag}}%{?dist}
|
||||
Version: 11.2
|
||||
Release: 4%{?prereltag:%{prereltag}}%{?dist}
|
||||
%else
|
||||
Name: @PACKAGE_NAME@
|
||||
Version: @PACKAGE_VERSION@
|
||||
Release: 0.@PACKAGE_RELEASE@%{?dist}.15
|
||||
Release: 0.@PACKAGE_RELEASE@%{?dist}.26
|
||||
%endif
|
||||
License: GPL-2.0-only OR LGPL-3.0-or-later
|
||||
URL: http://docs.gluster.org/
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
Source0: http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-%{version}%{?prereltag}.tar.gz
|
||||
Source0: http://github.com/gluster/glusterfs/archive/v%{version}%{?prereltag}/glusterfs-%{version}%{?prereltag}.tar.gz
|
||||
Source1: glusterd.sysconfig
|
||||
Source2: glusterfsd.sysconfig
|
||||
Source7: glusterfsd.service
|
||||
|
|
@ -215,8 +215,8 @@ Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
|
|||
%endif
|
||||
Patch0001: 0001-configure.ac.patch
|
||||
Patch0002: 0002-contrib-aclocal-python.m4.patch
|
||||
Patch0003: 0003-makefile-am-subdirs.patch
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
BuildRequires: systemd
|
||||
|
||||
%if 0%{!?_without_tcmalloc:1}
|
||||
|
|
@ -312,6 +312,13 @@ BuildRequires: pkgconfig(bash-completion)
|
|||
%endif
|
||||
Requires: libglusterfs0%{?_isa} = %{version}-%{release}
|
||||
|
||||
%if "%{_sbindir}" == "%{_bindir}"
|
||||
# Compat symlinks for Requires in other packages.
|
||||
# We rely on filesystem to create the symlinks for us.
|
||||
Requires: filesystem(unmerged-sbin-symlinks)
|
||||
Provides: /usr/sbin/gluster
|
||||
%endif
|
||||
|
||||
%description cli
|
||||
GlusterFS is a distributed file-system capable of scaling to several
|
||||
petabytes. It aggregates various storage bricks over TCP/IP interconnect
|
||||
|
|
@ -807,6 +814,7 @@ This package provides the glusterfs thin-arbiter translator.
|
|||
%patch 0001 -p1
|
||||
%endif
|
||||
%patch 0002 -p1
|
||||
%patch 0003 -p1
|
||||
%if ( ! %{_usepython3} )
|
||||
echo "fixing python shebangs..."
|
||||
for f in api events extras geo-replication libglusterfs tools xlators; do
|
||||
|
|
@ -814,12 +822,19 @@ find $f -type f -exec sed -i 's|/usr/bin/python3|/usr/bin/python2|' {} \;
|
|||
done
|
||||
%endif
|
||||
|
||||
# Create a sysusers.d config file
|
||||
cat >glusterfs.sysusers.conf <<EOF
|
||||
u gluster - 'GlusterFS daemons' %{_rundir}/gluster -
|
||||
EOF
|
||||
|
||||
%build
|
||||
%ifarch armv7hl
|
||||
%set_build_flags
|
||||
export CFLAGS="$(echo $CFLAGS) -DUATOMIC_NO_LINK_ERROR"
|
||||
%endif
|
||||
sed -i -e 's/--quiet//' configure.ac
|
||||
echo "v%{version}-0" > VERSION
|
||||
cat VERSION
|
||||
./autogen.sh && %configure \
|
||||
%{?_with_asan} \
|
||||
%{?_with_cmocka} \
|
||||
|
|
@ -967,6 +982,9 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid
|
|||
find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs
|
||||
%endif
|
||||
|
||||
# Fix installation paths
|
||||
mv -v %{buildroot}/sbin/* %{buildroot}%{_sbindir}/
|
||||
|
||||
%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
|
||||
%if "%{bashcompdir}" == ""
|
||||
%global bashcompdir ${sysconfdir}/bash_completion.d
|
||||
|
|
@ -974,6 +992,8 @@ find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glus
|
|||
|
||||
##-----------------------------------------------------------------------------
|
||||
## All package definitions should be placed here in alphabetical order
|
||||
|
||||
install -m0644 -D glusterfs.sysusers.conf %{buildroot}%{_sysusersdir}/glusterfs.conf
|
||||
##
|
||||
%post
|
||||
%{?ldconfig}
|
||||
|
|
@ -1108,10 +1128,6 @@ exit 0
|
|||
## All package definitions should be placed here in alphabetical order
|
||||
##
|
||||
%pre
|
||||
getent group gluster > /dev/null || groupadd -r gluster
|
||||
getent passwd gluster > /dev/null || useradd -r -g gluster -d %{_rundir}/gluster -s /sbin/nologin -c "GlusterFS daemons" gluster
|
||||
exit 0
|
||||
|
||||
##-----------------------------------------------------------------------------
|
||||
## All package definitions should be placed here in alphabetical order
|
||||
##
|
||||
|
|
@ -1281,6 +1297,7 @@ exit 0
|
|||
%exclude %{_libexecdir}/ganesha/*
|
||||
%exclude %{_prefix}/lib/ocf/resource.d/heartbeat/*
|
||||
%endif
|
||||
%{_sysusersdir}/glusterfs.conf
|
||||
|
||||
%files cli
|
||||
%{_sbindir}/gluster
|
||||
|
|
@ -1354,7 +1371,7 @@ exit 0
|
|||
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs
|
||||
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount
|
||||
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so
|
||||
/sbin/mount.glusterfs
|
||||
%{_sbindir}/mount.glusterfs
|
||||
%if ( 0%{!?_without_fusermount:1} )
|
||||
%{_bindir}/fusermount-glusterfs
|
||||
%endif
|
||||
|
|
@ -1625,7 +1642,46 @@ exit 0
|
|||
%{_unitdir}/gluster-ta-volume.service
|
||||
|
||||
%changelog
|
||||
* Mon Nov 6 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 11.1-0
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 11.2-4
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
|
||||
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 11.2-3
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Wed Jul 02 2025 Benson Muite <fed500@fedoraproject.org> - 11.2-1
|
||||
- Update to latest release
|
||||
|
||||
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 11.1-10
|
||||
- Rebuilt for Python 3.14
|
||||
|
||||
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 11.1-9
|
||||
- Add sysusers.d config file to allow rpm to create users/groups automatically
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 11.1-7
|
||||
- Rebuilt for the bin-sbin merge (2nd attempt)
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 11.1-5
|
||||
- Rebuilt for the bin-sbin merge
|
||||
|
||||
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 11.1-4
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 11.1-2
|
||||
- rebuild with gcc-14
|
||||
|
||||
* Mon Nov 6 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 11.1-1
|
||||
- glusterfs 11.1 GA
|
||||
|
||||
* Thu Oct 5 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 11.0-6
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (glusterfs-11.1.tar.gz) = a021a612b01c2c43858b092db926e6d229f0f736c19b8a1015c0d3121fbc7739ab5273384d5e96fde6dbf4eaf620bc32a0530597e80483865d8ca79b820ed3b0
|
||||
SHA512 (glusterfs-11.2.tar.gz) = 6ac463047c5b1fee1d00ca9d6c16169762ed31c7d3b8dfb341bb8a90b83c15fdd9d48ebbe6cf79eee885f764cfa5391f4107837764c0a182eff1b51bede63d48
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue