diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/lvm2')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index ccb4f7ac1..43356c9cd 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -24,7 +24,7 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd LVM2_PACKAGECONFIG = "dmeventd" -LVM2_PACKAGECONFIG_append_class-target = " \ +LVM2_PACKAGECONFIG:append:class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ " diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb index 7f3f000e0..3988d5491 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb @@ -12,7 +12,7 @@ MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" -do_install_append() { +do_install:append() { # Install machine specific configuration file install -d ${D}${sysconfdir}/lvm install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf @@ -30,33 +30,33 @@ do_install_append() { 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)} \ +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ blk-availability.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" -EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}" +EXTRA_OECONF:append:class-nativesdk = " --with-confdir=${sysconfdir}" DEPENDS += "util-linux" -LVM2_PACKAGECONFIG_append_class-target = " \ +LVM2_PACKAGECONFIG:append:class-target = " \ udev \ " 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" PACKAGES =+ "libdevmapper" -FILES_libdevmapper = " \ +FILES:libdevmapper = " \ ${libdir}/libdevmapper.so.* \ ${sbindir}/dmsetup \ ${sbindir}/dmstats \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/device-mapper/*.so \ ${systemd_system_unitdir}/lvm2-pvscan@.service \ " -FILES_${PN}-scripts = " \ +FILES:${PN}-scripts = " \ ${sbindir}/blkdeactivate \ ${sbindir}/fsadm \ ${sbindir}/lvmconf \ @@ -64,22 +64,22 @@ FILES_${PN}-scripts = " \ " # 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}-udevrules = "libdevmapper" -RDEPENDS_${PN}_append_class-target = " libdevmapper" -RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" +FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" +RDEPENDS:${PN}-udevrules = "libdevmapper" +RDEPENDS:${PN}:append:class-target = " libdevmapper" +RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" -RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ +RDEPENDS:${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ bash \ util-linux-lsblk \ util-linux-findmnt \ coreutils \ " -RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" +RRECOMMENDS:${PN}:class-target = "${PN}-scripts (= ${EXTENDPKGV})" -CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" +CONFFILES:${PN} += "${sysconfdir}/lvm/lvm.conf" -SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess" +SYSROOT_PREPROCESS_FUNCS:append = " remove_libdevmapper_sysroot_preprocess" remove_libdevmapper_sysroot_preprocess() { rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ |