Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
Jonathan Dieter | 0624af153f | |
Jonathan Dieter | 1e1524a121 | |
Jonathan Dieter | bce5824c5c |
|
@ -3,3 +3,4 @@
|
||||||
/lizardfs-3.11.2.tar.gz
|
/lizardfs-3.11.2.tar.gz
|
||||||
/lizardfs-3.11.3.tar.gz
|
/lizardfs-3.11.3.tar.gz
|
||||||
/lizardfs-3.12.0.tar.gz
|
/lizardfs-3.12.0.tar.gz
|
||||||
|
/lizardfs-3.13.0-rc1.tar.gz
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
From 05a3396180c170c6de2b6841f16852d0673090ca Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jonathan Dieter <jdieter@gmail.com>
|
||||||
|
Date: Fri, 10 Aug 2018 09:58:34 +0200
|
||||||
|
Subject: [PATCH] Fix 32-bit build for mfsmount3
|
||||||
|
|
||||||
|
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
|
||||||
|
---
|
||||||
|
src/mount/lizard_client.h | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/mount/lizard_client.h b/src/mount/lizard_client.h
|
||||||
|
index 0c08b7fc..20928d77 100644
|
||||||
|
--- a/src/mount/lizard_client.h
|
||||||
|
+++ b/src/mount/lizard_client.h
|
||||||
|
@@ -249,7 +249,11 @@ struct EntryParam {
|
||||||
|
}
|
||||||
|
|
||||||
|
Inode ino;
|
||||||
|
+#if FUSE_USE_VERSION >= 30
|
||||||
|
+ uint64_t generation;
|
||||||
|
+#else
|
||||||
|
unsigned long generation;
|
||||||
|
+#endif
|
||||||
|
struct stat attr;
|
||||||
|
double attr_timeout;
|
||||||
|
double entry_timeout;
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
Name: lizardfs
|
Name: lizardfs
|
||||||
Summary: Distributed, fault tolerant file system
|
Summary: Distributed, fault tolerant file system
|
||||||
Version: 3.12.0
|
Version: 3.13.0
|
||||||
Release: 8%{?dist}
|
Release: 0.rc1r1%{?dist}
|
||||||
# LizardFS is under GPLv3 while crcutil is under ASL 2.0 and there's one header,
|
# LizardFS is under GPLv3 while crcutil is under ASL 2.0 and there's one header,
|
||||||
# src/common/coroutine.h, under the Boost license
|
# src/common/coroutine.h, under the Boost license
|
||||||
License: GPLv3 and ASL 2.0 and Boost
|
License: GPLv3 and ASL 2.0 and Boost
|
||||||
URL: http://www.lizardfs.org/
|
URL: http://www.lizardfs.org/
|
||||||
Source: https://github.com/lizardfs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
#Source: https://github.com/lizardfs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
Source: %{name}-%{version}-rc1.tar.gz
|
||||||
Source1: pam-lizardfs
|
Source1: pam-lizardfs
|
||||||
Source2: 95-lizardfs.conf
|
Source2: 95-lizardfs.conf
|
||||||
# Use spdlog system library if available
|
# Use spdlog system library if available
|
||||||
|
@ -14,9 +15,12 @@ Patch0: 0001-Put-customized-spdlog-in-source-so-we-don-t-download.patch
|
||||||
# Fix for building with GCC 8
|
# Fix for building with GCC 8
|
||||||
# See https://github.com/lizardfs/lizardfs/pull/677
|
# See https://github.com/lizardfs/lizardfs/pull/677
|
||||||
Patch1: 0001-Add-missing-header.patch
|
Patch1: 0001-Add-missing-header.patch
|
||||||
|
# Fix for building fuse3 client on 32-bit platforms
|
||||||
|
Patch2: 0001-Fix-32-bit-build-for-mfsmount3.patch
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: fuse-devel
|
BuildRequires: fuse3-devel
|
||||||
|
BuildRequires: fuse-devel
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
@ -77,6 +81,16 @@ Group: System Environment/Daemons
|
||||||
LizardFS data server.
|
LizardFS data server.
|
||||||
|
|
||||||
|
|
||||||
|
%package uraft
|
||||||
|
Summary: LizardFS uRaft server
|
||||||
|
Group: System Environment/Daemons
|
||||||
|
Requires: lizardfs-master = %{version}-%{release}
|
||||||
|
%{?systemd_requires}
|
||||||
|
|
||||||
|
%description uraft
|
||||||
|
Package to automatically select which metadata server to make master
|
||||||
|
|
||||||
|
|
||||||
%package client
|
%package client
|
||||||
Summary: LizardFS client
|
Summary: LizardFS client
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
@ -186,11 +200,24 @@ exit 0
|
||||||
%systemd_postun_with_restart lizardfs-cgiserv.service
|
%systemd_postun_with_restart lizardfs-cgiserv.service
|
||||||
|
|
||||||
|
|
||||||
|
# Scriptlets - uRaft
|
||||||
|
############################################################
|
||||||
|
|
||||||
|
%post uraft
|
||||||
|
%systemd_post lizardfs-uraft.service lizardfs-ha-master.service
|
||||||
|
|
||||||
|
%preun uraft
|
||||||
|
%systemd_preun lizardfs-uraft.service lizardfs-ha-master.service
|
||||||
|
|
||||||
|
%postun uraft
|
||||||
|
%systemd_postun_with_restart lizardfs-uraft.service lizardfs-ha-master.service
|
||||||
|
|
||||||
|
|
||||||
# Prep, build, install, files...
|
# Prep, build, install, files...
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1 -n lizardfs-3.13.0-rc1
|
||||||
|
|
||||||
# Remove /usr/bin/env from bash scripts
|
# Remove /usr/bin/env from bash scripts
|
||||||
for i in src/tools/mfstools.sh src/master/mfsrestoremaster.in \
|
for i in src/tools/mfstools.sh src/master/mfsrestoremaster.in \
|
||||||
|
@ -315,12 +342,26 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/limits.d/95-lizardf
|
||||||
%config(noreplace) %{_sysconfdir}/security/limits.d/95-lizardfs.conf
|
%config(noreplace) %{_sysconfdir}/security/limits.d/95-lizardfs.conf
|
||||||
|
|
||||||
|
|
||||||
|
%files uraft
|
||||||
|
%doc NEWS README.md UPGRADE
|
||||||
|
%license COPYING
|
||||||
|
%{_sbindir}/lizardfs-uraft
|
||||||
|
%{_sbindir}/lizardfs-uraft-helper
|
||||||
|
%{_mandir}/man5/lizardfs-uraft.cfg.5*
|
||||||
|
%{_mandir}/man8/lizardfs-uraft-helper.8*
|
||||||
|
%{_mandir}/man8/lizardfs-uraft.8*
|
||||||
|
%{_unitdir}/lizardfs-uraft.service
|
||||||
|
%{_unitdir}/lizardfs-ha-master.service
|
||||||
|
%config %{liz_confdir}/lizardfs-uraft.cfg.dist
|
||||||
|
|
||||||
|
|
||||||
%files client
|
%files client
|
||||||
%doc NEWS README.md UPGRADE
|
%doc NEWS README.md UPGRADE
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%{_bindir}/lizardfs
|
%{_bindir}/lizardfs
|
||||||
%{_bindir}/mfstools.sh
|
%{_bindir}/mfstools.sh
|
||||||
%{_bindir}/mfsmount
|
%{_bindir}/mfsmount
|
||||||
|
%{_bindir}/mfsmount3
|
||||||
%{_bindir}/mfsappendchunks
|
%{_bindir}/mfsappendchunks
|
||||||
%{_bindir}/mfscheckfile
|
%{_bindir}/mfscheckfile
|
||||||
%{_bindir}/mfsdeleattr
|
%{_bindir}/mfsdeleattr
|
||||||
|
@ -406,6 +447,19 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/limits.d/95-lizardf
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 10 2018 Jonathan Dieter <jdieter@gmail.com> - 3.13.0.0.rc1r1
|
||||||
|
- Fix 32-bit builds
|
||||||
|
|
||||||
|
* Thu Aug 09 2018 Jonathan Dieter <jdieter@gmail.com> - 3.13.0-0.rc1.1
|
||||||
|
- Fix fuse requires
|
||||||
|
|
||||||
|
* Wed Jul 18 2018 Jonathan Dieter <jdieter@gmail.com> - 3.13.0-0.rc1
|
||||||
|
- uRaft HA
|
||||||
|
- Fixes to EC handling
|
||||||
|
- Reduced number of secondary groups retrievals (better performance)
|
||||||
|
- Switch to fuse3 client (better performance, writeback cache)
|
||||||
|
- Bugfixes
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-8
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-8
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (lizardfs-3.12.0.tar.gz) = 0136114266dfadcf8e2205bfd19f50ee201566958fba1dc97d4a238ed63ca91dc2cd6352f25d911f4410b0fbd59846f54206da773789d5b959c8c02bde5adf20
|
SHA512 (lizardfs-3.13.0-rc1.tar.gz) = e2b0cfa217d1f6e1e8a94d8db5cc2b55f20cebb03ddf87584259fdddb2ed68b08e2765ad48294c64c75c73f9b9a40f57ad23a35a8f57a54d0a0915657623930d
|
||||||
|
|
Loading…
Reference in New Issue