From 6775acb048dabd624c5c8197b683aba45ed91569 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 30 Aug 2017 11:13:17 +0800 Subject: udisk: fix dependency about libdevmapper We have separated libdevmapper from lvm2, so we need to also fix related dependency for udisk. Instead of simply replacing lvm2 with libdevmapper in DEPENDS, we add PACKAGECONFIG for libdevmapper. Signed-off-by: Chen Qi Signed-off-by: Martin Jansa --- meta-oe/recipes-support/udisks/udisks_1.0.5.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb index ffe2c26745..e33266001e 100644 --- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb +++ b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces th LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273" -DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native lvm2 \ +DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native \ dbus-glib-native \ " # optional dependencies: device-mapper parted @@ -24,7 +24,8 @@ SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3 inherit autotools-brokensep systemd gtk-doc -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "libdevmapper" +PACKAGECONFIG[libdevmapper] = "--enable-devmapper,--disable-devmapper,libdevmapper" PACKAGECONFIG[parted] = "--enable-parted,--disable-parted,parted" EXTRA_OECONF = "--disable-man-pages --libdir=${base_libdir} --sbindir=${base_sbindir}" -- cgit v1.2