[OE-core] [PATCH 2/2] udev: Don't introduce pci dependencies without pci being featured

[Martin Jansa]

On Thu, Oct 08, 2015 at 05:26:11PM +0200, Jens Rehsack wrote:
> Fixes that udev always requires PCI, idenpendently from machine or distro features.
> 
> Signed-off-by: Jens Rehsack <sno at netbsd.org>
> ---
>  meta/recipes-core/udev/udev.inc | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
> index c378ae3..573ecca 100644
> --- a/meta/recipes-core/udev/udev.inc
> +++ b/meta/recipes-core/udev/udev.inc
> @@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>  
>  LDFLAGS += "-lrt"
>  
> -DEPENDS = "glib-2.0 libusb usbutils pciutils glib-2.0-native gperf-native libxslt-native util-linux"
> +DEPENDS = "glib-2.0 glib-2.0-native gperf-native libxslt-native util-linux"
> +DEPENDS += " ${@base_contains('MACHINE_FEATURES', 'usbhost', 'libusb usbutils', '', d)}"
> +DEPENDS += " ${@base_contains('MACHINE_FEATURES', 'pci', 'pciutils', '', d)}"

NAK

udev isn't (and shouldn't be) MACHINE_ARCH, so it cannot use
MACHINE_FEATURES variable.

Please change them to PACKAGECONFIG options and distro can decide to
disable them for all MACHINEs (or at least for whole set of MACHINEs
sharing the same TUNE_PKGARCH)

>  RPROVIDES_${PN} = "hotplug"
>  
>  PROVIDES = "libgudev"
> @@ -39,10 +41,6 @@ RDEPENDS_${PN}-ptest += "make perl python"
>  libexecdir = "${base_libdir}"
>  EXTRA_OECONF = "--disable-introspection \
>                  --with-rootlibdir=${base_libdir} \
> -                --with-pci-ids-path=${datadir}/pci.ids \
> -                ac_cv_file__usr_share_pci_ids=no \
> -                ac_cv_file__usr_share_hwdata_pci_ids=no \
> -                ac_cv_file__usr_share_misc_pci_ids=yes \
>                  --sbindir=${base_sbindir} \
>                  --libexecdir=${nonarch_base_libdir} \
>                  --with-rootlibdir=${base_libdir} \
> @@ -50,6 +48,8 @@ EXTRA_OECONF = "--disable-introspection \
>                  --without-systemdsystemunitdir \
>                 "
>  
> +EXTRA_OECONF += " ${@base_contains('MACHINE_FEATURES', 'pci', '--with-pci-ids-path=${datadir}/pci.ids ac_cv_file__usr_share_pci_ids=no ac_cv_file__usr_share_hwdata_pci_ids=no ac_cv_file__usr_share_misc_pci_ids=yes', '--without-pci-ids-path', d)}"
> +
>  PACKAGES =+ "udev-cache"
>  PACKAGES =+ "libudev"
>  PACKAGES =+ "libgudev"
> -- 
> 2.4.3
> 
> -- 
> Jens Rehsack - rehsack at gmail.com
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20151008/73592db3/attachment-0002.sig>