Accepting request 594057 from filesystems
OBS-URL: https://build.opensuse.org/request/show/594057 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=94
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
6c49fa3c8f
36
0001-btrfs-progs-build-fix-static-build.patch
Normal file
36
0001-btrfs-progs-build-fix-static-build.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 9ee71d74d9ed339b6c7a886125d57eb3bde84547 Mon Sep 17 00:00:00 2001
|
||||
From: David Sterba <dsterba@suse.com>
|
||||
Date: Fri, 6 Apr 2018 17:39:56 +0200
|
||||
Subject: [PATCH] btrfs-progs: build: fix static build
|
||||
|
||||
Add missing libbtrfsutil objects to btrfs.static.
|
||||
|
||||
Signed-off-by: David Sterba <dsterba@suse.com>
|
||||
---
|
||||
Makefile | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 5ba76d2eee40..8785ca2af77e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -261,6 +261,7 @@ endif
|
||||
static_objects = $(patsubst %.o, %.static.o, $(objects))
|
||||
static_cmds_objects = $(patsubst %.o, %.static.o, $(cmds_objects))
|
||||
static_libbtrfs_objects = $(patsubst %.o, %.static.o, $(libbtrfs_objects))
|
||||
+static_libbtrfsutil_objects = $(patsubst %.o, %.static.o, $(libbtrfsutil_objects))
|
||||
static_convert_objects = $(patsubst %.o, %.static.o, $(convert_objects))
|
||||
static_mkfs_objects = $(patsubst %.o, %.static.o, $(mkfs_objects))
|
||||
static_image_objects = $(patsubst %.o, %.static.o, $(image_objects))
|
||||
@@ -453,7 +454,7 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static)
|
||||
@echo " [LD] $@"
|
||||
$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
|
||||
|
||||
-btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects)
|
||||
+btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(static_libbtrfsutil_objects)
|
||||
@echo " [LD] $@"
|
||||
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
|
||||
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:858f111950e03a710d532aa9bfb9e6b80b43335b3c67ccc94d300cb6e025bf84
|
||||
size 2303038
|
||||
3
btrfs-progs-v4.16.tar.gz
Normal file
3
btrfs-progs-v4.16.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eaa7d83ea8b7cbabf949d39b7a837d802468f993c9b671b3460b25852bc9eb19
|
||||
size 2379430
|
||||
@ -1,3 +1,42 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 6 00:00:00 CEST 2018 - dsterba@suse.cz
|
||||
|
||||
- update to version 4.16
|
||||
* libbtrfsutil - new LGPL library to wrap userspace functionality
|
||||
* several 'btrfs' commands converted to use it:
|
||||
* properties
|
||||
* filesystem sync
|
||||
* subvolume set-default/get-default/delete/show/sync
|
||||
* python bindings, tests
|
||||
* build
|
||||
* use configured pkg-config path
|
||||
* CI: add python, musl/clang, built dependencies caching
|
||||
* convert: build fix for e2fsprogs 1.44+
|
||||
* don't install library links with wrong permissions
|
||||
* fixes
|
||||
* prevent incorrect use of subvol_strip_mountpoint
|
||||
* dump-super: don't verify csum for unknown type
|
||||
* convert: fix inline extent creation condition
|
||||
* check:
|
||||
* lowmem: fix false alert for 'data extent backref lost for snapshot'
|
||||
* lowmem: fix false alert for orphan inode
|
||||
* lowmem: fix false alert for shared prealloc extents
|
||||
* mkfs:
|
||||
* add UUID and otime to root of FS_TREE - with the uuid, snapshots will
|
||||
be now linked to the toplevel subvol by the parent UUID
|
||||
* don't follow symlinks when calculating size
|
||||
* pre-create the UUID tree
|
||||
* fix --rootdir with selinux enabled
|
||||
* dump-tree: add option to print only children nodes of a given block
|
||||
* image: handle missing device for RAID1
|
||||
* other
|
||||
* new tests
|
||||
* test script cleanups (quoting, helpers)
|
||||
* tool to edit superblocks
|
||||
* updated docs
|
||||
- Add patch: 0001-btrfs-progs-build-fix-static-build.patch
|
||||
- Add new library packages: libbtrfsutil
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 17 00:00:00 CET 2018 - dsterba@suse.cz
|
||||
|
||||
|
||||
@ -31,10 +31,10 @@
|
||||
%define build_docs 0
|
||||
|
||||
Name: btrfsprogs
|
||||
Version: 4.15
|
||||
Version: 4.16
|
||||
Release: 0
|
||||
Summary: Utilities for the Btrfs filesystem
|
||||
License: GPL-2.0
|
||||
License: GPL-2.0-only
|
||||
Group: System/Filesystems
|
||||
Url: http://btrfs.wiki.kernel.org/index.php/Main_Page
|
||||
#Git-Web: http://git.kernel.org/cgit/linux/kernel/git/kdave/btrfs-progs.git
|
||||
@ -46,6 +46,7 @@ Source4: setup-btrfs.sh
|
||||
Source5: sles11-defaults.h
|
||||
|
||||
Patch1: mkfs-default-features.patch
|
||||
Patch2: 0001-btrfs-progs-build-fix-static-build.patch
|
||||
|
||||
%if %build_docs
|
||||
BuildRequires: asciidoc
|
||||
@ -125,7 +126,7 @@ Requires: libbtrfs0 = %{version}
|
||||
|
||||
%description -n libbtrfs-devel
|
||||
This package contains the libraries and headers files for developers to
|
||||
build applications to interface with btrfs.
|
||||
build applications to interface with Btrfs.
|
||||
|
||||
# rpm < 4.6.0 (SLE11 uses 4.4) doesn't support noarch subpackages.
|
||||
# Fortunately, it doesn't use systemd either so we can just skip it.
|
||||
@ -136,6 +137,25 @@ Group: System/Kernel
|
||||
Conflicts: udev < %{udev_with_btrfs_builtin}
|
||||
BuildArch: noarch
|
||||
|
||||
%package -n libbtrfsutil1
|
||||
Summary: Utility library for interacting with Btrfs
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libbtrfsutil1
|
||||
This package contains the libbtrfsutil.so shared library. This library is
|
||||
LGPL unlike libbtrfs.so and can be used by applications to interact with Btrfs
|
||||
filesystems.
|
||||
|
||||
%package -n libbtrfsutil-devel
|
||||
Summary: Include Files and Libraries for developing with libbtrfsutil
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: libbtrfsutil1 = %{version}
|
||||
|
||||
%description -n libbtrfsutil-devel
|
||||
This package contains the libraries and headers files for developers to
|
||||
build applications to interface with Btrfs using libbtrfsutil.
|
||||
|
||||
%description udev-rules
|
||||
This package contains the udev rule file for configuring device mapper
|
||||
devices that are components of btrfs file systems. It is meant to be
|
||||
@ -148,6 +168,7 @@ thing.
|
||||
%prep
|
||||
%setup -q -n btrfs-progs-v%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
@ -157,6 +178,7 @@ export CFLAGS="%optflags -include sles11-defaults.h"
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
--disable-python \
|
||||
%if !%build_docs
|
||||
--disable-documentation \
|
||||
%endif
|
||||
@ -237,6 +259,10 @@ done
|
||||
|
||||
%postun -n libbtrfs0 -p /sbin/ldconfig
|
||||
|
||||
%post -n libbtrfsutil1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libbtrfsutil1 -p /sbin/ldconfig
|
||||
|
||||
%if 0%{?suse_version} >= 1310
|
||||
%post
|
||||
%{?regenerate_initrd_post}
|
||||
@ -344,6 +370,16 @@ done
|
||||
%{_includedir}/btrfs/*
|
||||
%{_libdir}/libbtrfs.so
|
||||
|
||||
%files -n libbtrfsutil1
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libbtrfsutil.so.*
|
||||
|
||||
%files -n libbtrfsutil-devel
|
||||
%defattr(-, root, root)
|
||||
%dir %{_includedir}
|
||||
%{_includedir}/btrfsutil.h
|
||||
%{_libdir}/libbtrfsutil.so
|
||||
|
||||
%if %{package_udev_rules}
|
||||
%files udev-rules
|
||||
%defattr(-, root, root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user