diff options
author | Koen Kooi <koen@openembedded.org> | 2011-02-23 16:37:53 +0100 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2011-02-23 16:44:40 +0100 |
commit | 8e91c85042e28f720a051ce22d0535aeba5ea830 (patch) | |
tree | 946885fb7f2e7ef0798a1a9afd60d4f4d0ccfd5f /recipes/qcanobserver | |
parent | 17f3253e285b828adb4daa0b8b2eb9cda9e5bdfe (diff) | |
download | openembedded-8e91c85042e28f720a051ce22d0535aeba5ea830.tar.gz |
qcanobserver: add svnr41 + socketcan driver
Signed-off-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'recipes/qcanobserver')
4 files changed, 136 insertions, 0 deletions
diff --git a/recipes/qcanobserver/qcanobserver-socketcan_svn.bb b/recipes/qcanobserver/qcanobserver-socketcan_svn.bb new file mode 100644 index 0000000000..26bc223469 --- /dev/null +++ b/recipes/qcanobserver/qcanobserver-socketcan_svn.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "The Linux CAN Sniffer - SocketCAN driver" +LICENSE = "GPLv3+" + +inherit qt4x11 + +DEPENDS += "qwt libsocketcan" + +PV = "0.5+svnr${SRCPV}" +SRCREV = "41" +SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;proto=https" + +S = "${WORKDIR}/qcanobserver/DeviceLib/linux/SocketCAN" + +CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN" + +do_configure_prepend() { + sed -i s:/usr/include/qwt5/:${STAGING_INCDIR}:g *.pro +} + +do_install() { + install -d ${D}${datadir}/qcanobserver/lib + + install -m 0755 ${S}/lib* ${D}${datadir}/qcanobserver/lib/ +} + +FILES_${PN} += "${datadir}/qcanobserver/lib" +FILES_${PN}-dbg += "${datadir}/qcanobserver/lib/.debug" + diff --git a/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch b/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch new file mode 100644 index 0000000000..6a19d8ddbf --- /dev/null +++ b/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch @@ -0,0 +1,34 @@ +From 44091a3ad90447d11dbdd94490760c45c13394e6 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 23 Feb 2011 16:11:00 +0100 +Subject: [PATCH] messagebufferinterface.cpp: add sys/socket.h as include + +This prevents the following error during cross-compiling: + +| In file included from messagebufferinterface.cpp:30: +| /OE/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/linux/can.h:81: error: 'sa_family_t' does not name a type + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + messagebufferinterface.cpp | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/messagebufferinterface.cpp b/messagebufferinterface.cpp +index e26b52d..117ebb4 100644 +--- a/messagebufferinterface.cpp ++++ b/messagebufferinterface.cpp +@@ -19,8 +19,9 @@ + #include "errordialog.h" + #include <stdio.h> + #include <fcntl.h> +-#include<sys/types.h> +-#include<sys/stat.h> ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <sys/stat.h> + #include <string.h> + #include <stdlib.h> + #include <sys/time.h> +-- +1.6.6.1 + diff --git a/recipes/qcanobserver/qcanobserver/candemo.xml b/recipes/qcanobserver/qcanobserver/candemo.xml new file mode 100755 index 0000000000..304713fdda --- /dev/null +++ b/recipes/qcanobserver/qcanobserver/candemo.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<Database Name="EW-demo"> + <ID Id="180"> + <Item0> + <interpret Multiplier="0.010986328125" Name="MotorPos" Offset="-180" Datamask="00120000"> + </interpret> + </Item0> + </ID> + <ID Id="280"> + <Item0> + <interpret Multiplier="1.0" Name="Fanstatus" Offset="0" Datamask="10000000"> + </interpret> + </Item0> + </ID> + <ID Id="380"> + <Item0> + <interpret Multiplier="0.00390625" Name="temp1" Offset="0" Datamask="00120000"> + </interpret> + </Item0> + </ID> + <ID Id="480"> + <Item0> + <interpret Multiplier="1.0" Name="fanstatus" Offset="0" Datamask="10000000"> + </interpret> + </Item0> + </ID> + <ID Id="580"> + <Item0> + <interpret Multiplier="1.0" Name="lampstatus" Offset="0" Datamask="10000000"> + </interpret> + </Item0> + </ID> + <ID Id="680"> + <Item0> + <interpret Multiplier="0.00390625" Name="Lightsensor" Offset="0" Datamask="00120000"> + </interpret> + </Item0> + </ID> +</Database> diff --git a/recipes/qcanobserver/qcanobserver_svn.bb b/recipes/qcanobserver/qcanobserver_svn.bb new file mode 100644 index 0000000000..4a7bd62e99 --- /dev/null +++ b/recipes/qcanobserver/qcanobserver_svn.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "The Linux CAN Sniffer" +LICENSE = "GPLv3+" + +inherit qt4x11 + +DEPENDS += "qwt" + +PV = "0.5+svnr${SRCPV}" +SRCREV = "41" +SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;proto=https \ + file://0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch \ + file://candemo.xml" + +S = "${WORKDIR}/qcanobserver/" + +CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN" + +do_configure_prepend() { + sed -i s:/usr/include/qwt5/:${STAGING_INCDIR}:g *.pro +} + +do_install() { + install -d ${D}${datadir}/qcanobserver + install -d ${D}${datadir}/qcanobserver/cfg + install -d ${D}${datadir}/qcanobserver/lib + install -d ${D}${datadir}/qcanobserver/db + + install -m 0755 ${S}/QCanObserver ${D}${datadir}/qcanobserver + + install -m 0644 ${WORKDIR}/candemo.xml ${D}${datadir}/qcanobserver/db + install -m 0644 ${S}/db/*.xml ${D}${datadir}/qcanobserver/db +} + +FILES_${PN}-dbg += "${datadir}/qcanobserver/.debug" |