From 88bea29585e15b2d0d94647030b49b3034df0307 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Fri, 24 Feb 2017 16:30:20 -0500 Subject: usb-modeswitch: update inherit to work correctly with RSS Resolves build issues exposed by RSS http://errors.yoctoproject.org/Errors/Details/130620/ Signed-off-by: Derek Straka Signed-off-by: Martin Jansa --- .../recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb | 4 ---- meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb index 434f68a1d8..a265411c1e 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20140529.bb @@ -15,7 +15,3 @@ do_install() { RDEPENDS_${PN} = "usb-modeswitch (>= 2.2.0)" FILES_${PN} += "${base_libdir}/udev/rules.d/ \ ${datadir}/usb_modeswitch" - -PNBLACKLIST[usb-modeswitch-data] ?= "Runtime depends on blacklisted usb-modeswitch" - -PNBLACKLIST[usb-modeswitch-data] ?= "Runtime depends on blacklisted usb-modeswitch-data" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb index 5211d7bb25..0c548d8bac 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb @@ -8,6 +8,8 @@ SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" SRC_URI[md5sum] = "f323fe700edd6ea404c40934ddf32b22" SRC_URI[sha256sum] = "2752103de171ed5f6c8d6a6e3e73e16c9ee3e8e394dd39c5991f7680eb908a3a" +inherit pkgconfig + EXTRA_OEMAKE = "TCL=${bindir}/tclsh" FILES_${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch" @@ -17,5 +19,3 @@ RRECOMMENDS_${PN} = "usb-modeswitch-data" do_install() { oe_runmake DESTDIR=${D} install } - -PNBLACKLIST[usb-modeswitch] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130620/" -- cgit v1.2.3-54-g00ecf