From da9138fd7feb4f764bfdcbcc8954269a8eba69c4 Mon Sep 17 00:00:00 2001 From: Hong Liu Date: Tue, 15 May 2018 18:15:18 +0800 Subject: lvm2: 2.02.171 -> 2.02.277 Upgrade lvm2 from 2.02.171 to 2.02.277. Signed-off-by: Hong Liu Signed-off-by: Armin Kuster --- .../recipes-support/lvm2/libdevmapper_2.02.171.bb | 16 ------- .../recipes-support/lvm2/libdevmapper_2.02.177.bb | 16 +++++++ meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb | 54 ---------------------- meta-oe/recipes-support/lvm2/lvm2_2.02.177.bb | 54 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb create mode 100644 meta-oe/recipes-support/lvm2/libdevmapper_2.02.177.bb delete mode 100644 meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb create mode 100644 meta-oe/recipes-support/lvm2/lvm2_2.02.177.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb b/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb deleted file mode 100644 index b6ae90240e..0000000000 --- a/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb +++ /dev/null @@ -1,16 +0,0 @@ -require lvm2.inc - -SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f" -SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964" - -DEPENDS += "autoconf-archive-native" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - oe_runmake 'DESTDIR=${D}' -C libdm install -} - -RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.02.177.bb b/meta-oe/recipes-support/lvm2/libdevmapper_2.02.177.bb new file mode 100644 index 0000000000..211a4726b8 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/libdevmapper_2.02.177.bb @@ -0,0 +1,16 @@ +require lvm2.inc + +SRC_URI[md5sum] = "ee6cfbc5a0c5696ffae79dac04ee7a2b" +SRC_URI[sha256sum] = "4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2" + +DEPENDS += "autoconf-archive-native" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + oe_runmake 'DESTDIR=${D}' -C libdm install +} + +RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb b/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb deleted file mode 100644 index 84881e7442..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb +++ /dev/null @@ -1,54 +0,0 @@ -require lvm2.inc - -SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f" -SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964" - -SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch" - -DEPENDS += "autoconf-archive-native" - -CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" - -do_install_append() { - # Install machine specific configuration file - install -d ${D}${sysconfdir}/lvm - install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf - sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - oe_runmake 'DESTDIR=${D}' install install_systemd_units - sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service - else - oe_runmake 'DESTDIR=${D}' install install_initscripts - mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d - rm -rf ${D}${sysconfdir}/rc.d - fi -} - -PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'lvmetad', 'lvm2-lvmetad.socket lvm2-pvscan@.service', '', d)} \ - blk-availability.service" -SYSTEMD_AUTO_ENABLE = "disable" - -TARGET_CC_ARCH += "${LDFLAGS}" - -FILES_${PN} += "${libdir}/device-mapper/*.so" -FILES_${PN}-scripts = " \ - ${sbindir}/blkdeactivate \ - ${sbindir}/fsadm \ - ${sbindir}/lvmconf \ - ${sbindir}/lvmdump \ -" -# Specified explicitly for the udev rules, just in case that it does not get picked -# up automatically: -FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" -RDEPENDS_${PN}_append_class-target = " libdevmapper" - -RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) bash" -RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" - -CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.02.177.bb b/meta-oe/recipes-support/lvm2/lvm2_2.02.177.bb new file mode 100644 index 0000000000..390970fcb2 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2_2.02.177.bb @@ -0,0 +1,54 @@ +require lvm2.inc + +SRC_URI[md5sum] = "ee6cfbc5a0c5696ffae79dac04ee7a2b" +SRC_URI[sha256sum] = "4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2" + +SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch" + +DEPENDS += "autoconf-archive-native" + +CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" + +do_install_append() { + # Install machine specific configuration file + install -d ${D}${sysconfdir}/lvm + install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf + sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + oe_runmake 'DESTDIR=${D}' install install_systemd_units + sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service + else + oe_runmake 'DESTDIR=${D}' install install_initscripts + mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d + rm -rf ${D}${sysconfdir}/rc.d + fi +} + +PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'lvmetad', 'lvm2-lvmetad.socket lvm2-pvscan@.service', '', d)} \ + blk-availability.service" +SYSTEMD_AUTO_ENABLE = "disable" + +TARGET_CC_ARCH += "${LDFLAGS}" + +FILES_${PN} += "${libdir}/device-mapper/*.so" +FILES_${PN}-scripts = " \ + ${sbindir}/blkdeactivate \ + ${sbindir}/fsadm \ + ${sbindir}/lvmconf \ + ${sbindir}/lvmdump \ +" +# Specified explicitly for the udev rules, just in case that it does not get picked +# up automatically: +FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" +RDEPENDS_${PN}_append_class-target = " libdevmapper" + +RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) bash" +RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" + +CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg