Accepting request 600605 from home:dsterba:branches:filesystems
- update to version 4.16.1 OBS-URL: https://build.opensuse.org/request/show/600605 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=293
This commit is contained in:
David Sterba
committed by
Git OBS Bridge
Git OBS Bridge
parent
f62d3034d2
commit
832ad0cba9
@@ -1,36 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -3,12 +3,9 @@
|
||||
#%depends: dm dmraid lvm2 udev md luks
|
||||
#%programs: btrfs
|
||||
#%programs: btrfs-convert
|
||||
#%programs: btrfs-debug-tree
|
||||
#%programs: btrfs-dump-super
|
||||
#%programs: btrfs-find-root
|
||||
#%programs: btrfs-image
|
||||
#%programs: btrfs-select-super
|
||||
#%programs: btrfs-zero-log
|
||||
#%programs: btrfsck
|
||||
#%programs: btrfstune
|
||||
# for fsck(8): listed twice so that a copy really ends up in /sbin
|
||||
|
||||
3
btrfs-progs-v4.16.1.tar.gz
Normal file
3
btrfs-progs-v4.16.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8b7569b613918ea260dda7c9f34decdbfe93585d3b526dd8dfa35da94ac759e7
|
||||
size 2408325
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eaa7d83ea8b7cbabf949d39b7a837d802468f993c9b671b3460b25852bc9eb19
|
||||
size 2379430
|
||||
@@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 24 00:00:00 CEST 2018 - dsterba@suse.cz
|
||||
|
||||
- update to version 4.16.1
|
||||
* remove obsolete tools: btrfs-debug-tree, btrfs-zero-log, btrfs-show-super,
|
||||
btrfs-calc-size
|
||||
* sb-mod: new debugging tool to edit superblock items
|
||||
* mkfs: detect if thin-provisioned device does not have enough space
|
||||
* check: don't try to verify checksums on metadata dump images
|
||||
* build: fail documentation build if xmlto is not found
|
||||
* build: fix build of btrfs.static
|
||||
- Remove patch: 0001-btrfs-progs-build-fix-static-build.patch (upstream)
|
||||
- Update initrd script
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 6 00:00:00 CEST 2018 - dsterba@suse.cz
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
%define build_docs 0
|
||||
|
||||
Name: btrfsprogs
|
||||
Version: 4.16
|
||||
Version: 4.16.1
|
||||
Release: 0
|
||||
Summary: Utilities for the Btrfs filesystem
|
||||
License: GPL-2.0-only
|
||||
@@ -46,7 +46,6 @@ 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
|
||||
@@ -168,7 +167,6 @@ thing.
|
||||
%prep
|
||||
%setup -q -n btrfs-progs-v%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
@@ -216,21 +214,18 @@ install -m 0755 -d %{buildroot}/%{_bindir}
|
||||
# move some utilities out of /usr/sbin
|
||||
mv %{buildroot}/%{_sbindir}/btrfs-map-logical %{buildroot}/%{_bindir}
|
||||
# initrd rescue utilities
|
||||
install -m 0755 btrfs-zero-log %{buildroot}/%{_sbindir}
|
||||
install -m 0755 btrfs-select-super %{buildroot}/%{_sbindir}
|
||||
install -m 0755 btrfs-image %{buildroot}/%{_sbindir}
|
||||
install -m 0755 btrfstune %{buildroot}/%{_sbindir}
|
||||
install -m 0755 btrfs-find-root %{buildroot}/%{_sbindir}
|
||||
install -m 0755 -d %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/btrfs %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/btrfs-zero-log %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/btrfs-convert %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/btrfs-select-super %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/btrfs-image %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/btrfstune %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/btrfsck %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/btrfs-find-root %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/btrfs-debug-tree %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/mkfs.btrfs %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/fsck.btrfs %{buildroot}/sbin
|
||||
%if 0%{?suse_version} < 1310
|
||||
@@ -280,22 +275,18 @@ done
|
||||
/sbin/fsck.btrfs
|
||||
# mkinitrd utils
|
||||
/sbin/btrfs
|
||||
/sbin/btrfs-zero-log
|
||||
/sbin/btrfs-convert
|
||||
/sbin/btrfs-image
|
||||
/sbin/btrfstune
|
||||
/sbin/btrfsck
|
||||
/sbin/mkfs.btrfs
|
||||
/sbin/btrfs-debug-tree
|
||||
%{_sbindir}/btrfs
|
||||
%{_sbindir}/btrfs-zero-log
|
||||
%{_sbindir}/btrfs-convert
|
||||
%{_sbindir}/btrfs-image
|
||||
%{_sbindir}/btrfstune
|
||||
%{_sbindir}/btrfsck
|
||||
%{_sbindir}/fsck.btrfs
|
||||
%{_sbindir}/mkfs.btrfs
|
||||
%{_sbindir}/btrfs-debug-tree
|
||||
%if 0%{?suse_version} < 1310
|
||||
%dir /lib/mkinitrd
|
||||
%dir /lib/mkinitrd/scripts
|
||||
@@ -310,9 +301,7 @@ done
|
||||
%{_mandir}/man8/btrfs.8.gz
|
||||
%{_mandir}/man5/btrfs.5.gz
|
||||
%{_mandir}/man8/btrfs-convert.8.gz
|
||||
%{_mandir}/man8/btrfs-debug-tree.8.gz
|
||||
%{_mandir}/man8/btrfs-map-logical.8.gz
|
||||
%{_mandir}/man8/btrfs-zero-log.8.gz
|
||||
%{_mandir}/man8/btrfstune.8.gz
|
||||
%{_mandir}/man8/btrfs-balance.8.gz
|
||||
%{_mandir}/man8/btrfs-check.8.gz
|
||||
@@ -330,7 +319,6 @@ done
|
||||
%{_mandir}/man8/btrfs-send.8.gz
|
||||
%{_mandir}/man8/btrfs-subvolume.8.gz
|
||||
%{_mandir}/man8/btrfs-select-super.8.gz
|
||||
%{_mandir}/man8/btrfs-show-super.8.gz
|
||||
%dir %{_datadir}/bash-completion
|
||||
%dir %{_datadir}/bash-completion/completions
|
||||
%{_datadir}/bash-completion/completions/btrfs
|
||||
@@ -347,13 +335,11 @@ done
|
||||
%files -n btrfsprogs-static
|
||||
%defattr(-, root, root)
|
||||
%{_sbindir}/btrfs.static
|
||||
%{_sbindir}/btrfs-zero-log.static
|
||||
%{_sbindir}/btrfs-convert.static
|
||||
%{_sbindir}/btrfs-image.static
|
||||
%{_sbindir}/btrfstune.static
|
||||
%{_sbindir}/btrfsck.static
|
||||
%{_sbindir}/mkfs.btrfs.static
|
||||
%{_sbindir}/btrfs-debug-tree.static
|
||||
%{_sbindir}/btrfs-corrupt-block.static
|
||||
%{_sbindir}/btrfs-find-root.static
|
||||
%{_sbindir}/btrfs-map-logical.static
|
||||
|
||||
Reference in New Issue
Block a user