diff options
author | Robert Joslyn <robert.joslyn@redrectangle.org> | 2021-04-17 20:40:40 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-20 13:56:48 +0100 |
commit | 769004c34aef37442334c9d44a0ac280fbf0e120 (patch) | |
tree | 9ec1d75a1d28614b7a13a76304e5299f9d387292 /meta/recipes-devtools/btrfs-tools | |
parent | 46b49025f37cd3bfb9a53ce019697e0874801b0d (diff) | |
download | poky-769004c34aef37442334c9d44a0ac280fbf0e120.tar.gz |
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.
(From OE-Core rev: 7452cab85b65ce4b6e8309ab85ad40555c24435f)
Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb index 2ab476a88e..73d0237635 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb | |||
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ | |||
13 | file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ | 13 | file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ |
14 | " | 14 | " |
15 | SECTION = "base" | 15 | SECTION = "base" |
16 | DEPENDS = "util-linux attr e2fsprogs lzo acl" | 16 | DEPENDS = "lzo util-linux zlib" |
17 | DEPENDS_append_class-target = " udev" | 17 | DEPENDS_append_class-target = " udev" |
18 | RDEPENDS_${PN} = "libgcc" | 18 | RDEPENDS_${PN} = "libgcc" |
19 | 19 | ||
@@ -22,16 +22,30 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ | |||
22 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ | 22 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | PACKAGECONFIG ??= "python" | 25 | PACKAGECONFIG ??= " \ |
26 | programs \ | ||
27 | convert \ | ||
28 | python \ | ||
29 | crypto-builtin \ | ||
30 | " | ||
26 | PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" | 31 | PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" |
32 | PACKAGECONFIG[programs] = "--enable-programs,--disable-programs" | ||
33 | PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs" | ||
27 | PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native" | 34 | PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native" |
28 | PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd" | 35 | PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd" |
29 | 36 | ||
37 | # Pick only one crypto provider | ||
38 | PACKAGECONFIG[crypto-builtin] = "--with-crypto=builtin" | ||
39 | PACKAGECONFIG[crypto-libgcrypt] = "--with-crypto=libgcrypt,,libgcrypt" | ||
40 | PACKAGECONFIG[crypto-libsodium] = "--with-crypto=libsodium,,libsodium" | ||
41 | PACKAGECONFIG[crypto-libkcapi] = "--with-crypto=libkcapi,,libkcapi" | ||
42 | |||
30 | inherit autotools-brokensep pkgconfig manpages | 43 | inherit autotools-brokensep pkgconfig manpages |
31 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d)} | 44 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d)} |
32 | 45 | ||
33 | CLEANBROKEN = "1" | 46 | CLEANBROKEN = "1" |
34 | 47 | ||
48 | EXTRA_OECONF = "--enable-largefile" | ||
35 | EXTRA_OECONF_append_libc-musl = " --disable-backtrace " | 49 | EXTRA_OECONF_append_libc-musl = " --disable-backtrace " |
36 | EXTRA_PYTHON_CFLAGS = "${DEBUG_PREFIX_MAP}" | 50 | EXTRA_PYTHON_CFLAGS = "${DEBUG_PREFIX_MAP}" |
37 | EXTRA_PYTHON_CFLAGS_class-native = "" | 51 | EXTRA_PYTHON_CFLAGS_class-native = "" |