[PR PATCH] [WIP] btrfs-progs: update to 5.11

[PR PATCH] [WIP] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1791 bytes --]

There is a new pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

[WIP] btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 1673 bytes --]

From f22dcd574782c91eec0277eac7156f1ba67a2c13 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.11

---
 srcpkgs/btrfs-progs/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..2fb01cdf4cd4 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,23 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.11
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel libblkid-devel
+ libuuid-devel zlib-devel reiserfsprogs"
+checkdepends="acl-progs attr-progs e2fsprogs tar xz which eudev grep
+ reiserfsprogs"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then

Re: [PR PATCH] [Updated] [WIP] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1856 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

[WIP] btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2144 bytes --]

From 0813f082374ae5f327b987a4384101ed64413912 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.11

---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..d419d9dfee6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2758,6 +2758,7 @@ libxcb-xrm.so.0 xcb-util-xrm-1.0_1
 libinchi.so.0 openbabel-2.3.2_1
 libopenbabel.so.5 openbabel-2.4.1_1
 libcourier-unicode.so.4 courier-unicode-2.0_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libzstd.so.1 libzstd-1.0.0_1
 libudis86.so.0 udis86-1.7.2_4
 libsass.so.1 libsass-3.5.0_1
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..2fb01cdf4cd4 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,23 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.11
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel libblkid-devel
+ libuuid-devel zlib-devel reiserfsprogs"
+checkdepends="acl-progs attr-progs e2fsprogs tar xz which eudev grep
+ reiserfsprogs"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-802988481

Comment:
Have run on my machine without problems for 2 days.
Basic commands works as expected, so does snapshotting.
I still don't know what to do with the failed tests. And should I re-enable the Python bindings?

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-802988481

Comment:
Have run on my machine without problems for 2 days.
Basic commands work as expected, so does snapshotting.
I still don't know what to do with the failed tests.
And should I re-enable the Python bindings?

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 1641 bytes --]

From 1736481211856366fd6d06588f6de08e6c2e805b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.11

---
 srcpkgs/btrfs-progs/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..095113147f4d 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,22 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.11
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel libblkid-devel
+ libuuid-devel zlib-devel"
+checkdepends="acl-progs attr-progs e2fsprogs tar xz which eudev grep"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then

Re: btrfs-progs: update to 5.11

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-803002890

Comment:
>  And should I re-enable the Python bindings?

It might have cross issues, but maybe not. It was done in 0b78c8608fdce0074f439cb0c3702789f7fa8a0d, idk why.

>  I still don't know what to do with the failed tests.

Either try removing the failing ones, or we can look into adding more tools to `chroot-util-linux`, maybe...

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-803007758

Comment:
> Either try removing the failing ones

That will be tough. I have only tried with 2/3 of the tests but already had to disable 20 of them. Doing more will clutter the template file.

> It might have cross issues, but maybe not. It was done in 0b78c86, idk why.

I will try cross building with Python binding enabled to see what goes wrong.

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 394 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-803010896

Comment:
1 more question: `btrfs` can convert `reiserfs` disk into btrfs. Seeing that the file system is old, etc. it is currently disabled in build.
Is it worth enabling? It will bring `reiserfsprogs` into the dependencies, but maybe someone might need it

Re: btrfs-progs: update to 5.11

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-803020754

Comment:
Does it end up dynamically linked against the library from `reiserfsprogs`? If so, I'd be mostly against adding it, or at most make it a build option.

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-803029733

Comment:
Yes it links in runtime. I will go with the build option

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2480 bytes --]

From 468ccc93a781f24ff788640f59f22be4a8f3670c Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.11

Add build options for btrfs-convert
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..8af5552b528d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1481,6 +1481,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..38d5b4201359 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,30 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.11
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel"
+checkdepends="acl-progs attr-progs tar xz which grep $(vopt_if e2fs 'e2fsprogs')
+ $(vopt_if reiserfs 'reiserfsprogs') eudev"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137
+
+build_options="reiserfs e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
+
+build_options_default="e2fs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2860 bytes --]

From 1838127fdffa070798fdb6df711455d97dab038f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.11

Add build options for btrfs-convert
Re-enable Python3 bindings for libbtrfsutils
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..8af5552b528d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1481,6 +1481,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..9ae7f39cfc69 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,31 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.11
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
+make_install_target="install install_python"
 make_check_target=test
-configure_args="--disable-backtrace --disable-python"
-hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+configure_args="--disable-backtrace"
+hostmakedepends="asciidoc pkg-config xmlto python3-setuptools"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel python3-devel"
+checkdepends="acl-progs attr-progs tar xz which eudev
+ $(vopt_if e2fs 'e2fsprogs') $(vopt_if reiserfs 'reiserfsprogs')"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137
+
+build_options="reiserfs e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
+
+build_options_default="e2fs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then
@@ -55,6 +65,7 @@ libbtrfsutil_package() {
 	short_desc+=" - btrfsutil library"
 	pkg_install() {
 		vmove "usr/lib/libbtrfsutil.so.*"
+		vmove "usr/lib/python3*"
 	}
 }
 

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2873 bytes --]

From 244516dc3cb4f772037a5c039d96c0926e78f558 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.11

Add build options for btrfs-convert
Re-enable Python3 bindings for libbtrfsutil
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..8af5552b528d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1481,6 +1481,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..e60cb4a694c5 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,31 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.11
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
+make_install_target="install install_python"
 make_check_target=test
-configure_args="--disable-backtrace --disable-python"
-hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+configure_args="--disable-backtrace"
+hostmakedepends="asciidoc pkg-config xmlto python3-setuptools python3-devel"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel python3-devel"
+checkdepends="acl-progs attr-progs tar xz which eudev
+ $(vopt_if e2fs 'e2fsprogs') $(vopt_if reiserfs 'reiserfsprogs')"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137
+
+build_options="reiserfs e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
+
+build_options_default="e2fs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then
@@ -55,6 +65,7 @@ libbtrfsutil_package() {
 	short_desc+=" - btrfsutil library"
 	pkg_install() {
 		vmove "usr/lib/libbtrfsutil.so.*"
+		vmove "usr/lib/python3*"
 	}
 }
 

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-803191818

Comment:
You're right. Cross build fails with Python.
Should I use build option for it? At least x86_64 people will know that it exists and they might want to use it.

Re: btrfs-progs: update to 5.11

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-803195615

Comment:
>  Should I use build option for it? At least x86_64 people will know that it exists and they might want to use it.

I'd rather wait for a request, unless you want to use them yourself?

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2515 bytes --]

From ea253b8e9bccad36d807a6af3e6bfd9aafee2aa5 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.11

Add build options for btrfs-convert
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..8af5552b528d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1481,6 +1481,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..d8cf6c9a9011 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,30 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.11
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
-configure_args="--disable-backtrace --disable-python"
+configure_args="--disable-backtrace"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel"
+checkdepends="acl-progs attr-progs tar xz which eudev
+ $(vopt_if e2fs 'e2fsprogs') $(vopt_if reiserfs 'reiserfsprogs')"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137
+
+build_options="reiserfs e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
+
+build_options_default="e2fs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2475 bytes --]

From f2ccd071897881c3c854d9345074f12dd1fc200e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.11

Add build options for btrfs-convert
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..8af5552b528d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1481,6 +1481,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..446a0c845387 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,30 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.11
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel"
+checkdepends="acl-progs attr-progs tar xz which eudev
+ $(vopt_if e2fs 'e2fsprogs') $(vopt_if reiserfs 'reiserfsprogs')"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137
+
+build_options="reiserfs e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
+
+build_options_default="e2fs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-803202590

Comment:
I don't intend to use it so will disable Python bindings for now

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-803202590

Comment:
I don't intend to use it so will disable Python bindings for now.
There is probably nothing I can do with the tests right now, so ready to be merged.

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2479 bytes --]

From 32a248a06c290fc1516a79073becee4e7d3510ee Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.11.1

Add build options for btrfs-convert
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..8af5552b528d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1481,6 +1481,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..2dc3dfc6c55a 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,30 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.11.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel"
+checkdepends="acl-progs attr-progs tar xz which eudev
+ $(vopt_if e2fs 'e2fsprogs') $(vopt_if reiserfs 'reiserfsprogs')"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=e3aaccc4756ec4e5502cb2a9f85b67d52896644f4c3c0f88a6bc598c70bdebfe
+
+build_options="reiserfs e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
+
+build_options_default="e2fs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2479 bytes --]

From d0c7b93847ba890efe9145f6af0a75340d0e1599 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.12.1

Add build options for btrfs-convert
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ef3ff475a4d9..373cd25449c8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1452,6 +1452,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..a7b3d4ad3f78 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,30 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.12.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel"
+checkdepends="acl-progs attr-progs tar xz which eudev
+ $(vopt_if e2fs 'e2fsprogs') $(vopt_if reiserfs 'reiserfsprogs')"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+
+build_options="reiserfs e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
+
+build_options_default="e2fs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then

Re: btrfs-progs: update to 5.11

[ologantr]

[-- Attachment #1: Type: text/plain, Size: 457 bytes --]

New comment by ologantr on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-852439263

Comment:
@FollieHiyuki I think that here it is the case to completely disable tests with `make_check=no` as the majority of them require `mount(8)` which is not shipped with `chroot-util-linux`.
Other than that, I have tested this and it works like a charm.
Maybe this PR should be renamed to btrfs-progs: update to 5.12.1

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-852444019

Comment:
@ologantr Thanks for testing it. I also have run it locally since starting the PR with no issue.
I think @ericonr said something about adding functionalities to `chroot-util-linux` (that way we probably can pass the tests).

> Maybe this PR should be renamed to btrfs-progs: update to 5.12.1

The commit message change is enough.

Re: btrfs-progs: update to 5.11

[ologantr]

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

New comment by ologantr on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-852456880

Comment:
@FollieHiyuki I have just spoken with @ericonr and he said that he probably won't have time to add functionalities to `chroot-util-linux` for a long while. For the time being it's best to disable tests altogether.

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2993 bytes --]

From d849652e5b6e42064e99289b27fcbc72cbb94685 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.12.1

- Add build options for btrfs-convert.
- Temporarily disable all tests, since most of the tests fail without
`mount` or `fallocate` commands.
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2485880dfe80..ba589537b1f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1452,6 +1452,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..eb75688d7d08 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,30 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.12.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+# Most of the tests depend on `mount` and `fallocate`, which is not presented in
+# chroot-util-linux
+make_check=no
+
+build_options="reiserfs e2fs"
+build_options_default="e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then
@@ -23,13 +32,6 @@ pre_build() {
 	fi
 }
 
-pre_check() {
-	# Requires losetup which is part of util-linux, but even with it installed it fails
-	rm -rf -- tests/mkfs-tests/017-small-backing-size-thin-provision-device
-	# Requires fallocate from util-linux
-	rm -rf -- tests/fsck-tests/025-file-extents
-}
-
 post_install() {
 	vinstall btrfs-completion 644 /usr/share/bash-completion/completions btrfs
 }

Re: btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29547#issuecomment-852463761

Comment:
Alright I disabled the tests and left a comment.

Re: [PR PATCH] [Updated] btrfs-progs: update to 5.11

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

There is an updated pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-update
https://github.com/void-linux/void-packages/pull/29547

btrfs-progs: update to 5.11
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29547.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-update-29547.patch --]
[-- Type: text/x-diff, Size: 2998 bytes --]

From 1e3eeb5ccac0aa17f6664ae4e3adbd3041f8276c Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Mar 2021 18:16:46 +0300
Subject: [PATCH] btrfs-progs: update to 5.12.1

- Add build options for btrfs-convert.
- Temporarily disable all tests, since most of them fail without
`mount` or `fallocate` commands.
---
 common/shlibs                |  1 +
 srcpkgs/btrfs-progs/template | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2485880dfe80..ba589537b1f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1452,6 +1452,7 @@ libvlc_pulse.so.0 libvlc-3.0.2_1
 libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
+libreiserfscore.so.0 reiserfsprogs-3.6.27_3
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
 libecore_audio.so.1 efl-1.25.1_2
 libecore_con.so.1 efl-1.25.1_2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b40..931abeb7fffc 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,21 +1,30 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.12.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
 configure_args="--disable-backtrace --disable-python"
 hostmakedepends="asciidoc pkg-config xmlto"
-makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
-checkdepends="acl-progs e2fsprogs tar xz which eudev"
+makedepends="acl-devel libzstd-devel lzo-devel libblkid-devel libuuid-devel
+ $(vopt_if e2fs 'e2fsprogs-devel') $(vopt_if reiserfs 'reiserfsprogs')
+ zlib-devel"
 short_desc="Btrfs filesystem utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+# Most of the tests depend on `mount` and `fallocate` commands, which are not
+# presented in chroot-util-linux
+make_check=no
+
+build_options="reiserfs e2fs"
+build_options_default="e2fs"
+desc_option_reiserfs="Enable support for converting reiserfs disk to btrfs"
+desc_option_e2fs="Enable support for converting ext2/3/4 disk to btrfs"
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then
@@ -23,13 +32,6 @@ pre_build() {
 	fi
 }
 
-pre_check() {
-	# Requires losetup which is part of util-linux, but even with it installed it fails
-	rm -rf -- tests/mkfs-tests/017-small-backing-size-thin-provision-device
-	# Requires fallocate from util-linux
-	rm -rf -- tests/fsck-tests/025-file-extents
-}
-
 post_install() {
 	vinstall btrfs-completion 644 /usr/share/bash-completion/completions btrfs
 }

Re: [PR PATCH] [Merged]: btrfs-progs: update to 5.11

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1679 bytes --]

There's a merged pull request on the void-packages repository

btrfs-progs: update to 5.11
https://github.com/void-linux/void-packages/pull/29547

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Taken over and closes #28153
Why do we disable Python bindings for `libbtrfsutil`?
I gave up half way through cherry-picking tests to disable :) Most of them fail without `mount` command from util-linux.
Welcome other for battle test.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->