diff options
| author | Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2019-11-06 20:11:35 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-11-06 19:58:01 -0800 |
| commit | 51dd17d6277653306bf10e6ca537847ee9d54696 (patch) | |
| tree | fc1918347ef31cbb4800207e351ad2cbc8f397ad /meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb | |
| parent | dc9caf5d1d20933805e9c754a160842b23c83615 (diff) | |
| download | meta-openembedded-51dd17d6277653306bf10e6ca537847ee9d54696.tar.gz | |
lvm2/libdevmapper: 2.03.05 -> 2.03.06
1) Remove five patches for they have been merged in new version.
0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch
0001-configure-Fix-setting-of-CLDFLAGS-default.patch
0001-activation-add-synchronization-point.patch
0002-activation-extend-handling-of-pending_delete.patch
0003-snapshot-always-activate.patch
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb')
| -rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb deleted file mode 100644 index b80f1fd4bb..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb +++ /dev/null | |||
| @@ -1,92 +0,0 @@ | |||
| 1 | require lvm2.inc | ||
| 2 | |||
| 3 | SRC_URI += " \ | ||
| 4 | file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ | ||
| 5 | file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ | ||
| 6 | file://0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch \ | ||
| 7 | file://0001-activation-add-synchronization-point.patch \ | ||
| 8 | file://0002-activation-extend-handling-of-pending_delete.patch \ | ||
| 9 | file://0003-snapshot-always-activate.patch \ | ||
| 10 | " | ||
| 11 | |||
| 12 | DEPENDS += "autoconf-archive-native" | ||
| 13 | |||
| 14 | inherit multilib_script | ||
| 15 | |||
| 16 | MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" | ||
| 17 | |||
| 18 | CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" | ||
| 19 | |||
| 20 | do_install_append() { | ||
| 21 | # Install machine specific configuration file | ||
| 22 | install -d ${D}${sysconfdir}/lvm | ||
| 23 | install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf | ||
| 24 | sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf | ||
| 25 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
| 26 | oe_runmake 'DESTDIR=${D}' install install_systemd_units | ||
| 27 | sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service | ||
| 28 | else | ||
| 29 | oe_runmake 'DESTDIR=${D}' install install_initscripts | ||
| 30 | mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d | ||
| 31 | rm -rf ${D}${sysconfdir}/rc.d | ||
| 32 | fi | ||
| 33 | } | ||
| 34 | |||
| 35 | PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" | ||
| 36 | |||
| 37 | SYSTEMD_PACKAGES = "${PN}" | ||
| 38 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ | ||
| 39 | blk-availability.service lvm2-pvscan@.service" | ||
| 40 | SYSTEMD_AUTO_ENABLE = "disable" | ||
| 41 | |||
| 42 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
| 43 | |||
| 44 | EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}" | ||
| 45 | |||
| 46 | DEPENDS += "util-linux" | ||
| 47 | LVM2_PACKAGECONFIG_append_class-target = " \ | ||
| 48 | udev \ | ||
| 49 | " | ||
| 50 | PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" | ||
| 51 | |||
| 52 | PACKAGES =+ "libdevmapper" | ||
| 53 | FILES_libdevmapper = " \ | ||
| 54 | ${libdir}/libdevmapper.so.* \ | ||
| 55 | ${sbindir}/dmsetup \ | ||
| 56 | ${sbindir}/dmstats \ | ||
| 57 | " | ||
| 58 | |||
| 59 | FILES_${PN} += "${libdir}/device-mapper/*.so" | ||
| 60 | FILES_${PN}-scripts = " \ | ||
| 61 | ${sbindir}/blkdeactivate \ | ||
| 62 | ${sbindir}/fsadm \ | ||
| 63 | ${sbindir}/lvmconf \ | ||
| 64 | ${sbindir}/lvmdump \ | ||
| 65 | " | ||
| 66 | # Specified explicitly for the udev rules, just in case that it does not get picked | ||
| 67 | # up automatically: | ||
| 68 | FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" | ||
| 69 | RDEPENDS_${PN}-udevrules = "libdevmapper" | ||
| 70 | RDEPENDS_${PN}_append_class-target = " libdevmapper" | ||
| 71 | RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" | ||
| 72 | |||
| 73 | RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ | ||
| 74 | bash \ | ||
| 75 | util-linux-lsblk \ | ||
| 76 | util-linux-findmnt \ | ||
| 77 | coreutils \ | ||
| 78 | " | ||
| 79 | RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" | ||
| 80 | |||
| 81 | CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" | ||
| 82 | |||
| 83 | SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess" | ||
| 84 | remove_libdevmapper_sysroot_preprocess() { | ||
| 85 | rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ | ||
| 86 | ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ | ||
| 87 | ${SYSROOT_DESTDIR}${sbindir}/dmstats \ | ||
| 88 | ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ | ||
| 89 | ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc | ||
| 90 | } | ||
| 91 | |||
| 92 | BBCLASSEXTEND = "native nativesdk" | ||
