Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2014-04-09 18:17:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2013-11-28 16:50:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2014-04-09 18:17:36.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Apr 8 11:42:43 UTC 2014 - dste...@suse.cz + +- fsck: fixes and enahancements to --init-extent-tree mode +- fsck: chunk-recover updates +- scrub: add force option -f +- send: check if subvolumes are read-only +- subvol snapshot: add options to affect commit behaviour +- btrfs: add properties command group +- restore: add dry-run option +- restore: fix restoring of compressed files +- mkfs: support for no-holes feature +- mkfs: option -r deals with hardlinks and relative paths +- mkfs: discard phase is interruptible +- documentation updates + +- cleaned spec file +- Removed patches: + * 0162-btrfs-progs-fix-loop-device-mount-checks.patch + * 0165-Revert-btrfs-progs-update-options-in-find-root.c.patch + * 0166-Btrfs-progs-add-some-verbose-output-to-find-root.patch + +------------------------------------------------------------------- Old: ---- 0162-btrfs-progs-fix-loop-device-mount-checks.patch 0165-Revert-btrfs-progs-update-options-in-find-root.c.patch 0166-Btrfs-progs-add-some-verbose-output-to-find-root.patch btrfs-progs-v3.12.tar.bz2 New: ---- btrfs-progs-v3.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.cro9ME/_old 2014-04-09 18:17:38.000000000 +0200 +++ /var/tmp/diff_new_pack.cro9ME/_new 2014-04-09 18:17:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package btrfsprogs # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,34 +16,27 @@ # +%define tar_version v3.14 Name: btrfsprogs -Url: http://btrfs.wiki.kernel.org/index.php/Main_Page -Version: 3.12 +Version: 3.14 Release: 0 -%define tar_version v3.12 Summary: Utilities for the Btrfs filesystem License: GPL-2.0 Group: System/Filesystems +Url: http://btrfs.wiki.kernel.org/index.php/Main_Page #Git-Web: http://git.kernel.org/cgit/linux/kernel/git/mason/btrfs-progs.git #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs # git archive --format=tar --prefix=btrfs-progs-`git describe --tags --match "v*"`/ HEAD > %D/btrfs-progs-`git describe --tags --match "v*"`.tar Source: btrfs-progs-%{tar_version}.tar.bz2 Source1: boot-btrfs.sh Source4: setup-btrfs.sh - -Patch162: 0162-btrfs-progs-fix-loop-device-mount-checks.patch Patch163: 0163-btrfs-progs-fsck-fix-segfault.patch Patch164: 0164-btrfs-progs-convert-set-label-or-copy-from-origin.patch -Patch165: 0165-Revert-btrfs-progs-update-options-in-find-root.c.patch -Patch166: 0166-Btrfs-progs-add-some-verbose-output-to-find-root.patch Patch167: 0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch Patch168: 0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch Patch169: 0169-btrfs-progs-Check-metadata-mirrors-in-find-root.patch Patch170: 0170-btrfs-progs-In-find-root-dump-bytenr-for-every-slot.patch - Patch1000: local-version-override.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: libblkid-devel @@ -55,6 +48,7 @@ # for /bin/true Requires: coreutils Supplements: filesystem(btrfs) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Utilities needed to create and maintain btrfs file systems under Linux. @@ -70,7 +64,7 @@ %package -n libbtrfs-devel Summary: Include Files and Libraries for developing with Btrfs Group: Development/Libraries/C and C++ -Requires: %{name} = %{version}-%{release} +Requires: libbtrfs0 %description -n libbtrfs-devel This package contains the libraries and headers files for developers to @@ -78,11 +72,8 @@ %prep %setup -q -n btrfs-progs-%{tar_version} -%patch162 -p1 %patch163 -p1 %patch164 -p1 -%patch165 -p1 -%patch166 -p1 %patch167 -p1 %patch168 -p1 %patch169 -p1 @@ -95,43 +86,40 @@ btrfs-find-root %install -make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} libdir=%{_libdir} -install -m 0755 -d ${RPM_BUILD_ROOT}/%{_sbindir} -install -m 0755 -d ${RPM_BUILD_ROOT}/%{_bindir} +make install DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} libdir=%{_libdir} +install -m 0755 -d %{buildroot}/%{_sbindir} +install -m 0755 -d %{buildroot}/%{_bindir} # move some utilities out of /usr/sbin -mv ${RPM_BUILD_ROOT}/%{_sbindir}/btrfs-map-logical ${RPM_BUILD_ROOT}/%{_bindir} +mv %{buildroot}/%{_sbindir}/btrfs-map-logical %{buildroot}/%{_bindir} # mkinitrd rescue utilities -install -m 0755 btrfs-zero-log ${RPM_BUILD_ROOT}/%{_sbindir} -install -m 0755 btrfs-select-super ${RPM_BUILD_ROOT}/%{_sbindir} -install -m 0755 btrfs-image ${RPM_BUILD_ROOT}/%{_sbindir} -install -m 0755 btrfstune ${RPM_BUILD_ROOT}/%{_sbindir} -install -m 0755 btrfs-find-root ${RPM_BUILD_ROOT}/%{_sbindir} +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} #UsrMerge -install -m 0755 -d ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfs ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfs-zero-log ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfs-convert ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfs-select-super ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfs-image ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfstune ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfsck ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfs-find-root ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfs-debug-tree ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfs-show-super ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/mkfs.btrfs ${RPM_BUILD_ROOT}/sbin +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}/btrfs-show-super %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.btrfs %{buildroot}/sbin +ln -s %{_sbindir}/fsck.btrfs %{buildroot}/sbin #EndUsrMerge -# command line options are not compatible (bnc#599224) -echo -e '#!/bin/sh\nexit 0' > ${RPM_BUILD_ROOT}/%{_sbindir}/fsck.btrfs -chmod +x ${RPM_BUILD_ROOT}/%{_sbindir}/fsck.btrfs #UsrMerge -ln -s %{_sbindir}/fsck.btrfs ${RPM_BUILD_ROOT}/sbin #EndUsrMerge -install -d -m0755 ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ -install -m 0755 %{S:1} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ -install -m 0755 %{S:4} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.la +install -d -m0755 %{buildroot}/lib/mkinitrd/scripts/ +install -m 0755 %{SOURCE1} %{buildroot}/lib/mkinitrd/scripts/ +install -m 0755 %{SOURCE4} %{buildroot}/lib/mkinitrd/scripts/ +find %{buildroot} -type f -name "*.la" -delete -print # don't install .a for now -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.a +rm -f %{buildroot}/%{_libdir}/*.a %post -n libbtrfs0 -p /sbin/ldconfig @@ -169,18 +157,19 @@ /lib/mkinitrd/scripts/boot-btrfs.sh /lib/mkinitrd/scripts/setup-btrfs.sh # other -/usr/bin/btrfs-map-logical -%_mandir/man8/btrfs-image.8.gz -%_mandir/man8/btrfsck.8.gz -%_mandir/man8/mkfs.btrfs.8.gz -%_mandir/man8/btrfs.8.gz -%_mandir/man8/btrfs-convert.8.gz -%_mandir/man8/btrfs-debug-tree.8.gz -%_mandir/man8/btrfs-find-root.8.gz -%_mandir/man8/btrfs-map-logical.8.gz -%_mandir/man8/btrfs-show-super.8.gz -%_mandir/man8/btrfs-zero-log.8.gz -%_mandir/man8/btrfstune.8.gz +%{_bindir}/btrfs-map-logical +%{_mandir}/man8/btrfs-image.8.gz +%{_mandir}/man8/btrfsck.8.gz +%{_mandir}/man8/fsck.btrfs.8.gz +%{_mandir}/man8/mkfs.btrfs.8.gz +%{_mandir}/man8/btrfs.8.gz +%{_mandir}/man8/btrfs-convert.8.gz +%{_mandir}/man8/btrfs-debug-tree.8.gz +%{_mandir}/man8/btrfs-find-root.8.gz +%{_mandir}/man8/btrfs-map-logical.8.gz +%{_mandir}/man8/btrfs-show-super.8.gz +%{_mandir}/man8/btrfs-zero-log.8.gz +%{_mandir}/man8/btrfstune.8.gz %files -n libbtrfs0 %defattr(-, root, root) ++++++ 0169-btrfs-progs-Check-metadata-mirrors-in-find-root.patch ++++++ --- /var/tmp/diff_new_pack.cro9ME/_old 2014-04-09 18:17:38.000000000 +0200 +++ /var/tmp/diff_new_pack.cro9ME/_new 2014-04-09 18:17:38.000000000 +0200 @@ -8,11 +8,11 @@ btrfs-find-root.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -diff --git a/btrfs-find-root.c b/btrfs-find-root.c -index 7f7b64f..ffbdde1 100644 ---- a/btrfs-find-root.c -+++ b/btrfs-find-root.c -@@ -236,6 +236,8 @@ static int find_root(struct btrfs_root *root) +Index: btrfs-progs-v3.14/btrfs-find-root.c +=================================================================== +--- btrfs-progs-v3.14.orig/btrfs-find-root.c ++++ btrfs-progs-v3.14/btrfs-find-root.c +@@ -230,6 +230,8 @@ static int find_root(struct btrfs_root * while (1) { u64 map_length = 4096; u64 type; @@ -21,9 +21,9 @@ if (offset > btrfs_super_total_bytes(root->fs_info->super_copy)) { -@@ -257,9 +259,11 @@ static int find_root(struct btrfs_root *root) - printf("Checking metadata chunk %Lu, size %Lu" - "\n", metadata_offset, metadata_size); +@@ -246,9 +248,11 @@ static int find_root(struct btrfs_root * + } + offset = metadata_offset; } + mirror_num = 1; + again: @@ -34,7 +34,7 @@ if (err) { offset += map_length; continue; -@@ -278,9 +282,16 @@ static int find_root(struct btrfs_root *root) +@@ -267,9 +271,16 @@ static int find_root(struct btrfs_root * err = read_physical(root, fd, offset, bytenr, map_length); if (!err) { @@ -51,6 +51,3 @@ ret = err; break; } --- -1.8.3.1 - ++++++ btrfs-progs-v3.12.tar.bz2 -> btrfs-progs-v3.14.tar.bz2 ++++++ ++++ 9522 lines of diff (skipped) ++++++ local-version-override.patch ++++++ --- /var/tmp/diff_new_pack.cro9ME/_old 2014-04-09 18:17:38.000000000 +0200 +++ /var/tmp/diff_new_pack.cro9ME/_new 2014-04-09 18:17:38.000000000 +0200 @@ -6,8 +6,8 @@ # Copyright 2008, Oracle # Released under the GNU GPLv2 --v="v3.12" -+v="v3.12+20131125" +-v="v3.14" ++v="v3.14+20140408" which git &> /dev/null if [ $? == 0 -a -d .git ]; then -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
