On Thu, Apr 15, 2021 at 10:38 PM Robert Joslyn
<[email protected]> wrote:
>
> 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.
>
> Signed-off-by: Robert Joslyn <[email protected]>
> ---
> .../btrfs-tools/btrfs-tools_5.11.1.bb | 26 ++++++++++++++++---
> 1 file changed, 23 insertions(+), 3 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..b875ea1aa1 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 = " \
> 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)} \
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).
> + 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.
> +"
> +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.
> +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"
Use of _remove in core recipes is discouraged.
> EXTRA_PYTHON_CFLAGS = "${DEBUG_PREFIX_MAP}"
> EXTRA_PYTHON_CFLAGS_class-native = ""
> EXTRA_PYTHON_LDFLAGS = "${LDFLAGS}"
> --
> 2.26.3
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#150599):
https://lists.openembedded.org/g/openembedded-core/message/150599
Mute This Topic: https://lists.openembedded.org/mt/82135972/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
