Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2013-07-29 17:35:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-18 10:28:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2013-07-29 17:35:56.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Jul 22 17:50:52 CEST 2013 - [email protected] + +- Simplify checks in mkinitrd scripts. + They are always true because they come from the same package + Use relative paths to binaries +- Move udev rules to /usr. +- Adjust rules to call binary from /usr +- Simplify fsck.btrfs, its just a dummy until fixed + +------------------------------------------------------------------- +Thu Jul 4 12:30:41 CEST 2013 - [email protected] + +- update to upstream master (f00dd8386a57d241d0f7c) + +------------------------------------------------------------------- Old: ---- 0100-btrfs-progs-ignore-a-option-in-mkfs.patch 0102-Add-the-force-option.patch 0103-mkfs.btrfs-man-page-document-the-force-option.patch 0104-Ignore-the-error-ENXIO-and-ENOMEDIUM-during-a-devs-s.patch 0105-Regression-tests.patch 0106-Fix-sub-snap-parameter-handling.patch 0107-Add-info-for-the-commands.patch 0108-Add-the-header-footer-introduction-of-the-man-page.patch 0109-helpextract-tool-to-extract-the-info-for-the-help-fr.patch 0110-Update-the-makefile-for-generating-the-man-page.patch 0111-Show-the-help-messages-from-the-info-in-the-comment.patch 0112-Update-the-makefile-for-generating-the-help-messages.patch 0113-Btrfs-progs-add-restriper-commands.patch 0114-btrfs-progs-Add-ioctl-to-read-compressed-size-of-a-f.patch 0115-btrfs-progs-fixup-is_mounted-checks.patch 0116-Btrfs-progs-add-an-option-for-specifying-the-root-to.patch 0117-Btrfs-progs-try-other-mirrors-if-decomression-fails.patch 0118-Btrfs-progs-try-other-mirrors-on-read-failure.patch 0119-btrfs-progs-Fix-error-handling-for-failed-reads-in-r.patch 0120-btrfs-progs-Check-metadata-mirrors-in-find-root.patch 0121-restore-Split-output-directory-and-btrfs-local-path-.patch 0122-restore-Add-regex-matching-of-paths-and-files-to-be-.patch 0123-btrfs-progs-In-find-root-dump-bytenr-for-every-slot.patch 0124-btrfs-progs-Add-utility-to-dump-all-superblocks-foun.patch 0125-btrfs-progs-Add-the-ability-to-use-the-earliest-supe.patch 0126-btrfs-progs-Use-oldest-super-for-btrfs-select-super..patch 0127-btrfs-progs-add-lzo-compression-support-to-restore.patch 0128-btrfs-progs-fix-regexec-to-only-work-if-we-actually-.patch 0129-btrfs-progs-Fix-compilation-errors-with-btrfs-select.patch 0130-Btrfs-progs-fix-restore-to-fall-back-to-the-broken-o.patch 0131-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch 0132-Btrfs-progs-make-find_and_setup_root-return-an-error.patch 0133-Btrfs-progs-check-return-value-properly.patch 0134-Btrfs-progs-give-restore-a-list-roots-option.patch 0135-Btrfs-progs-fix-compiler-warning-of-extent-tree.c.patch 0136-Btrfs-progs-change-the-way-mkfs-picks-raid-profiles.patch 0137-Btrfs-progs-fail-gracefully-on-error-from-open_ctree.patch 0138-Btrfs-progs-bugfix-for-scrubbing-single-devices.patch 0139-Btrfs-progs-make-find-root-spit-out-the-size-of-the-.patch 0140-Btrfs-progs-add-some-verbose-output-to-find-root.patch 0141-Btrfs-progs-fix-restore-to-actually-use-the-root-loc.patch 0142-Btrfs-progs-remove-the-physical-disk-size-check-from.patch 0143-Btrfs-progs-fix-error-output-and-dont-read-from-cach.patch 0144-Btrfs-progs-print-the-objectid-of-the-root-we-find-w.patch 0145-Btrfs-progs-make-specifying-root-objectid-work-if-th.patch 0146-Btrfs-progs-don-t-free-the-existing-node.patch 0147-mkfs-Handle-creation-of-filesystem-larger-than-the-f.patch 0150-btrfs-progs-removed-extraneous-whitespace-from-mkfs-.patch 0151-btrfs-progs-document-rootdir-mkfs-switch.patch 0152-Add-open_ctree_fs_info-for-partial-FS-opens.patch 0153-btrfsck-print-some-progress-Signed-off-by-Chris-Maso.patch 0154-Allow-extent_buffers-to-use-more-ram.patch 0155-btrfsck-don-t-BUG-on-corrupted-extent-records.patch 0156-btrfs-corrupt-block-add-e-option-to-corrupt-the-exte.patch 0157-btrfsck-add-code-to-rebuild-extent-records.patch 0158-btrfs-corrupt-block-add-E-option-to-randomly-corrupt.patch 0159-btrfsck-fix-block-group-accounting-during-repair.patch 0160-Turn-off-some-commands-in-Makefile.patch 0161-Fix-btrfs-convert-btrfs-restore-and-btrfs-find-root-.patch 0162-btrfsck-make-sure-to-dirty-all-block-groups-as-we-fi.patch 0163-btrfsck-add-init-csum-tree-to-replace-the-csum-root-.patch 0164-btrfsck-make-sure-we-fix-the-block-group-accounting-.patch 0165-btrfsck-remove-extents-from-the-fsck-reference-track.patch 0166-Btrfsck-add-the-ability-to-prune-corrupt-extent-allo.patch 0167-Btrfs-use-proc-partitions-scanning-for-btrfs_scan_fo.patch 0168-Scan-dev-md-and-device-mapper-devices-last.patch 0169-btrfsck-add-early-code-to-handle-corrupted-block-gro.patch 0170-Btrfs-progs-btrfs-map-logical-Fix-typo-in-usage.patch 0171-Btrfs-progs-btrfs-corrupt-block-fix-the-wrong-usage.patch 0172-Btrfs-progs-fix-btrfsck-s-snapshot-wrong-unresolved-.patch 0173-btrfs-progs-adjust-size-of-filesystem-if-blockdevice.patch 0174-Btrfs-progs-nuke-redundant-zeroing-in-__list_subvol_.patch 0175-Btrfs-progs-refactor-resolve_root-function-a-bit.patch 0176-Btrfs-progs-bring-subvol-get-default-back-in.patch 0177-Btrfs-progs-make-print-tree.c-aware-of-free-space-ca.patch 0178-Btrfs-progs-allow-dup-for-data-chunks-in-mixed-mode.patch 0179-btrfs-progs-mkfs-rename-T-to-K.patch 0180-btrfs-progs-use-IEEE1541-suffixes-for-sizes.patch 0181-btrfs-progs-mkfs-allow-not-to-trim-a-device.patch 0182-btrfs-progs-convert-set-label-or-copy-from-origin.patch 0183-btrfs-progs-mkfs-disallow-uneven-data-metadata-block.patch 0184-btrfs-progs-get-default-man-page.patch 0185-btrfs-progs-Correct-xstrip-function.patch 0186-btrfs-progs-document-devid-parameter-for-resize.patch 0187-btrfs-progs-document-csize-in-manpage.patch 0188-btrfs-progs-document-balance-in-manpage.patch 0189-btrfs-progs-manpage-fix-markup-in-device-scan.patch 0190-btrfs-progs-document-fi-df.patch 0191-btrfs-progs-document-inspect-internal-commands.patch 0192-btrfs-progs-add-man-page-for-btrfs-convert.patch 0193-btrfs-progs-tweak-order-of-devices-in-fi-show.patch Plug-Memory-leak-in-find_and_setup_log_root.patch btrfs-progs-fix-open_ctree_usage_segfaults.patch btrfs-progs-v0.19-118-gfdb6c04.tar.bz2 btrfs-reorder-commands-help memleak-fix.diff New: ---- 0010-Btrfs-progs-make-btrfsck-a-hardlink-at-install-time.patch 0012-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch 80-btrfs.rules btrfs-progs-add-man-page-for-btrfs-convert.patch btrfs-progs-use-IEEE1541-suffixes-for-sizes.patch btrfs-progs-v0.20-rc1-335-gf00dd83.tar.bz2 setup-btrfs.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.lfRiCA/_old 2013-07-29 17:35:59.000000000 +0200 +++ /var/tmp/diff_new_pack.lfRiCA/_new 2013-07-29 17:35:59.000000000 +0200 @@ -18,130 +18,34 @@ Name: btrfsprogs Url: http://btrfs.wiki.kernel.org/index.php/Main_Page -Version: 0.19 +Version: 0.20 Release: 0 -%define tar_version v0.19-118-gfdb6c04 +%define tar_version v0.20-rc1-335-gf00dd83 Summary: Utilities for the Btrfs filesystem License: GPL-2.0 Group: System/Filesystems - #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`/ HEAD > %D/btrfs-progs-`git describe`.tar +# 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 Source2: btrfs-dev-clear-sb -Patch0: memleak-fix.diff -Patch1: Plug-Memory-leak-in-find_and_setup_log_root.patch +Source3: 80-btrfs.rules +Patch10: 0010-Btrfs-progs-make-btrfsck-a-hardlink-at-install-time.patch +Patch12: 0012-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch Patch1000: local-version-override.patch - -# patches above upstream master: -# + hugo's integration -Patch100: 0100-btrfs-progs-ignore-a-option-in-mkfs.patch -Patch102: 0102-Add-the-force-option.patch -Patch103: 0103-mkfs.btrfs-man-page-document-the-force-option.patch -Patch104: 0104-Ignore-the-error-ENXIO-and-ENOMEDIUM-during-a-devs-s.patch -Patch105: 0105-Regression-tests.patch -Patch106: 0106-Fix-sub-snap-parameter-handling.patch -Patch107: 0107-Add-info-for-the-commands.patch -Patch108: 0108-Add-the-header-footer-introduction-of-the-man-page.patch -Patch109: 0109-helpextract-tool-to-extract-the-info-for-the-help-fr.patch -Patch110: 0110-Update-the-makefile-for-generating-the-man-page.patch -Patch111: 0111-Show-the-help-messages-from-the-info-in-the-comment.patch -Patch112: 0112-Update-the-makefile-for-generating-the-help-messages.patch -Patch115: 0115-btrfs-progs-fixup-is_mounted-checks.patch -Patch113: 0113-Btrfs-progs-add-restriper-commands.patch -Patch114: 0114-btrfs-progs-Add-ioctl-to-read-compressed-size-of-a-f.patch -# + josef's restore utility fixes -Patch116: 0116-Btrfs-progs-add-an-option-for-specifying-the-root-to.patch -Patch117: 0117-Btrfs-progs-try-other-mirrors-if-decomression-fails.patch -Patch118: 0118-Btrfs-progs-try-other-mirrors-on-read-failure.patch -Patch119: 0119-btrfs-progs-Fix-error-handling-for-failed-reads-in-r.patch -Patch120: 0120-btrfs-progs-Check-metadata-mirrors-in-find-root.patch -Patch121: 0121-restore-Split-output-directory-and-btrfs-local-path-.patch -Patch122: 0122-restore-Add-regex-matching-of-paths-and-files-to-be-.patch -Patch123: 0123-btrfs-progs-In-find-root-dump-bytenr-for-every-slot.patch -Patch124: 0124-btrfs-progs-Add-utility-to-dump-all-superblocks-foun.patch -Patch125: 0125-btrfs-progs-Add-the-ability-to-use-the-earliest-supe.patch -Patch126: 0126-btrfs-progs-Use-oldest-super-for-btrfs-select-super..patch -Patch127: 0127-btrfs-progs-add-lzo-compression-support-to-restore.patch -Patch128: 0128-btrfs-progs-fix-regexec-to-only-work-if-we-actually-.patch -Patch129: 0129-btrfs-progs-Fix-compilation-errors-with-btrfs-select.patch -Patch130: 0130-Btrfs-progs-fix-restore-to-fall-back-to-the-broken-o.patch -Patch131: 0131-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch -Patch132: 0132-Btrfs-progs-make-find_and_setup_root-return-an-error.patch -Patch133: 0133-Btrfs-progs-check-return-value-properly.patch -Patch134: 0134-Btrfs-progs-give-restore-a-list-roots-option.patch -Patch139: 0139-Btrfs-progs-make-find-root-spit-out-the-size-of-the-.patch -Patch140: 0140-Btrfs-progs-add-some-verbose-output-to-find-root.patch -Patch141: 0141-Btrfs-progs-fix-restore-to-actually-use-the-root-loc.patch -Patch142: 0142-Btrfs-progs-remove-the-physical-disk-size-check-from.patch -Patch143: 0143-Btrfs-progs-fix-error-output-and-dont-read-from-cach.patch -Patch144: 0144-Btrfs-progs-print-the-objectid-of-the-root-we-find-w.patch -Patch145: 0145-Btrfs-progs-make-specifying-root-objectid-work-if-th.patch -Patch146: 0146-Btrfs-progs-don-t-free-the-existing-node.patch -Patch147: 0147-mkfs-Handle-creation-of-filesystem-larger-than-the-f.patch -Patch181: 0181-btrfs-progs-mkfs-allow-not-to-trim-a-device.patch -Patch182: 0182-btrfs-progs-convert-set-label-or-copy-from-origin.patch -Patch150: 0150-btrfs-progs-removed-extraneous-whitespace-from-mkfs-.patch -Patch151: 0151-btrfs-progs-document-rootdir-mkfs-switch.patch -Patch152: 0152-Add-open_ctree_fs_info-for-partial-FS-opens.patch -Patch153: 0153-btrfsck-print-some-progress-Signed-off-by-Chris-Maso.patch -Patch154: 0154-Allow-extent_buffers-to-use-more-ram.patch -Patch155: 0155-btrfsck-don-t-BUG-on-corrupted-extent-records.patch -Patch156: 0156-btrfs-corrupt-block-add-e-option-to-corrupt-the-exte.patch -Patch157: 0157-btrfsck-add-code-to-rebuild-extent-records.patch -Patch158: 0158-btrfs-corrupt-block-add-E-option-to-randomly-corrupt.patch -Patch159: 0159-btrfsck-fix-block-group-accounting-during-repair.patch -Patch160: 0160-Turn-off-some-commands-in-Makefile.patch -Patch161: 0161-Fix-btrfs-convert-btrfs-restore-and-btrfs-find-root-.patch -Patch162: 0162-btrfsck-make-sure-to-dirty-all-block-groups-as-we-fi.patch -Patch163: 0163-btrfsck-add-init-csum-tree-to-replace-the-csum-root-.patch -Patch164: 0164-btrfsck-make-sure-we-fix-the-block-group-accounting-.patch -Patch165: 0165-btrfsck-remove-extents-from-the-fsck-reference-track.patch -Patch166: 0166-Btrfsck-add-the-ability-to-prune-corrupt-extent-allo.patch -Patch167: 0167-Btrfs-use-proc-partitions-scanning-for-btrfs_scan_fo.patch -Patch168: 0168-Scan-dev-md-and-device-mapper-devices-last.patch -Patch169: 0169-btrfsck-add-early-code-to-handle-corrupted-block-gro.patch -Patch170: 0170-Btrfs-progs-btrfs-map-logical-Fix-typo-in-usage.patch -Patch171: 0171-Btrfs-progs-btrfs-corrupt-block-fix-the-wrong-usage.patch -Patch172: 0172-Btrfs-progs-fix-btrfsck-s-snapshot-wrong-unresolved-.patch -Patch173: 0173-btrfs-progs-adjust-size-of-filesystem-if-blockdevice.patch -Patch174: 0174-Btrfs-progs-nuke-redundant-zeroing-in-__list_subvol_.patch -Patch175: 0175-Btrfs-progs-refactor-resolve_root-function-a-bit.patch -Patch176: 0176-Btrfs-progs-bring-subvol-get-default-back-in.patch -Patch177: 0177-Btrfs-progs-make-print-tree.c-aware-of-free-space-ca.patch -Patch178: 0178-Btrfs-progs-allow-dup-for-data-chunks-in-mixed-mode.patch -Patch179: 0179-btrfs-progs-mkfs-rename-T-to-K.patch -Patch180: 0180-btrfs-progs-use-IEEE1541-suffixes-for-sizes.patch -Patch183: 0183-btrfs-progs-mkfs-disallow-uneven-data-metadata-block.patch -Patch184: 0184-btrfs-progs-get-default-man-page.patch -Patch185: 0185-btrfs-progs-Correct-xstrip-function.patch -Patch186: 0186-btrfs-progs-document-devid-parameter-for-resize.patch -Patch187: 0187-btrfs-progs-document-csize-in-manpage.patch -Patch188: 0188-btrfs-progs-document-balance-in-manpage.patch -Patch189: 0189-btrfs-progs-manpage-fix-markup-in-device-scan.patch -Patch190: 0190-btrfs-progs-document-fi-df.patch -Patch191: 0191-btrfs-progs-document-inspect-internal-commands.patch -Patch192: 0192-btrfs-progs-add-man-page-for-btrfs-convert.patch -Patch193: 0193-btrfs-progs-tweak-order-of-devices-in-fi-show.patch - -# other fixes -Patch135: 0135-Btrfs-progs-fix-compiler-warning-of-extent-tree.c.patch -Patch136: 0136-Btrfs-progs-change-the-way-mkfs-picks-raid-profiles.patch -Patch137: 0137-Btrfs-progs-fail-gracefully-on-error-from-open_ctree.patch -Patch138: 0138-Btrfs-progs-bugfix-for-scrubbing-single-devices.patch - -# -Patch250: btrfs-progs-fix-open_ctree_usage_segfaults.patch -Patch253: btrfs-reorder-commands-help +Patch1001: btrfs-progs-use-IEEE1541-suffixes-for-sizes.patch +Patch1002: btrfs-progs-add-man-page-for-btrfs-convert.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel BuildRequires: libattr-devel +BuildRequires: libblkid-devel BuildRequires: libext2fs-devel BuildRequires: libuuid-devel BuildRequires: lzo-devel +BuildRequires: udev BuildRequires: zlib-devel # for /bin/true Requires: coreutils @@ -150,131 +54,47 @@ %description Utilities needed to create and maintain btrfs file systems under Linux. +%package -n libbtrfs0 +Summary: Library for interacting with Btrfs +Group: System/Libraries + +%description -n libbtrfs0 +This package contains the libbtrfs.so shared library needed for some +applications to interface with btrfs. + +%package -n libbtrfs-devel +Summary: Include Files and Libraries for developing with Btrfs +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version}-%{release} + +%description -n libbtrfs-devel +This package contains the libraries and headers files for developers to +build applications to interface with btrfs. + %prep %setup -q -n btrfs-progs-%{tar_version} -%patch0 -%patch1 -p1 +%patch10 -p1 +%patch12 -p1 %patch1000 -p1 -%patch100 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 -%patch111 -p1 -%patch112 -p1 -%patch115 -p1 -%patch114 -p1 -%patch113 -p1 -# josef's tree -%patch116 -p1 -%patch117 -p1 -%patch118 -p1 -%patch119 -p1 -%patch120 -p1 -%patch121 -p1 -%patch122 -p1 -%patch123 -p1 -%patch124 -p1 -%patch125 -p1 -%patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 -%patch131 -p1 -%patch132 -p1 -%patch133 -p1 -%patch134 -p1 -%patch139 -p1 -%patch140 -p1 -%patch141 -p1 -%patch142 -p1 -%patch143 -p1 -%patch144 -p1 -%patch145 -p1 -%patch146 -p1 -%patch147 -p1 -%patch181 -p1 -%patch182 -p1 -%patch150 -p1 -%patch151 -p1 -# other fixes -%patch135 -p1 -%patch136 -p1 -%patch137 -p1 -%patch138 -p1 -%patch152 -p1 -%patch153 -p1 -%patch154 -p1 -%patch155 -p1 -%patch156 -p1 -%patch157 -p1 -%patch158 -p1 -%patch159 -p1 -%patch160 -p1 -%patch161 -p1 -%patch162 -p1 -%patch163 -p1 -%patch164 -p1 -%patch165 -p1 -%patch166 -p1 -%patch167 -p1 -%patch168 -p1 -%patch169 -p1 -%patch170 -p1 -%patch171 -p1 -%patch172 -p1 -%patch173 -p1 -%patch174 -p1 -%patch175 -p1 -%patch176 -p1 -%patch177 -p1 -%patch178 -p1 -%patch179 -p1 -%patch180 -p1 -%patch183 -p1 -%patch184 -p1 -%patch185 -p1 -%patch186 -p1 -%patch187 -p1 -%patch188 -p1 -%patch189 -p1 -%patch190 -p1 -%patch191 -p1 -%patch192 -p1 -%patch193 -p1 -%patch250 -p1 -#%patch252 -p1 -%patch253 -p1 +%patch1001 -p1 +%patch1002 -p1 %build make %{?_smp_mflags} CFLAGS="%{optflags}" all btrfs-convert \ btrfs-zero-log btrfs-select-super btrfs-image btrfstune \ - btrfs-find-root btrfs-restore btrfs-dump-super + btrfs-find-root %install -make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} +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} -# add btrfs- prefix to generic names # move some utilities out of /usr/sbin mv ${RPM_BUILD_ROOT}/%{_sbindir}/btrfs-map-logical ${RPM_BUILD_ROOT}/%{_bindir} -# remove obsolete utilites -rm ${RPM_BUILD_ROOT}/%{_sbindir}/{btrfs-show,btrfs-vol,btrfsctl} -rm ${RPM_BUILD_ROOT}/%{_mandir}/man8/btrfs-show.* -rm ${RPM_BUILD_ROOT}/%{_mandir}/man8/btrfsctl.* # 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-dump-super ${RPM_BUILD_ROOT}/%{_sbindir} -install -m 0755 btrfs-restore ${RPM_BUILD_ROOT}/%{_sbindir} install -m 0755 btrfs-find-root ${RPM_BUILD_ROOT}/%{_sbindir} #UsrMerge install -m 0755 -d ${RPM_BUILD_ROOT}/sbin @@ -285,26 +105,30 @@ 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-restore ${RPM_BUILD_ROOT}/sbin ln -s %{_sbindir}/btrfs-find-root ${RPM_BUILD_ROOT}/sbin -ln -s %{_sbindir}/btrfs-dump-super ${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 #EndUsrMerge # command line options are not compatible (bnc#599224) -# copy needed if /bin is different fs from /sbin -if [ -x "%{_bindir}/true" ]; then - cp %{_bindir}/true ${RPM_BUILD_ROOT}/%{_sbindir}/fsck.btrfs -else - echo -e '#!/bin/sh\nexit 0' > ${RPM_BUILD_ROOT}/%{_sbindir}/fsck.btrfs - chmod +x ${RPM_BUILD_ROOT}/%{_sbindir}/fsck.btrfs -fi +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/ install -m 0755 %{S:2} ${RPM_BUILD_ROOT}/usr/sbin/ +install -d -m 0755 $RPM_BUILD_ROOT/usr/lib/udev/rules.d +install -m 0644 %{S:3} $RPM_BUILD_ROOT/usr/lib/udev/rules.d +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.la +# don't install .a for now +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.a + +%post -n libbtrfs0 -p /sbin/ldconfig + +%postun -n libbtrfs0 -p /sbin/ldconfig %files %defattr(-, root, root) @@ -318,11 +142,10 @@ /sbin/btrfs-image /sbin/btrfstune /sbin/btrfsck -/sbin/btrfs-restore /sbin/btrfs-find-root -/sbin/btrfs-dump-super /sbin/mkfs.btrfs /sbin/btrfs-debug-tree +/sbin/btrfs-show-super #EndUsrMerge %{_sbindir}/btrfs %{_sbindir}/btrfs-zero-log @@ -331,20 +154,34 @@ %{_sbindir}/btrfs-image %{_sbindir}/btrfstune %{_sbindir}/btrfsck -%{_sbindir}/btrfs-restore %{_sbindir}/btrfs-find-root -%{_sbindir}/btrfs-dump-super %{_sbindir}/fsck.btrfs %{_sbindir}/mkfs.btrfs %{_sbindir}/btrfs-debug-tree +%{_sbindir}/btrfs-show-super /usr/sbin/btrfs-dev-clear-sb /lib/mkinitrd/scripts/boot-btrfs.sh +/lib/mkinitrd/scripts/setup-btrfs.sh # other /usr/bin/btrfs-map-logical +/usr/sbin/btrfs-dev-clear-sb %_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 +%dir /usr/lib/udev/ +%dir /usr/lib/udev/rules.d/ +/usr/lib/udev/rules.d/80-btrfs.rules + +%files -n libbtrfs0 +%defattr(-, root, root) +%{_libdir}/libbtrfs.so.* + +%files -n libbtrfs-devel +%defattr(-, root, root) +%dir %{_includedir}/btrfs +%{_includedir}/btrfs/* +%{_libdir}/libbtrfs.so %changelog ++++++ 0010-Btrfs-progs-make-btrfsck-a-hardlink-at-install-time.patch ++++++ >From 5ca1ded494d7d58b71877bf1f774ac313fabe35f Mon Sep 17 00:00:00 2001 From: Eric Sandeen <[email protected]> Date: Thu, 2 May 2013 11:20:22 -0500 Subject: [PATCH 10/48] Btrfs-progs: make btrfsck a hardlink at install time btrfsck gets hardlinked to btrfs during the build, but the install phase simply copies them both to the destination without preserving the link. Just force-link btrfsck in the destination again during install so that the installed btrfsck is a link as well. Signed-off-by: Eric Sandeen <[email protected]> --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index da7438e..0f0b1ac 100644 --- a/Makefile +++ b/Makefile @@ -193,6 +193,8 @@ clean : install: $(libs) $(progs) install-man $(INSTALL) -m755 -d $(DESTDIR)$(bindir) $(INSTALL) $(progs) $(DESTDIR)$(bindir) + # btrfsck is a link to btrfs in the src tree, make it so for installed file as well + $(LN) -f $(DESTDIR)$(bindir)/btrfs $(DESTDIR)$(bindir)/btrfsck $(INSTALL) -m755 -d $(DESTDIR)$(libdir) $(INSTALL) $(libs) $(DESTDIR)$(libdir) cp -a $(lib_links) $(DESTDIR)$(libdir) -- 1.8.2 ++++++ 0012-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch ++++++ >From 86f2f0e7742ccbfaf62e2d6415bf170a85c71c0e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <[email protected]> Date: Sun, 12 May 2013 16:33:44 +0100 Subject: [PATCH 12/48] libbtrfs: Set SONAME to "libbtrfs.so.0" (instead of "libbtrfs.so"). Signed-off-by: Richard W.M. Jones <[email protected]> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0f0b1ac..7a49174 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,7 @@ version.h: $(libs_shared): $(libbtrfs_objects) $(lib_links) send.h @echo " [LD] $@" $(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.2 ++++++ 80-btrfs.rules ++++++ SUBSYSTEM!="block", GOTO="btrfs_end" ACTION!="add|change", GOTO="btrfs_end" ENV{ID_FS_TYPE}=="LVM2_member|LVM1_member", GOTO="btrfs_end" ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="btrfs_end" ENV{ID_FS_TYPE}=="btrfs", GOTO="btrfs_do_scan" ENV{DM_UUID}=="LVM-?*", GOTO="btrfs_do_scan" ENV{DM_UUID}=="LUKS-CRYPT1-?*", GOTO="btrfs_do_scan" ENV{DM_UUID}=="LUKS-PLAIN-?*", GOTO="btrfs_do_scan" ENV{DM_UUID}=="LUKS-VERITY-?*", GOTO="btrfs_do_scan" ENV{DM_UUID}=="LUKS-LOOPAES-?*", GOTO="btrfs_do_scan" ENV{MD_UUID}=="?*", GOTO="btrfs_do_scan" GOTO="btrfs_end" LABEL="btrfs_do_scan" RUN+="/sbin/modprobe btrfs" RUN+="/usr/sbin/btrfs device scan $env{DEVNAME}" LABEL="btrfs_end" ++++++ boot-btrfs.sh ++++++ --- /var/tmp/diff_new_pack.lfRiCA/_old 2013-07-29 17:35:59.000000000 +0200 +++ /var/tmp/diff_new_pack.lfRiCA/_new 2013-07-29 17:35:59.000000000 +0200 @@ -1,11 +1,22 @@ #!/bin/bash -e #%stage: filesystem -#%if: -x /usr/sbin/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 /sbin/btrfs-dump-super /sbin/btrfs-debug-tree +#%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 +#%programs: /sbin/fsck.btrfs +#%programs: fsck.btrfs +#%programs: mkfs.btrfs #%modules: btrfs modprobe btrfs -if [ -x /usr/sbin/btrfs ]; then - /usr/sbin/btrfs dev scan >& /dev/null -fi +btrfs dev scan >& /dev/null ++++++ btrfs-progs-add-man-page-for-btrfs-convert.patch ++++++ >From 3c7ae0fc5139c195100eb931bc6e1148ac1f11f5 Mon Sep 17 00:00:00 2001 From: David Sterba <[email protected]> Date: Mon, 26 Mar 2012 15:39:08 +0200 Subject: [PATCH 37/46] btrfs-progs: add man page for btrfs-convert Signed-off-by: David Sterba <[email protected]> --- man/Makefile | 2 +- man/btrfs-convert.8.in | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 man/btrfs-convert.8.in Index: btrfs-progs-v0.20-rc1-335-gf00dd83/man/btrfs-convert.8.in =================================================================== --- /dev/null +++ btrfs-progs-v0.20-rc1-335-gf00dd83/man/btrfs-convert.8.in @@ -0,0 +1,60 @@ +.TH BTRFS-CONVERT 8 +.SH NAME +btrfs-convert \- convert ext2/ext3/ext4 filesystem image to btrfs in-place +.SH SYNOPSIS +.B btrfs-convert \fB[\-dinL]\fP \fB[\-r]\fP \fB[\-l\fP \fILABEL\fP\fB]\fP \fIdevice\fP +.SH DESCRIPTION +.B btrfs-convert +is used to convert a ext2/ext3/ext4 filesystem image to a btrfs one. This is +performed on an unmounted image. The conversion is done in-place and it's +possible to do a rollback to original fs. The original filesystem image is +accessible as a subvolume named \fIext2\_subvol\fP. + +The success of the operation depends on amount of free space in the original +filesystem, as btrfs uses this space to store it's own metadata and just adds +pointers to the data blocks. + +Duration of the operation depends on fragmentation and allocated space on the +orignal filesystem, it may take seveal hours for a terabyte-sized filesystem. + +If the operation does not finish succesfully, the image is recognized as the +original fileystem. + +.SH OPTIONS +.TP +\fB\-d\fP +Disable data checksumming. This may speed up the convert operation. +.TP +\fB\-i\fP +Do not convert ACLs. +.TP +\fB\-n\fP +Disable packing of small files. +.TP +\fB\-l\fR \fILABEL\fP +Set the label of btrfs filesystem to \fILABEL\fP. +.TP +\fB\-L\fP +Copy label from the original filesystem to btrfs. +.TP +\fB\-r\fP +Try rollback to the original filesystem. Beware that this may not always +succeed if the btrfs filesystem has been changed in a way that prevents this. + +.SH CAVEATS +The resulting filesystem will inherit the fragmentation and it's possible to +run whole filesystem defragmentation and then balance. + +The raid profile of both data and metada will be \fIsingle\fP, this is not the +same as default mkfs will create. Use balance with convert filter to change +raid profile you want. + +Security labels or quotas are not transferred to the new filesystem. + +Block sizes must be at least of btrfs supported size (currently 4KB on x86_64). + +.SH AVAILABILITY +.B btrfs-convert +is part of btrfs-progs. +.SH SEE ALSO +.BR mkfs.btrfs (8) Index: btrfs-progs-v0.20-rc1-335-gf00dd83/man/Makefile =================================================================== --- btrfs-progs-v0.20-rc1-335-gf00dd83.orig/man/Makefile +++ btrfs-progs-v0.20-rc1-335-gf00dd83/man/Makefile @@ -11,7 +11,7 @@ man8dir = $(mandir)/man8 # list only those we use .SUFFIXES: .in .gz -MANPAGES = mkfs.btrfs.8.gz btrfsck.8.gz btrfs-image.8.gz btrfs.8.gz +MANPAGES = mkfs.btrfs.8.gz btrfsck.8.gz btrfs-image.8.gz btrfs.8.gz btrfs-convert.8.gz INFILES = ${MANPAGES:.in=.gz} all: $(MANPAGES) ++++++ btrfs-progs-use-IEEE1541-suffixes-for-sizes.patch ++++++ >From d37ac57247379f929cd25cc1388c3df8830d704d Mon Sep 17 00:00:00 2001 From: David Sterba <[email protected]> Date: Mon, 26 Mar 2012 14:50:48 +0200 Subject: [PATCH 8/8] btrfs-progs: use IEEE1541 suffixes for sizes IEEE 1541-2002 Signed-off-by: David Sterba <[email protected]> --- utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils.c b/utils.c index f885307..97e0da7 100644 --- a/utils.c +++ b/utils.c @@ -1094,8 +1094,8 @@ out: return ret; } -static char *size_strs[] = { "", "KB", "MB", "GB", "TB", - "PB", "EB", "ZB", "YB"}; +static char *size_strs[] = { "", "KiB", "MiB", "GiB", "TiB", + "PiB", "EiB", "ZiB", "YiB"}; char *pretty_sizes(u64 size) { int num_divs = 0; -- 1.7.6.233.gd79bc ++++++ local-version-override.patch ++++++ --- /var/tmp/diff_new_pack.lfRiCA/_old 2013-07-29 17:35:59.000000000 +0200 +++ /var/tmp/diff_new_pack.lfRiCA/_new 2013-07-29 17:35:59.000000000 +0200 @@ -6,8 +6,8 @@ # Copyright 2008, Oracle # Released under the GNU GPLv2 --v="Btrfs v0.19" -+v="v0.19+20120406" +-v="v0.20-rc1" ++v="v0.20-rc1+20130701" which git &> /dev/null if [ $? == 0 -a -d .git ]; then ++++++ setup-btrfs.sh ++++++ #!/bin/bash # #%stage: filesystem mkdir -p $tmp_mnt/etc/udev/rules.d cp /usr/lib/udev/rules.d/80-btrfs.rules $tmp_mnt/etc/udev/rules.d -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
