From e739dd5a11f5b2bd9648a45623bc174adae42b6e Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 2 Dec 2015 12:27:06 +0100 Subject: Use libgudev as regular dependency Since eudev 3.1.3 libgudev is not shipped with this package, so libgudev can be used as regular dependency regardless of udev implementation selected. Fixes following build error: http://autobuild.buildroot.net/results/320/320c052bda0f1b5afb1e5c83a7fb4dca6227c5a1// http://autobuild.buildroot.net/results/3b0/3b096f882030325b9290ad8860bd9cd373a11dc2// Signed-off-by: Yegor Yefremov Tested-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Reviewed-by: Vicente Olivert Riera Tested-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/udisks/Config.in | 7 +------ package/udisks/udisks.mk | 7 ++----- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'package/udisks') diff --git a/package/udisks/Config.in b/package/udisks/Config.in index c9664afdf8..8b8fd2880e 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -12,12 +12,7 @@ config BR2_PACKAGE_UDISKS select BR2_PACKAGE_PARTED select BR2_PACKAGE_LVM2 select BR2_PACKAGE_LIBATASMART - # When eudev is used as the udev provider, libgudev is automatically - # provided as it is part of eudev. However, when systemd is used as - # the udev provider, libgudev is not provided, and needs to be built - # separately. This is why we select the libgudev package only if - # systemd is used. - select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD + select BR2_PACKAGE_LIBGUDEV help The udisks project provides diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index eccfbd25b0..eea79e5659 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -18,14 +18,11 @@ UDISKS_DEPENDENCIES = \ polkit \ parted \ lvm2 \ - libatasmart + libatasmart \ + libgudev UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages -ifeq ($(BR2_PACKAGE_LIBGUDEV),y) -UDISKS_DEPENDENCIES += libgudev -endif - ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y) UDISKS_CONF_OPTS += --enable-lvm2 endif -- cgit v1.2.1