From b0e0273ebb90228618ed5d5a09991126101c0def Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 7 Oct 2015 00:11:46 +0200 Subject: [PATCH] Revert "qcanobserver: Move to nonworking" * Use PNBLACKLIST instead This reverts commit 8040a4c38bd00e45d50b539affde03deddecd38c. Signed-off-by: Martin Jansa --- .../{nonworking => }/qcanobserver/qcanobserver-socketcan_svn.bb | 1 + ...1-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch | 0 .../qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch | 0 .../{nonworking => }/qcanobserver/qcanobserver/candemo.xml | 0 .../{nonworking => }/qcanobserver/qcanobserver_svn.bb | 2 ++ 5 files changed, 3 insertions(+) rename meta-oe/recipes-qt/{nonworking => }/qcanobserver/qcanobserver-socketcan_svn.bb (92%) rename meta-oe/recipes-qt/{nonworking => }/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch (100%) rename meta-oe/recipes-qt/{nonworking => }/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch (100%) rename meta-oe/recipes-qt/{nonworking => }/qcanobserver/qcanobserver/candemo.xml (100%) rename meta-oe/recipes-qt/{nonworking => }/qcanobserver/qcanobserver_svn.bb (95%) diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb b/meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb similarity index 92% rename from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb rename to meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb index 9852b0c08b..19ea1ea575 100644 --- a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb +++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb @@ -28,3 +28,4 @@ do_install() { FILES_${PN} += "${datadir}/qcanobserver/lib" FILES_${PN}-dbg += "${datadir}/qcanobserver/lib/.debug" +PNBLACKLIST[qcanobserver-socketcan] ?= "depends on qwt-5 APIs" diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch similarity index 100% rename from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch rename to meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch similarity index 100% rename from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch rename to meta-oe/recipes-qt/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml b/meta-oe/recipes-qt/qcanobserver/qcanobserver/candemo.xml similarity index 100% rename from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml rename to meta-oe/recipes-qt/qcanobserver/qcanobserver/candemo.xml diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb b/meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb similarity index 95% rename from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb rename to meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb index 4b566f7a33..54e7fc16be 100644 --- a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb +++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb @@ -39,3 +39,5 @@ do_install() { } FILES_${PN}-dbg += "${datadir}/qcanobserver/.debug" + +PNBLACKLIST[qcanobserver] ?= "depends on qwt-5 APIs"