udev: Don't introduce usb or pci dependencies without usb or pci being featured
PATCH 1/2 udev: Don't introduce usb or pci dependencies without usb or pci being featured
Fixes that udev always requires PCI or USB, idenpendently from DISTRO_FEATURES or PACKAGECONFIG.
Signed-off-by Jens Rehsack <[email protected]>
--- meta/recipes-core/udev/udev.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
meta/recipes-core/udev/udev.inc +8 -5
@@ -12,7 +12,14 @@ 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" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'usbhost', 'usb', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'pci', 'pci', '', d)}" + +DEPENDS = "glib-2.0 glib-2.0-native gperf-native libxslt-native util-linux" + +PACKAGECONFIG[usb] = "--with-usb-ids-path=${datadir}/usb.ids,--without-usb-ids-path,libusb usbutils" +PACKAGECONFIG[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,pciutils" + RPROVIDES_${PN} = "hotplug" PROVIDES = "libgudev"
@@ -39,10 +46,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} \
Signature · 4 lines
1.9.1 -- Jens Rehsack - [email protected]
Quoted 45 lines
Am 13.10.2015 um 22:37 schrieb Jens Rehsack <[email protected]>:
Fixes that udev always requires PCI or USB, idenpendently from
DISTRO_FEATURESor PACKAGECONFIG.Signed-off-by Jens Rehsack <[email protected]>---
meta/recipes-core/udev/udev.inc | 13 ++++++++-----1 file changed, 8 insertions(+), 5 deletions(-)meta/recipes-core/udev/udev.inc +0
-0@@ -12,7 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \LDFLAGS += "-lrt"
meta/recipes-core/udev/udev.inc +8
-1-DEPENDS = "glib-2.0 libusb usbutils pciutils glib-2.0-native gperf-native libxslt-native util-linux" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'usbhost', 'usb', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'pci', 'pci', '', d)}" + +DEPENDS = "glib-2.0 glib-2.0-native gperf-native libxslt-native util-linux" + +PACKAGECONFIG[usb] = "--with-usb-ids-path=${datadir}/usb.ids,--without-usb-ids-path,libusb usbutils" +PACKAGECONFIG[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,pciutils" +RPROVIDES_${PN} = "hotplug"
PROVIDES = "libgudev"
meta/recipes-core/udev/udev.inc +0
-0@@ -39,10 +46,6 @@ RDEPENDS_${PN}-ptest += "make perl python"libexecdir = "${base_libdir}"
EXTRA_OECONF = "--disable-introspection \ --with-rootlibdir=${base_libdir} \meta/recipes-core/udev/udev.inc +0
-4- --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} \Signature · 1 line
1.9.1
Ping ;)
Signature · 1 line
Jens Rehsack - [email protected]
Quoted 5 lines · Jens Rehsack
Fixes that udev always requires PCI or USB, idenpendently from
DISTRO_FEATURESor PACKAGECONFIG.Signed-off-by Jens Rehsack <[email protected]>
Acked-by Otavio Salvador <[email protected]>
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750