Compare commits
17 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
6a1525fbf7 | ||
|
9f2e6e6d53 | ||
|
caff708532 | ||
|
01f28a2fe8 | ||
|
bc76aae431 | ||
|
e38b5d9090 | ||
|
ab7715dde5 | ||
|
339b8f56ae | ||
|
00aabf1508 | ||
|
dbe1d25f4e | ||
|
b0ec49b308 | ||
|
01a6d6c896 | ||
|
7fd240c1e1 | ||
|
185eb8e220 | ||
|
3c090f5529 | ||
|
98055cc12e | ||
|
c6a02bb3c9 |
13
.gitignore
vendored
13
.gitignore
vendored
@ -3,3 +3,16 @@
|
|||||||
/btrfs-progs-v3.14.tar.xz
|
/btrfs-progs-v3.14.tar.xz
|
||||||
/btrfs-progs-v3.14.1.tar.xz
|
/btrfs-progs-v3.14.1.tar.xz
|
||||||
/btrfs-progs-v3.14.2.tar.xz
|
/btrfs-progs-v3.14.2.tar.xz
|
||||||
|
/btrfs-progs-v3.16.tar.xz
|
||||||
|
/btrfs-progs-v3.16.2.tar.xz
|
||||||
|
/btrfs-progs-v3.17.tar.xz
|
||||||
|
/btrfs-progs-v3.17.2.tar.xz
|
||||||
|
/btrfs-progs-v3.17.3.tar.xz
|
||||||
|
/btrfs-progs-v3.18.tar.xz
|
||||||
|
/btrfs-progs-v3.18.1.tar.xz
|
||||||
|
/btrfs-progs-v3.18.2.tar.xz
|
||||||
|
/btrfs-progs-v3.19.tar.xz
|
||||||
|
/btrfs-progs-v3.19.1.tar.xz
|
||||||
|
/btrfs-progs-v4.0.tar.xz
|
||||||
|
/btrfs-progs-v4.1.tar.xz
|
||||||
|
/btrfs-progs-v4.1.2.tar.xz
|
||||||
|
26
btrfs-mkfs-missing-exit.patch
Normal file
26
btrfs-mkfs-missing-exit.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
commit 4add89acc9cb0786aa123af4f33b6e45c724dca0
|
||||||
|
Author: Qu Wenruo <quwenruo@cn.fujitsu.com>
|
||||||
|
Date: Wed Jul 29 10:28:17 2015 +0800
|
||||||
|
|
||||||
|
btrfs-progs: Add missing exit for parse_profile function
|
||||||
|
|
||||||
|
In parse_profile() function, in error handling route, it output error
|
||||||
|
message but forgot to exit(1), causing even profile is not valid, it
|
||||||
|
will just fallback to single.
|
||||||
|
|
||||||
|
Reported-by: James Harvey <jamespharvey20@gmail.com>
|
||||||
|
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
|
||||||
|
Signed-off-by: David Sterba <dsterba@suse.com>
|
||||||
|
|
||||||
|
diff --git a/mkfs.c b/mkfs.c
|
||||||
|
index 9073f87..7d635dc 100644
|
||||||
|
--- a/mkfs.c
|
||||||
|
+++ b/mkfs.c
|
||||||
|
@@ -356,6 +356,7 @@ static u64 parse_profile(char *s)
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, "Unknown profile %s\n", s);
|
||||||
|
+ exit(1);
|
||||||
|
}
|
||||||
|
/* not reached */
|
||||||
|
return 0;
|
@ -1,21 +1,23 @@
|
|||||||
Name: btrfs-progs
|
Name: btrfs-progs
|
||||||
Version: 3.14.2
|
Version: 4.1.2
|
||||||
Release: 4%{?dist}
|
release: 1%{?dist}
|
||||||
Summary: Userspace programs for btrfs
|
Summary: Userspace programs for btrfs
|
||||||
|
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: http://btrfs.wiki.kernel.org/index.php/Main_Page
|
URL: http://btrfs.wiki.kernel.org/index.php/Main_Page
|
||||||
Source0: https://www.kernel.org/pub/linux/kernel/people/mason/%{name}/%{name}-v%{version}.tar.xz
|
Source0: https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version}.tar.xz
|
||||||
|
|
||||||
# Valgrind patch no longer applied, but kept for posterity
|
# Patches no longer applied, but kept for posterity
|
||||||
# Still must reverse-engineer fixes in there and get upstream
|
# Still must reverse-engineer fixes in there and get upstream
|
||||||
Patch0: btrfs-progs-valgrind.patch
|
Patch0: btrfs-progs-valgrind.patch
|
||||||
Patch1: btrfs-init-dev-list.patch
|
Patch1: btrfs-init-dev-list.patch
|
||||||
Patch2: btrfs-progs-3.14.2-mkfs-set-uuid.patch
|
# Applied
|
||||||
|
Patch2: btrfs-mkfs-missing-exit.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
BuildRequires: autoconf, automake
|
||||||
BuildRequires: e2fsprogs-devel, libuuid-devel, zlib-devel
|
BuildRequires: e2fsprogs-devel, libuuid-devel, zlib-devel
|
||||||
BuildRequires: libacl-devel, libblkid-devel, lzo-devel
|
BuildRequires: libacl-devel, libblkid-devel, lzo-devel
|
||||||
BuildRequires: asciidoc, xmlto
|
BuildRequires: asciidoc, xmlto
|
||||||
@ -40,11 +42,13 @@ btrfs filesystem-specific programs.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-v%{version}
|
%setup -q -n %{name}-v%{version}
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?_smp_mflags}
|
./autogen.sh
|
||||||
|
%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -65,12 +69,14 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_sbindir}/btrfs-debug-tree
|
%{_sbindir}/btrfs-debug-tree
|
||||||
%{_sbindir}/btrfs-image
|
%{_sbindir}/btrfs-image
|
||||||
%{_sbindir}/btrfs-convert
|
%{_sbindir}/btrfs-convert
|
||||||
|
%{_sbindir}/btrfs-select-super
|
||||||
%{_sbindir}/btrfstune
|
%{_sbindir}/btrfstune
|
||||||
%{_sbindir}/btrfs
|
%{_sbindir}/btrfs
|
||||||
%{_sbindir}/btrfs-map-logical
|
%{_sbindir}/btrfs-map-logical
|
||||||
%{_sbindir}/btrfs-zero-log
|
%{_sbindir}/btrfs-zero-log
|
||||||
%{_sbindir}/btrfs-find-root
|
%{_sbindir}/btrfs-find-root
|
||||||
%{_sbindir}/btrfs-show-super
|
%{_sbindir}/btrfs-show-super
|
||||||
|
%{_mandir}/man5/*.gz
|
||||||
%{_mandir}/man8/*.gz
|
%{_mandir}/man8/*.gz
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
@ -78,6 +84,53 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/libbtrfs.so
|
%{_libdir}/libbtrfs.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 06 2015 Eric Sandeen <sandeen@redhat.com> 4.1.2-1
|
||||||
|
- New upstream release
|
||||||
|
- Fix to reject unknown mkfs options (#1246468)
|
||||||
|
|
||||||
|
* Mon Jun 22 2015 Eric Sandeen <sandeen@redhat.com> 4.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 20 2015 Eric Sandeen <sandeen@redhat.com> 4.0.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Apr 29 2015 Eric Sandeen <sandeen@redhat.com> 4.0-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Mar 26 2015 Eric Sandeen <sandeen@redhat.com> 3.19.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Mar 11 2015 Eric Sandeen <sandeen@redhat.com> 3.19-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Tue Jan 27 2015 Eric Sandeen <sandeen@redhat.com> 3.18.2-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Jan 12 2015 Eric Sandeen <sandeen@redhat.com> 3.18.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Jan 02 2015 Eric Sandeen <sandeen@redhat.com> 3.18-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Dec 05 2014 Eric Sandeen <sandeen@redhat.com> 3.17.3-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Nov 21 2014 Eric Sandeen <sandeen@redhat.com> 3.17.2-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Oct 20 2014 Eric Sandeen <sandeen@redhat.com> 3.17-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Oct 03 2014 Eric Sandeen <sandeen@redhat.com> 3.16.2-1
|
||||||
|
- New upstream release
|
||||||
|
- Update upstream source location
|
||||||
|
|
||||||
|
* Wed Aug 27 2014 Eric Sandeen <sandeen@redhat.com> 3.16-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.14.2-4
|
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.14.2-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
@ -90,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
* Fri May 30 2014 Eric Sandeen <sandeen@redhat.com> 3.14.2-1
|
* Fri May 30 2014 Eric Sandeen <sandeen@redhat.com> 3.14.2-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
* Mon Apr 22 2014 Eric Sandeen <sandeen@redhat.com> 3.14.1-1
|
* Tue Apr 22 2014 Eric Sandeen <sandeen@redhat.com> 3.14.1-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
* Wed Apr 16 2014 Eric Sandeen <sandeen@redhat.com> 3.14-1
|
* Wed Apr 16 2014 Eric Sandeen <sandeen@redhat.com> 3.14-1
|
||||||
|
Loading…
Reference in New Issue
Block a user