diff options
Diffstat (limited to 'meta-oe/recipes-support/lvm2/lvm2.inc')
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 3a1e82bac9..277e76f0d2 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -1,35 +1,33 @@ HOMEPAGE = "https://www.sourceware.org/lvm2/" SECTION = "utils" DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" -DEPENDS += "util-linux" +DEPENDS += "libaio" -SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ +SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ file://lvm.conf \ file://0001-implement-libc-specific-reopen_stream.patch \ file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ - file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \ file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ + file://reproducible-build.patch \ " -UPSTREAM_CHECK_URI = "ftp://sources.redhat.com/pub/lvm2/" -UPSTREAM_CHECK_REGEX = "LVM2\.(?P<pver>\d+(\.\d+)+)" +SRCREV = "6d1e894a867681af7a811ed63bc435f3aa55fec8" +S = "${WORKDIR}/git" -S = "${WORKDIR}/LVM2.${PV}" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" -inherit autotools-brokensep pkgconfig systemd license +inherit autotools-brokensep pkgconfig systemd -LVM2_PACKAGECONFIG = "dmeventd lvmetad" -LVM2_PACKAGECONFIG_append_class-target = " \ +LVM2_PACKAGECONFIG = "dmeventd" +LVM2_PACKAGECONFIG:append:class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ - udev \ " # odirect is always enabled because there currently is a bug in @@ -39,18 +37,16 @@ LVM2_PACKAGECONFIG_append_class-target = " \ PACKAGECONFIG ??= "odirect ${LVM2_PACKAGECONFIG}" PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" -PACKAGECONFIG[lvmetad] = "--enable-lvmetad,--disable-lvmetad" PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +# NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" -PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev" # Unset user/group to unbreak install. EXTRA_OECONF = "--with-user= \ --with-group= \ --enable-realtime \ - --enable-applib \ --enable-cmdlib \ --enable-pkgconfig \ --with-usrlibdir=${libdir} \ @@ -62,3 +58,6 @@ EXTRA_OECONF = "--with-user= \ --with-thin-restore=${sbindir}/thin_restore \ " +# gold doesn't like multiple dm_bitset_parse_list definitions in libdm/.exported_symbols.DM_1_02_138 and libdm/.exported_symbols.DM_1_02_129 +# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd", '', d)}" |