Hello community, here is the log from the commit of package btrfsprogs for openSUSE:12.1:Update:Test checked in at 2011-12-04 18:19:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/btrfsprogs (Old) and /work/SRC/openSUSE:12.1:Update:Test/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/btrfsprogs/btrfsprogs.changes 2011-12-04 18:20:00.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.btrfsprogs.new/btrfsprogs.changes 2011-12-04 18:20:00.000000000 +0100 @@ -1,0 +2,35 @@ +Wed Nov 9 14:34:56 CET 2011 - [email protected] + +- add several tools to mkinitrd if root fs is btrfs +- pull upstream branch and delete local patches + +------------------------------------------------------------------- +Tue Oct 4 02:08:54 CEST 2011 - [email protected] + +- btrfsck: ignore -a (bnc#655906) +- btrfsck: fix strerror value + +------------------------------------------------------------------- +Sat Sep 17 20:58:20 UTC 2011 - [email protected] + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- +Thu Aug 4 21:52:12 CEST 2011 - [email protected] + +- add patch for local version override as we do not build from + git, and avoid doubled "Btrfs" in output of 'btrfs' + +------------------------------------------------------------------- +Thu Aug 4 21:20:11 CEST 2011 - [email protected] + +- reorder help for 'get-default' right after 'set-default' + +------------------------------------------------------------------- +Thu Jul 28 19:10:08 CEST 2011 - [email protected] + +- add option -p to print parent subvolume +- add subvolume 'get-default' subsubcommand + +------------------------------------------------------------------- Old: ---- 0001-Btrfs-progs-add-a-btrfs-select-super-command-to-over.patch 0002-Btrfs-progs-use-safe-string-manipulation-functions.patch 0003-Btrfs-progs-utils-Informative-errors.patch 0004-update-man-page-to-new-defragment-command-interface.patch 0005-Improve-error-handling-in-the-btrfs-command.patch 0006-Btrfs-progs-update-super-fields-for-space-cache.patch 0007-Btrfs-progs-add-support-for-mixed-data-metadata-bloc.patch 0008-Update-for-lzo-support.patch 0009-Update-clean-up-btrfs-help-and-man-page-V2.patch 0010-Deprecate-btrfsctl-btrfs-show-btrfs-vol.patch 0011-Add-the-btrfs-filesystem-label-command.patch 0012-Btrfs-progs-Update-man-page-for-mixed-data-metadata-.patch 0013-btrfs-progs-Add-new-feature-to-mkfs.btrfs-to-make-fi.patch 0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch 0015-btrfs-progs-add-discard-support-to-mkfs.patch 0101-btrfs-progs-setting-of-time-to-the-root-directory.patch 0103-add-advanced-use-of-help-to-help-message.patch 0104-add-detailed-help-messages-to-btrfs-command.patch 0105-Fix-unused-but-set-errors-in-gcc-4.6.patch 0106-btrfs-map-logical-usage-update.patch 0107-btrfs-progs-cast-u64-to-long-long-to-avoid-printf-wa.patch 0108-Added-support-for-an-additional-ioctl.patch 0109-Add-support-for-read-only-subvolumes.patch 0110-Support-the-new-parameters-in-do_clone-int-argc-char.patch 0112-Updated-manpage-for-btrfs-subvolume-snapshot.patch 0113-btrfs-progs-Fix-over-sized-limit-on-buffer.patch 0114-incorrect-argument-checking-for-btrfs-sub-snap-r.patch 0115-btrfs-progs-fix-extra-metadata-chunk-allocation-in-m.patch 0116-make-btrfs-filesystem-label-command-actually-work.patch 0118-mkfs.btrfs-fail-on-scandir-error-r-mode.patch 0119-mkfs.btrfs-return-some-defined-value-instead-of-garb.patch 0120-mkfs.btrfs-fix-symlink-names-writing.patch 0121-mkfs.btrfs-write-zeroes-instead-on-uninitialized-dat.patch 0122-mkfs.btrfs-free-buffers-allocated-by-pretty_sizes.patch 0123-mkfs.btrfs-fix-memory-leak-caused-by-scandir-calls.patch 0124-mkfs.btrfs-fix-error-text-in-r-mode.patch 0125-btrfs-map-logical-segfaults-when-no-output-file-is-g.patch 0127-mkfs.btrfs-Fix-compilation-errors-with-gcc-4.6.patch 0216-commands-added.patch 0217-scrub-ioctls.patch 0218-added-check_mounted_where.patch 0219-scrub-userland-implementation.patch 0220-scrub-added-to-manpage.patch 0230-Scan-the-devices-listed-in-proc-partitions.patch 0231-btrfs-progs-Improvement-for-making-btrfs-image-from-.patch btrfs-progs-v0.19-35-g1b444cd.tar.bz2 New: ---- boot-btrfs.sh btrfs-progs-pass-correct-build-option-for-pthreads.patch btrfs-progs-v0.19-116-g13eced9.tar.bz2 btrfsck-ignore-option-a.diff build-extra-progs.diff local-version-override.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.FnJhVV/_old 2011-12-04 18:20:00.000000000 +0100 +++ /var/tmp/diff_new_pack.FnJhVV/_new 2011-12-04 18:20:00.000000000 +0100 @@ -20,68 +20,22 @@ Name: btrfsprogs Url: http://btrfs.wiki.kernel.org/index.php/Main_Page Version: 0.19 -Release: 41 -%define tar_version v0.19-35-g1b444cd -Summary: Utilities for the Second Btr File System +Release: 50 +%define tar_version v0.19-116-g13eced9 +Summary: Utilities for the Btrfs filesystem License: GPL v2 only Group: System/Filesystems Supplements: filesystem(btrfs) Source: btrfs-progs-%{tar_version}.tar.bz2 +Source1: boot-btrfs.sh Patch0: memleak-fix.diff Patch1: 0001-Plug-Memory-leak-in-find_and_setup_log_root.patch - -# git: master..tmp (1b444cd..e6bd18d) -Patch2: 0001-Btrfs-progs-add-a-btrfs-select-super-command-to-over.patch -Patch3: 0002-Btrfs-progs-use-safe-string-manipulation-functions.patch -Patch4: 0003-Btrfs-progs-utils-Informative-errors.patch -Patch5: 0004-update-man-page-to-new-defragment-command-interface.patch -Patch6: 0005-Improve-error-handling-in-the-btrfs-command.patch -Patch7: 0006-Btrfs-progs-update-super-fields-for-space-cache.patch -Patch8: 0007-Btrfs-progs-add-support-for-mixed-data-metadata-bloc.patch -Patch9: 0008-Update-for-lzo-support.patch -Patch10: 0009-Update-clean-up-btrfs-help-and-man-page-V2.patch -Patch11: 0010-Deprecate-btrfsctl-btrfs-show-btrfs-vol.patch -Patch12: 0011-Add-the-btrfs-filesystem-label-command.patch -Patch13: 0012-Btrfs-progs-Update-man-page-for-mixed-data-metadata-.patch -Patch14: 0013-btrfs-progs-Add-new-feature-to-mkfs.btrfs-to-make-fi.patch -Patch15: 0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch -Patch16: 0015-btrfs-progs-add-discard-support-to-mkfs.patch - -# git: tmp..<to be pulled soon> -Patch20: 0101-btrfs-progs-setting-of-time-to-the-root-directory.patch -Patch21: 0103-add-advanced-use-of-help-to-help-message.patch -Patch22: 0104-add-detailed-help-messages-to-btrfs-command.patch -Patch23: 0105-Fix-unused-but-set-errors-in-gcc-4.6.patch -Patch24: 0106-btrfs-map-logical-usage-update.patch -Patch25: 0107-btrfs-progs-cast-u64-to-long-long-to-avoid-printf-wa.patch -Patch26: 0108-Added-support-for-an-additional-ioctl.patch -Patch27: 0109-Add-support-for-read-only-subvolumes.patch -Patch28: 0110-Support-the-new-parameters-in-do_clone-int-argc-char.patch -Patch29: 0112-Updated-manpage-for-btrfs-subvolume-snapshot.patch -Patch30: 0113-btrfs-progs-Fix-over-sized-limit-on-buffer.patch -Patch31: 0114-incorrect-argument-checking-for-btrfs-sub-snap-r.patch -Patch32: 0115-btrfs-progs-fix-extra-metadata-chunk-allocation-in-m.patch -Patch33: 0116-make-btrfs-filesystem-label-command-actually-work.patch -Patch34: 0118-mkfs.btrfs-fail-on-scandir-error-r-mode.patch -Patch35: 0119-mkfs.btrfs-return-some-defined-value-instead-of-garb.patch -Patch36: 0120-mkfs.btrfs-fix-symlink-names-writing.patch -Patch37: 0121-mkfs.btrfs-write-zeroes-instead-on-uninitialized-dat.patch -Patch38: 0122-mkfs.btrfs-free-buffers-allocated-by-pretty_sizes.patch -Patch39: 0123-mkfs.btrfs-fix-memory-leak-caused-by-scandir-calls.patch -Patch40: 0124-mkfs.btrfs-fix-error-text-in-r-mode.patch -Patch41: 0125-btrfs-map-logical-segfaults-when-no-output-file-is-g.patch -Patch42: 0127-mkfs.btrfs-Fix-compilation-errors-with-gcc-4.6.patch - -# git: scrub, fixes, improvements -Patch50: 0216-commands-added.patch -Patch51: 0217-scrub-ioctls.patch -Patch52: 0218-added-check_mounted_where.patch -Patch53: 0219-scrub-userland-implementation.patch -Patch54: 0220-scrub-added-to-manpage.patch -Patch55: 0230-Scan-the-devices-listed-in-proc-partitions.patch -Patch56: 0231-btrfs-progs-Improvement-for-making-btrfs-image-from-.patch +Patch1000: local-version-override.patch Patch57: ignore-deleted-loopmounts.diff +Patch58: btrfsck-ignore-option-a.diff +Patch59: build-extra-progs.diff +Patch60: btrfs-progs-pass-correct-build-option-for-pthreads.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel libext2fs-devel libuuid-devel zlib-devel @@ -91,80 +45,61 @@ %description Utilities needed to create and maintain btrfs file systems under Linux. - - %prep %setup -q -n btrfs-progs-%{tar_version} %patch0 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 +%patch1000 -p1 %patch57 -p1 +%patch58 -p1 +%patch59 -p0 +%patch60 -p1 %build -make %{?jobs:-j%jobs} CFLAGS="%{optflags}" all convert +make %{?_smp_mflags} CFLAGS="%{optflags}" all convert \ + btrfs-zero-log btrfs-select-super btrfs-image btrfstune \ + restore find-root +mv restore btrfs-restore +mv find-root btrfs-find-root %install make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} bindir=/sbin mandir=%{_mandir} +install -m 0755 -d ${RPM_BUILD_ROOT}/sbin +install -m 0755 -d ${RPM_BUILD_ROOT}/%{_bindir} +# move some utilities out of /sbin +mv ${RPM_BUILD_ROOT}/sbin/{btrfs-show,btrfs-vol,btrfsctl} ${RPM_BUILD_ROOT}/%{_bindir} +mv ${RPM_BUILD_ROOT}/sbin/{btrfs-map-logical,btrfs-debug-tree} ${RPM_BUILD_ROOT}/%{_bindir} +# mkinitrd rescue utilities +install -m 0755 btrfs-zero-log btrfs-select-super btrfs-image btrfstune ${RPM_BUILD_ROOT}/sbin +install -m 0755 btrfs-restore btrfs-find-root ${RPM_BUILD_ROOT}/sbin # command line options are not compatible (bnc#599224) -#ln ${RPM_BUILD_ROOT}/sbin/btrfsck ${RPM_BUILD_ROOT}/sbin/fsck.btrfs -ln /bin/true ${RPM_BUILD_ROOT}/sbin/fsck.btrfs +# copy needed if /bin is different fs from /sbin +cp /bin/true ${RPM_BUILD_ROOT}/sbin/fsck.btrfs +install -d -m0755 ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ +cp %{S:1} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ %files %defattr(-, root, root) +/sbin/fsck.btrfs +# mkinitrd utils /sbin/btrfs -/sbin/btrfs-debug-tree -/sbin/btrfs-show -/sbin/btrfs-vol +/sbin/btrfs-zero-log /sbin/btrfs-convert +/sbin/btrfs-select-super +/sbin/btrfs-image +/sbin/btrfstune /sbin/btrfsck -/sbin/btrfsctl +/sbin/btrfs-restore +/sbin/btrfs-find-root /sbin/mkfs.btrfs -/sbin/fsck.btrfs -/sbin/btrfs-map-logical +/lib/mkinitrd/scripts/boot-btrfs.sh +# other +/usr/bin/btrfs-map-logical +/usr/bin/btrfs-debug-tree +# obsolete +/usr/bin/btrfs-show +/usr/bin/btrfs-vol +/usr/bin/btrfsctl %_mandir/man8/btrfs-image.8.gz %_mandir/man8/btrfs-show.8.gz %_mandir/man8/btrfsck.8.gz @@ -172,7 +107,4 @@ %_mandir/man8/mkfs.btrfs.8.gz %_mandir/man8/btrfs.8.gz -%clean -rm -rf $RPM_BUILD_ROOT - %changelog ++++++ boot-btrfs.sh ++++++ #!/bin/bash #%stage: filesystem #%if: "$rootfstype" = "btrfs" #%programs: /sbin/btrfs /sbin/btrfs-zero-log /sbin/btrfs-convert /sbin/btrfs-select-super /sbin/btrfs-image /sbin/btrfstune /sbin/btrfs-restore /sbin/btrfs-find-root /sbin/btrfsck /sbin/mkfs.btrfs ++++++ btrfs-progs-pass-correct-build-option-for-pthreads.patch ++++++ diff --git a/Makefile b/Makefile index 96e2002..7a5e2c1 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ version: bash version.sh btrfs: $(objects) btrfs.o btrfs_cmds.o scrub.o - $(CC) -lpthread $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o scrub.o \ + $(CC) -pthread $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o scrub.o \ $(objects) $(LDFLAGS) $(LIBS) calc-size: $(objects) calc-size.o @@ -83,7 +83,7 @@ btrfs-corrupt-block: $(objects) btrfs-corrupt-block.o $(CC) $(CFLAGS) -o btrfs-corrupt-block $(objects) btrfs-corrupt-block.o $(LDFLAGS) $(LIBS) btrfs-image: $(objects) btrfs-image.o - $(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -pthread -lz $(LDFLAGS) $(LIBS) dir-test: $(objects) dir-test.o $(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) ++++++ btrfs-progs-v0.19-35-g1b444cd.tar.bz2 -> btrfs-progs-v0.19-116-g13eced9.tar.bz2 ++++++ ++++ 9526 lines of diff (skipped) ++++++ btrfsck-ignore-option-a.diff ++++++ --- a/btrfsck.c.new 2011-10-04 02:05:51.891833030 +0200 +++ b/btrfsck.c 2011-10-04 02:07:51.999653799 +0200 @@ -2816,10 +2816,11 @@ int main(int ac, char **av) while(1) { int c; - c = getopt(ac, av, "s:"); + c = getopt(ac, av, "as:"); if (c < 0) break; switch(c) { + case 'a': /* ignored */ break; case 's': num = atol(optarg); bytenr = btrfs_sb_offset(num); ++++++ build-extra-progs.diff ++++++ --- Makefile.orig 2011-11-08 19:03:26.188610871 +0100 +++ Makefile 2011-11-08 19:03:52.699995062 +0100 @@ -17,7 +17,8 @@ LIBS=-luuid RESTORE_LIBS=-lz progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \ - btrfs btrfs-map-logical restore find-root calc-size btrfs-corrupt-block + btrfs btrfs-map-logical +progsextra = restore find-root calc-size btrfs-corrupt-block # make C=1 to enable sparse ifdef C ++++++ ignore-deleted-loopmounts.diff ++++++ --- /var/tmp/diff_new_pack.FnJhVV/_old 2011-12-04 18:20:00.000000000 +0100 +++ /var/tmp/diff_new_pack.FnJhVV/_new 2011-12-04 18:20:00.000000000 +0100 @@ -1,8 +1,8 @@ -diff --git a/utils.c b/utils.c -index fd894f3..4f089f5 100644 ---- a/utils.c -+++ b/utils.c -@@ -633,19 +633,29 @@ int is_same_blk_file(const char* a, const char* b) +Index: btrfs-progs-v0.19-116-g13eced9/utils.c +=================================================================== +--- btrfs-progs-v0.19-116-g13eced9.orig/utils.c ++++ btrfs-progs-v0.19-116-g13eced9/utils.c +@@ -674,21 +674,29 @@ int is_same_blk_file(const char* a, cons char real_a[PATH_MAX]; char real_b[PATH_MAX]; @@ -24,6 +24,8 @@ - if(stat(a, &st_buf_a) < 0 || - stat(b, &st_buf_b) < 0) - { +- if (errno == ENOENT) +- return 0; + if(stat(a, &st_buf_a) < 0) + { + if (errno == ENOENT) @@ -40,42 +42,36 @@ return -errno; } -@@ -684,10 +694,12 @@ int is_same_loop_file(const char* a, const char* b) - if((ret = is_loop_device(a)) < 0) { - return ret; - } else if(ret) { -- if((ret = resolve_loop_device(a, res_a, sizeof(res_a))) < 0) +@@ -729,10 +737,12 @@ int is_same_loop_file(const char* a, con + return 0; + return ret; + } else if (ret) { +- if ((ret = resolve_loop_device(a, res_a, sizeof(res_a))) < 0) + if((ret = resolve_loop_device(a, res_a, sizeof(res_a))) < 0) { + if (errno != EPERM) return ret; - - final_a = res_a; -+ } -+ else ++ } else { + final_a = res_a; ++ } } else { final_a = a; } -@@ -696,15 +708,17 @@ int is_same_loop_file(const char* a, const char* b) - if((ret = is_loop_device(b)) < 0) { - return ret; - } else if(ret) { +@@ -743,10 +753,12 @@ int is_same_loop_file(const char* a, con + return 0; + return ret; + } else if (ret) { - if((ret = resolve_loop_device(b, res_b, sizeof(res_b))) < 0) - return ret; - - final_b = res_b; + if((ret = resolve_loop_device(b, res_b, sizeof(res_b))) < 0) { -+ if (errno != EPERM) -+ return ret; -+ } -+ else -+ final_b = res_b; ++ if (errno != EPERM) ++ return ret; ++ } ++ else ++ final_b = res_b; } else { final_b = b; } - -- return is_same_blk_file(final_a, final_b); -+ return is_same_blk_file(final_a, final_b); - } - - /* Checks if a file exists and is a block or regular file*/ ++++++ local-version-override.patch ++++++ Index: btrfs-progs-v0.19-35-g1b444cd/version.sh =================================================================== --- btrfs-progs-v0.19-35-g1b444cd.orig/version.sh +++ btrfs-progs-v0.19-35-g1b444cd/version.sh @@ -6,7 +6,7 @@ # Copyright 2008, Oracle # Released under the GNU GPLv2 -v="Btrfs v0.19" +v="v0.19+" which git &> /dev/null if [ $? == 0 -a -d .git ]; then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
