[btrfs-progs/f20] new upstream snapshot
Eric Sandeen
sandeen at fedoraproject.org
Tue Sep 17 22:28:03 UTC 2013
commit 3344acee033442ac020238240dfc8602326d2fe2
Author: Eric Sandeen <sandeen at redhat.com>
Date: Tue Sep 17 17:27:41 2013 -0500
new upstream snapshot
...t-SONAME-to-libbtrfs.so.0-instead-of-libb.patch | 15 ++++++++-------
btrfs-init-dev-list.patch | 9 ---------
btrfs-progs.spec | 13 ++++++-------
sources | 2 +-
4 files changed, 15 insertions(+), 24 deletions(-)
---
diff --git a/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch b/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
index e3e1ccc..75d8310 100644
--- a/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
+++ b/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
@@ -9,19 +9,20 @@ Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
+
+
diff --git a/Makefile b/Makefile
-index 9c195b3..d2c2e28 100644
+index da7438e..0446836 100644
--- a/Makefile
+++ b/Makefile
-@@ -93,7 +93,7 @@ version.h:
-
+@@ -100,7 +100,7 @@ version.h:
$(libs_shared): $(libbtrfs_objects) $(lib_links) send.h
@echo " [LD] $@"
-- $(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(lib_LIBS) -shared -Wl,-soname,libbtrfs.so -o libbtrfs.so.0.1
-+ $(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(lib_LIBS) -shared -Wl,-soname,libbtrfs.so.0 -o libbtrfs.so.0.1
+ $(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(LDFLAGS) $(lib_LIBS) \
+- -shared -Wl,-soname,libbtrfs.so -o libbtrfs.so.0.1
++ -shared -Wl,-soname,libbtrfs.so.0 -o libbtrfs.so.0.1
$(libs_static): $(libbtrfs_objects)
@echo " [AR] $@"
---
-1.8.1.4
+
diff --git a/btrfs-init-dev-list.patch b/btrfs-init-dev-list.patch
index 80c0959..2dd40fc 100644
--- a/btrfs-init-dev-list.patch
+++ b/btrfs-init-dev-list.patch
@@ -2,15 +2,6 @@ diff --git a/utils.c b/utils.c
index a5ffb62..f6686c6 100644
--- a/utils.c
+++ b/utils.c
-@@ -476,7 +476,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
- u64 num_devs;
- int ret;
-
-- device = kmalloc(sizeof(*device), GFP_NOFS);
-+ device = kzalloc(sizeof(*device), GFP_NOFS);
- if (!device)
- return -ENOMEM;
- buf = kmalloc(sectorsize, GFP_NOFS);
@@ -502,6 +502,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
device->bytes_used = 0;
device->total_ios = 0;
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 5eb46ea..5210350 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,6 +1,6 @@
Name: btrfs-progs
-Version: 0.20.rc1.20130501git7854c8b
-Release: 4%{?dist}
+Version: 0.20.rc1.20130917git194aa4a
+Release: 1%{?dist}
Summary: Userspace programs for btrfs
Group: System Environment/Base
@@ -63,13 +63,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libbtrfs.so.0*
-%{_sbindir}/btrfsctl
%{_sbindir}/btrfsck
%{_sbindir}/mkfs.btrfs
%{_sbindir}/btrfs-debug-tree
%{_sbindir}/btrfs-image
-%{_sbindir}/btrfs-show
-%{_sbindir}/btrfs-vol
%{_sbindir}/btrfs-convert
%{_sbindir}/btrfstune
%{_sbindir}/btrfs
@@ -78,9 +75,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/btrfs-find-root
%{_sbindir}/btrfs-show-super
%{_mandir}/man8/btrfs-image.8.gz
-%{_mandir}/man8/btrfs-show.8.gz
%{_mandir}/man8/btrfsck.8.gz
-%{_mandir}/man8/btrfsctl.8.gz
%{_mandir}/man8/mkfs.btrfs.8.gz
%{_mandir}/man8/btrfs.8.gz
@@ -89,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libbtrfs.so
%changelog
+* Tue Sep 17 2013 Eric Sandeen <sandeen at redhat.com> 0.20.rc1.20130917git194aa4a-1
+- New upstream snapshot
+- Deprecated btrfsctl, btrfs-show, and btrfs-vol; still available in btrfs cmd
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.rc1.20130501git7854c8b-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 7e1fa98..891cb81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-369a2c8bbda6cd2e34240b96c357ab01 btrfs-progs-0.20.rc1.20130501git7854c8b.tar.bz2
+79b621a10c7fb99a2aadadc26106a3bc btrfs-progs-0.20.rc1.20130917git194aa4a.tar.bz2
More information about the scm-commits
mailing list