diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-11-27 16:32:44 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-11-27 11:13:37 -0800 |
| commit | a7bc7b6853acbb0b85be2d60fb1046bc481edf5c (patch) | |
| tree | 35ffa468565fa5a3d8c13e8735eabc14a64a63e6 /meta-oe/recipes-support/lvm2/lvm2.inc | |
| parent | 59ea4a873dfbab38b53a74d429f8dd1c6da2cc1f (diff) | |
| download | meta-openembedded-a7bc7b6853acbb0b85be2d60fb1046bc481edf5c.tar.gz | |
lvm2/libdevmapper: 2.02.180 -> 2.03.01
- Upddate upstream SRC_URI, use github to replace tarball
- Rebase 0001-Avoid-bashisms-in-init-scripts.patch,
0005-do-not-build-manual.patch,
0001-explicitly-do-not-install-libdm.patch
- Remove `--enable-applib' since upstream [0d22b58 liblvm: remove lvmapi]
- Remove `lvmetad' since upstream [117160b Remove lvmetad]
- Remove `oe_runmake ... -C tools install_device-mapper' since upstream
[0524829 dmsetup: move to libdm/dm-tools/dmsetup]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2/lvm2.inc')
| -rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 26a887ea10..66b0828473 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ | |||
| 7 | 7 | ||
| 8 | DEPENDS += "util-linux libaio" | 8 | DEPENDS += "util-linux libaio" |
| 9 | 9 | ||
| 10 | SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ | 10 | SRC_URI = "git://github.com/lvmteam/lvm2.git;protocol=https;branch=master \ |
| 11 | file://lvm.conf \ | 11 | file://lvm.conf \ |
| 12 | file://0001-implement-libc-specific-reopen_stream.patch \ | 12 | file://0001-implement-libc-specific-reopen_stream.patch \ |
| 13 | file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ | 13 | file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ |
| @@ -21,11 +21,11 @@ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ | |||
| 21 | UPSTREAM_CHECK_URI = "ftp://sources.redhat.com/pub/lvm2/" | 21 | UPSTREAM_CHECK_URI = "ftp://sources.redhat.com/pub/lvm2/" |
| 22 | UPSTREAM_CHECK_REGEX = "LVM2\.(?P<pver>\d+(\.\d+)+)" | 22 | UPSTREAM_CHECK_REGEX = "LVM2\.(?P<pver>\d+(\.\d+)+)" |
| 23 | 23 | ||
| 24 | S = "${WORKDIR}/LVM2.${PV}" | 24 | S = "${WORKDIR}/git" |
| 25 | 25 | ||
| 26 | inherit autotools-brokensep pkgconfig systemd license | 26 | inherit autotools-brokensep pkgconfig systemd license |
| 27 | 27 | ||
| 28 | LVM2_PACKAGECONFIG = "dmeventd lvmetad" | 28 | LVM2_PACKAGECONFIG = "dmeventd" |
| 29 | LVM2_PACKAGECONFIG_append_class-target = " \ | 29 | LVM2_PACKAGECONFIG_append_class-target = " \ |
| 30 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ | 30 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ |
| 31 | ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ | 31 | ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ |
| @@ -39,7 +39,6 @@ LVM2_PACKAGECONFIG_append_class-target = " \ | |||
| 39 | PACKAGECONFIG ??= "odirect ${LVM2_PACKAGECONFIG}" | 39 | PACKAGECONFIG ??= "odirect ${LVM2_PACKAGECONFIG}" |
| 40 | 40 | ||
| 41 | PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" | 41 | PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" |
| 42 | PACKAGECONFIG[lvmetad] = "--enable-lvmetad,--disable-lvmetad" | ||
| 43 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" | 42 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" |
| 44 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" | 43 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" |
| 45 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | 44 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" |
| @@ -50,7 +49,6 @@ PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${n | |||
| 50 | EXTRA_OECONF = "--with-user= \ | 49 | EXTRA_OECONF = "--with-user= \ |
| 51 | --with-group= \ | 50 | --with-group= \ |
| 52 | --enable-realtime \ | 51 | --enable-realtime \ |
| 53 | --enable-applib \ | ||
| 54 | --enable-cmdlib \ | 52 | --enable-cmdlib \ |
| 55 | --enable-pkgconfig \ | 53 | --enable-pkgconfig \ |
| 56 | --with-usrlibdir=${libdir} \ | 54 | --with-usrlibdir=${libdir} \ |
