mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
qcanobserver: import from OE Classic with updates and cleanups
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
@@ -0,0 +1,41 @@
|
|||||||
|
From ebb464e3dfa2d59d65c3aa8ee652cb7607481f61 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||||
|
Date: Thu, 10 Nov 2011 19:38:27 +0100
|
||||||
|
Subject: [PATCH] messagebufferinterface.cpp: move sys/socket.h 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 | 7 ++++---
|
||||||
|
1 files changed, 4 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/messagebufferinterface.cpp b/messagebufferinterface.cpp
|
||||||
|
index 116564c..3e9a535 100644
|
||||||
|
--- a/messagebufferinterface.cpp
|
||||||
|
+++ b/messagebufferinterface.cpp
|
||||||
|
@@ -25,14 +25,15 @@
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <QFile>
|
||||||
|
|
||||||
|
+#include <sys/types.h>
|
||||||
|
+#include <sys/socket.h>
|
||||||
|
+#include <sys/stat.h>
|
||||||
|
+
|
||||||
|
//#include <linux/can.h>
|
||||||
|
//#include <linux/can/raw.h>
|
||||||
|
#include <syscall.h>
|
||||||
|
|
||||||
|
#include "configdialog.h"
|
||||||
|
-#include <sys/types.h>
|
||||||
|
-#include <sys/socket.h>
|
||||||
|
-#include <sys/stat.h>
|
||||||
|
#include <linux/can.h>
|
||||||
|
#include <linux/can/raw.h>
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.2.5
|
||||||
|
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
From 3b3cb5212b5dbf182beed171045e5d179b2e9000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||||
|
Date: Fri, 11 Nov 2011 09:32:14 +0100
|
||||||
|
Subject: [PATCH 2/2] qconsole, writethread: gcc 4.5 fixes
|
||||||
|
|
||||||
|
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||||
|
---
|
||||||
|
qconsole.cpp | 2 +-
|
||||||
|
writethread.cpp | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/qconsole.cpp b/qconsole.cpp
|
||||||
|
index ea86957..b5a4687 100644
|
||||||
|
--- a/qconsole.cpp
|
||||||
|
+++ b/qconsole.cpp
|
||||||
|
@@ -22,7 +22,7 @@ QConsole::QConsole()
|
||||||
|
|
||||||
|
{
|
||||||
|
this->setReadOnly(true);
|
||||||
|
- QTextEdit::QTextEdit(NULL);
|
||||||
|
+ QTextEdit(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/writethread.cpp b/writethread.cpp
|
||||||
|
index ef7bc13..ff19560 100755
|
||||||
|
--- a/writethread.cpp
|
||||||
|
+++ b/writethread.cpp
|
||||||
|
@@ -69,7 +69,7 @@ void WriteThread::setDev(void *ConfData, QString InterfaceLib, bool shareDevLib)
|
||||||
|
if(!handle)
|
||||||
|
{
|
||||||
|
QString *ErrStr = new QString(" ");
|
||||||
|
- ErrStr->sprintf("%s %s","Could not load Device Mapper: ", InterfaceLib);
|
||||||
|
+ ErrStr->sprintf("%s %s","Could not load Device Mapper: ", (char*)InterfaceLib.constData());
|
||||||
|
ErrorDialog *ed = new ErrorDialog;
|
||||||
|
ed->SetErrorMessage(*ErrStr);
|
||||||
|
delete ErrStr;
|
||||||
|
--
|
||||||
|
1.7.2.5
|
||||||
|
|
||||||
40
meta-oe/recipes-qt/qcanobserver/qcanobserver/candemo.xml
Executable file
40
meta-oe/recipes-qt/qcanobserver/qcanobserver/candemo.xml
Executable file
@@ -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>
|
||||||
41
meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb
Normal file
41
meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
DESCRIPTION = "The Linux CAN Sniffer"
|
||||||
|
|
||||||
|
LICENSE = "GPLv3+"
|
||||||
|
LIC_FILES_CHKSUM = "file://modeltest/LICENSE.GPL;md5=34337af480a8c452bfafe22a78fa20cb"
|
||||||
|
|
||||||
|
inherit qt4x11
|
||||||
|
|
||||||
|
DEPENDS += "qwt"
|
||||||
|
|
||||||
|
PV = "0.5+svnr${SRCPV}"
|
||||||
|
SRCREV = "48"
|
||||||
|
SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;proto=https \
|
||||||
|
file://0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch \
|
||||||
|
file://0002-qconsole-writethread-gcc-4.5-fixes.patch \
|
||||||
|
file://candemo.xml"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/qcanobserver/"
|
||||||
|
|
||||||
|
CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN"
|
||||||
|
|
||||||
|
do_configure_prepend() {
|
||||||
|
sed -i -e s:/usr/include/qwt5/:${STAGING_INCDIR}:g -e 's:-L/usr/lib/:-L${STAGING_DIR_TARGET}/lib -ldl:g' *.pro
|
||||||
|
}
|
||||||
|
|
||||||
|
do_configure_append() {
|
||||||
|
sed -i -e s:-L/usr/lib::g Makefile
|
||||||
|
}
|
||||||
|
|
||||||
|
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"
|
||||||
Reference in New Issue
Block a user