Skip to contentSkip to conversation

btrfs-tools: Update to 5.11.1

PATCH Superseded Robert Joslyn 2 participants 6 messages Apr 16, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 btrfs-tools: Update to 5.11.1

Update licensing, as libtrfsutil is under LGPLv3+. Note that libtrfsutil is in the process of being relicensed to LGPLv2.1+:

	https://github.com/kdave/btrfs-progs/issues/323
---
 .../{btrfs-tools_5.10.1.bb => btrfs-tools_5.11.1.bb}     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.10.1.bb => btrfs-tools_5.11.1.bb} (88%)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb +6 -3
similarity index 88%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb
index fca010d4ae..2ab476a88e 100644
@@ -7,14 +7,17 @@ btrfs and an utility (btrfs-convert) to make a btrfs filesystem from an ext3."
 
 HOMEPAGE = "https://btrfs.wiki.kernel.org"
 
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
+LICENSE = "GPLv2 & LGPLv3+"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067 \
+    file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \
+"
 SECTION = "base"
 DEPENDS = "util-linux attr e2fsprogs lzo acl"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "f2ffce38b9c1477a7350bfe165f0e34b9bde40f5"
+SRCREV = "8d5051f279f7994fb80536ef8f846f06d121d898"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
Signature · 1 line
2.26.3
#1 lore raw

PATCH 2/3 btrfs-tools: Add PACKAGECONFIG options

Add options to make it easier to control which features are enabled. All of these default to enabled by upstream, so keep them enabled to maintain previous behavior.

The convert option also supports reiserfs, but no recipes exist in the layer index. Limit the option to ext filesystems until someone cares enough to make reiserfs recipes.

Remove acl and attr from DEPENDS, as they do not apper to be needed. Add zlib since it is required.

---
 .../btrfs-tools/btrfs-tools_5.11.1.bb         | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +23 -3
index 2ab476a88e..b875ea1aa1 100644
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \
     file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \
 "
 SECTION = "base"
-DEPENDS = "util-linux attr e2fsprogs lzo acl"
+DEPENDS = "lzo util-linux zlib"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
@@ -22,17 +22,37 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
 
-PACKAGECONFIG ??= "python"
+PACKAGECONFIG ??= " \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \
+    backtrace \
+    programs \
+    shared \
+    convert \
+    python \
+    crypto-builtin \
+"
+PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile"
+PACKAGECONFIG[backtrace] = "--enable-backtrace,--disable-backtrace"
 PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native"
+PACKAGECONFIG[programs] = "--enable-programs,--disable-programs"
+PACKAGECONFIG[shared] = "--enable-shared,--disable-shared"
+PACKAGECONFIG[static] = "--enable-static,--disable-static"
+PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs"
 PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native"
 PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd"
 
+# Pick only one crypto provider
+PACKAGECONFIG[crypto-builtin] = "--with-crypto=builtin"
+PACKAGECONFIG[crypto-libgcrypt] = "--with-crypto=libgcrypt,,libgcrypt"
+PACKAGECONFIG[crypto-libsodium] = "--with-crypto=libsodium,,libsodium"
+PACKAGECONFIG[crypto-libkcapi] = "--with-crypto=libkcapi,,libkcapi"
+
 inherit autotools-brokensep pkgconfig manpages
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d)}
 
 CLEANBROKEN = "1"
 
-EXTRA_OECONF_append_libc-musl = " --disable-backtrace "
+PACKAGECONFIG_remove_libc-musl = "backtrace"
 EXTRA_PYTHON_CFLAGS = "${DEBUG_PREFIX_MAP}"
 EXTRA_PYTHON_CFLAGS_class-native = ""
 EXTRA_PYTHON_LDFLAGS = "${LDFLAGS}"
Signature · 1 line
2.26.3
#2 lore raw

Re: [OE-core] [PATCH 2/3] btrfs-tools: Add PACKAGECONFIG options

Quoted 31 lines · Robert Joslyn

Add options to make it easier to control which features are enabled. All of these default to enabled by upstream, so keep them enabled to maintain previous behavior.

The convert option also supports reiserfs, but no recipes exist in the layer index. Limit the option to ext filesystems until someone cares enough to make reiserfs recipes.

Remove acl and attr from DEPENDS, as they do not apper to be needed. Add zlib since it is required.

---
 .../btrfs-tools/btrfs-tools_5.11.1.bb         | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +1 -1
index 2ab476a88e..b875ea1aa1 100644
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \
     file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \
 "
 SECTION = "base"
-DEPENDS = "util-linux attr e2fsprogs lzo acl"
+DEPENDS = "lzo util-linux zlib"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 26

Quoted 6 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +2 -1
@@ -22,17 +22,37 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
 
-PACKAGECONFIG ??= "python"
+PACKAGECONFIG ??= " \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \

The largefile distro feature is for historical reference only. Recipes should always enable largefile support regardless of the distro feature (which will eventually be removed).

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 32

Quoted 6 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +6 -0
+    backtrace \
+    programs \
+    shared \
+    convert \
+    python \
+    crypto-builtin \

This is not conventional formatting for a list of PACKAGECONFIG options. Maybe have a look at some other recipes in oe-core to get a feel for the typical style.

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 39

Quoted 7 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +6 -0
+"
+PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile"
+PACKAGECONFIG[backtrace] = "--enable-backtrace,--disable-backtrace"
 PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native"
+PACKAGECONFIG[programs] = "--enable-programs,--disable-programs"
+PACKAGECONFIG[shared] = "--enable-shared,--disable-shared"
+PACKAGECONFIG[static] = "--enable-static,--disable-static"

The choice to build shared and/or static libs is not something which is typically controlled by PACKAGECONFIG options.

Quoted 7 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +4 -0
+PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs"
 PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native"
 PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd"
 
+# Pick only one crypto provider
+PACKAGECONFIG[crypto-builtin] = "--with-crypto=builtin"
+PACKAGECONFIG[crypto-libgcrypt] = "--with-crypto=libgcrypt,,libgcrypt"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 55

Quoted 10 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +4 -1
+PACKAGECONFIG[crypto-libsodium] = "--with-crypto=libsodium,,libsodium"
+PACKAGECONFIG[crypto-libkcapi] = "--with-crypto=libkcapi,,libkcapi"
+
 inherit autotools-brokensep pkgconfig manpages
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d)}
 
 CLEANBROKEN = "1"
 
-EXTRA_OECONF_append_libc-musl = " --disable-backtrace "
+PACKAGECONFIG_remove_libc-musl = "backtrace"

Use of _remove in core recipes is discouraged.

Quoted 9 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +0 -1
 EXTRA_PYTHON_CFLAGS = "${DEBUG_PREFIX_MAP}"
 EXTRA_PYTHON_CFLAGS_class-native = ""
 EXTRA_PYTHON_LDFLAGS = "${LDFLAGS}"
--

2.26.3

#3 lore raw

Re: [OE-core] [PATCH 2/3] btrfs-tools: Add PACKAGECONFIG options

Quoted 40 lines · Andre McCurdy
Quoted 34 lines · Robert Joslyn

Add options to make it easier to control which features are enabled. All of these default to enabled by upstream, so keep them enabled to maintain previous behavior.

The convert option also supports reiserfs, but no recipes exist in the layer index. Limit the option to ext filesystems until someone cares enough to make reiserfs recipes.

Remove acl and attr from DEPENDS, as they do not apper to be needed. Add zlib since it is required.

---
.../btrfs-tools/btrfs-tools_5.11.1.bb | 26 ++++++++++++++++---

1 file changed, 23 insertions(+), 3 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +0 -0
index 2ab476a88e..b875ea1aa1 100644
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \
    file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \

"
SECTION = "base"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +1 -1
-DEPENDS = "util-linux attr e2fsprogs lzo acl"
+DEPENDS = "lzo util-linux zlib"

DEPENDS_append_class-target = " udev"
RDEPENDS_${PN} = "libgcc"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +0 -0
@@ -22,17 +22,37 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
           file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
           "
 
Quoted 7 lines

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 26

Quoted 3 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +2 -1
-PACKAGECONFIG ??= "python"
+PACKAGECONFIG ??= " \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \

The largefile distro feature is for historical reference only. Recipes should always enable largefile support regardless of the distro feature (which will eventually be removed).

Is it worth making it a PACKAGECONFIG at all, or is it preferred to just set —enable-largefile in EXTRA_OECONF? The upstream configure script does enable this by default so it’s not strictly needed at all either, but I usually prefer to be more explicit with configure options (as you can probably tell with this patch!).

Quoted 11 lines

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 32

Quoted 7 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +6 -0
+    backtrace \
+    programs \
+    shared \
+    convert \
+    python \
+    crypto-builtin \

This is not conventional formatting for a list of PACKAGECONFIG options. Maybe have a look at some other recipes in oe-core to get a feel for the typical style.

I’m not sure what you mean. Would you prefer them on one line rather than split? In a specific order? There seems to be a lot of different styles in use, so I tried to follow the OE style guide, which suggests splitting lists like this, but maybe I’m misunderstanding.

Quoted 11 lines

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 39

Quoted 8 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +3 -0
+"
+PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile"
+PACKAGECONFIG[backtrace] = "--enable-backtrace,--disable-backtrace"

PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +3 -0
+PACKAGECONFIG[programs] = "--enable-programs,--disable-programs"
+PACKAGECONFIG[shared] = "--enable-shared,--disable-shared"
+PACKAGECONFIG[static] = "--enable-static,--disable-static"

The choice to build shared and/or static libs is not something which is typically controlled by PACKAGECONFIG options.

Some recipes do use PACKAGECONFIG, such as ffmpeg, but in grepping the repo it seems more common to use EXTRA_OECONF. Is there a reason not to use PACKAGECONFIG here? Just that building the static libraries is uncommon? I don’t mind changing it, just curious.

Quoted 14 lines
Quoted 14 lines

+PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs" PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native" PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +6 -0
+# Pick only one crypto provider
+PACKAGECONFIG[crypto-builtin] = "--with-crypto=builtin"
+PACKAGECONFIG[crypto-libgcrypt] = "--with-crypto=libgcrypt,,libgcrypt"
+PACKAGECONFIG[crypto-libsodium] = "--with-crypto=libsodium,,libsodium"
+PACKAGECONFIG[crypto-libkcapi] = "--with-crypto=libkcapi,,libkcapi"
+

inherit autotools-brokensep pkgconfig manpages
inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d)}

Quoted 6 lines

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 55

Quoted 4 lines

CLEANBROKEN = "1"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +1 -1
-EXTRA_OECONF_append_libc-musl = " --disable-backtrace "
+PACKAGECONFIG_remove_libc-musl = "backtrace"

Use of _remove in core recipes is discouraged.

I wasn’t sure the best way to handle this. I can put it back the way it was, where the configure script enables the feature by default and it’s disabled only for musl. I could keep the packagconfig and append only for glibc:
PACKAGECONFIG_append_libc-glibc = “ backtrace”
I could also disable the feature by default. I do disable this in my product layer, but I don’t know if that is a good default.

Thanks for the review!

Robert

Quoted 12 lines
Quoted 10 lines

EXTRA_PYTHON_CFLAGS = "${DEBUG_PREFIX_MAP}"
EXTRA_PYTHON_CFLAGS_class-native = ""
EXTRA_PYTHON_LDFLAGS = "${LDFLAGS}"
--
2.26.3

#4 lore raw

Re: [OE-core] [PATCH 2/3] btrfs-tools: Add PACKAGECONFIG options

Quoted 45 lines · Robert Joslyn
Quoted 37 lines · Andre McCurdy
Quoted 34 lines · Robert Joslyn

Add options to make it easier to control which features are enabled. All of these default to enabled by upstream, so keep them enabled to maintain previous behavior.

The convert option also supports reiserfs, but no recipes exist in the layer index. Limit the option to ext filesystems until someone cares enough to make reiserfs recipes.

Remove acl and attr from DEPENDS, as they do not apper to be needed. Add zlib since it is required.

---
.../btrfs-tools/btrfs-tools_5.11.1.bb | 26 ++++++++++++++++---

1 file changed, 23 insertions(+), 3 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +0 -0
index 2ab476a88e..b875ea1aa1 100644
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \
    file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \

"
SECTION = "base"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +1 -1
-DEPENDS = "util-linux attr e2fsprogs lzo acl"
+DEPENDS = "lzo util-linux zlib"

DEPENDS_append_class-target = " udev"
RDEPENDS_${PN} = "libgcc"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +0 -0
@@ -22,17 +22,37 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
           file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
           "
 
Quoted 7 lines

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 26

Quoted 3 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +2 -1
-PACKAGECONFIG ??= "python"
+PACKAGECONFIG ??= " \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \

The largefile distro feature is for historical reference only. Recipes should always enable largefile support regardless of the distro feature (which will eventually be removed).

Quoted 1 line

Is it worth making it a PACKAGECONFIG at all, or is it preferred to just set —enable-largefile in EXTRA_OECONF? The upstream configure script does enable this by default so it’s not strictly needed at all either, but I usually prefer to be more explicit with configure options (as you can probably tell with this patch!).

Adding —enable-largefile to EXTRA_OECONF would be fine.

In general the goal of PACKAGECONFIG is not to expose every possible configure option, but only the ones which we want to encourage people to experiment with or use to control high level functionality. An option to break support for large files doesn't fit into that category.

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +6 -0
+    backtrace \
+    programs \
+    shared \
+    convert \
+    python \
+    crypto-builtin \
Quoted 5 lines
Quoted 3 lines

This is not conventional formatting for a list of PACKAGECONFIG options. Maybe have a look at some other recipes in oe-core to get a feel for the typical style.

I’m not sure what you mean. Would you prefer them on one line rather than split? In a specific order? There seems to be a lot of different styles in use, so I tried to follow the OE style guide, which suggests splitting lists like this, but maybe I’m misunderstanding.

My preference doesn't matter much :-) I was suggesting that you look in oe-core to get a feel for the typical style. Note that the OE style guide mostly predates PACKAGECONFIG and hasn't been updated to cover it in any detail.

Quoted 11 lines
Quoted 10 lines

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 39

Quoted 7 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +3 -0
+"
+PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile"
+PACKAGECONFIG[backtrace] = "--enable-backtrace,--disable-backtrace"

PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +3 -0
+PACKAGECONFIG[programs] = "--enable-programs,--disable-programs"
+PACKAGECONFIG[shared] = "--enable-shared,--disable-shared"
+PACKAGECONFIG[static] = "--enable-static,--disable-static"

The choice to build shared and/or static libs is not something which is typically controlled by PACKAGECONFIG options.

Quoted 1 line

Some recipes do use PACKAGECONFIG, such as ffmpeg, but in grepping the repo it seems more common to use EXTRA_OECONF. Is there a reason not to use PACKAGECONFIG here? Just that building the static libraries is uncommon? I don’t mind changing it, just curious.

See the comment above about the goal of PACKAGECONFIG not being to expose every possible option. However, there are no well defined rules about it (and in general in OE, what rules there are are not consistently enforced) so patches like the one to ffmpeg which converted a lot of inappropriate configure options to PACKAGECONFIG options do sometimes get merged.

Specifically for shared and static libs, shared libs are generally enabled by default but if a particular component didn't do that then the normal approach would be to add a configure option to enable them to EXTRA_OECONF. Static libs are generally unused but harmless, so don't justify a PACKAGECONFIG option to control them. The only real downside of enabling static libs is the wasted build time. If that concerns you then you can try including conf/distro/include/no-static-libs.inc in your distro config file.

Quoted 15 lines
Quoted 15 lines
Quoted 15 lines

+PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs" PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native" PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd"

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +6 -0
+# Pick only one crypto provider
+PACKAGECONFIG[crypto-builtin] = "--with-crypto=builtin"
+PACKAGECONFIG[crypto-libgcrypt] = "--with-crypto=libgcrypt,,libgcrypt"
+PACKAGECONFIG[crypto-libsodium] = "--with-crypto=libsodium,,libsodium"
+PACKAGECONFIG[crypto-libkcapi] = "--with-crypto=libkcapi,,libkcapi"
+

inherit autotools-brokensep pkgconfig manpages
inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d)}

CLEANBROKEN = "1"

Quoted 8 lines
Quoted 4 lines

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ · line 55

Quoted 2 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +1 -1
-EXTRA_OECONF_append_libc-musl = " --disable-backtrace "
+PACKAGECONFIG_remove_libc-musl = "backtrace"

Use of _remove in core recipes is discouraged.

I wasn’t sure the best way to handle this. I can put it back the way it was, where the configure script enables the feature by default and it’s disabled only for musl. I could keep the packagconfig and append only for glibc:
PACKAGECONFIG_append_libc-glibc = “ backtrace”
I could also disable the feature by default. I do disable this in my product layer, but I don’t know if that is a good default.

I don't think backtrace justifies a PACKAGECONFIG option, especially if the default value for the option is problematic (as it seems to be). The original approach of appending --disable-backtrace to EXTRA_OECONF for musl builds looks fine.

#5 lore raw

PATCH 3/3 btrfs-tools: Try to follow style guide

In reply to Robert Joslyn

Cosmetic changes to bettor follow the style guide.

---
 meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +4 -3
index b875ea1aa1..0b8e1d22a2 100644
@@ -15,12 +15,12 @@ LIC_FILES_CHKSUM = " \
 SECTION = "base"
 DEPENDS = "lzo util-linux zlib"
 DEPENDS_append_class-target = " udev"
-RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "8d5051f279f7994fb80536ef8f846f06d121d898"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
+SRCREV = "8d5051f279f7994fb80536ef8f846f06d121d898"
+S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \
@@ -64,7 +64,6 @@ do_configure_prepend() {
 	cp -f $(automake --print-libdir)/install-sh ${S}/config/
 }
 
-S = "${WORKDIR}/git"
 
 do_install_append() {
     if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
@@ -72,4 +71,6 @@ do_install_append() {
     fi
 }
 
+RDEPENDS_${PN} = "libgcc"
+
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.26.3