rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bsp/buildroot/package/urg/0001-select-h.patch
View File

@@ -1,11 +1,39 @@
--- urg-0.8.18/src/c/connection/serial_ctrl_lin.c 2010-11-22 01:48:01.000000000 +0000
+++ urg-0.8.18.mod/src/c/connection/serial_ctrl_lin.c 2013-05-21 20:56:35.822025969 +0100
@@ -17,7 +17,7 @@
#include <fcntl.h>
From 08c7ebec7c58fbc9c1cc0542863b34119c75c91f Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 15 Sep 2016 06:19:57 +0200
Subject: [PATCH] Serial driver: add missing header to C and C++ serial driver
Fixes:
http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
src/c/connection/serial_ctrl_lin.c | 1 +
src/cpp/connection/SerialDevice_lin.cpp | 1 +
2 files changed, 2 insertions(+)
Index: b/src/c/connection/serial_ctrl_lin.c
===================================================================
--- a/src/c/connection/serial_ctrl_lin.c
+++ b/src/c/connection/serial_ctrl_lin.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <string.h>
-
+#include <sys/select.h>
//#include <ctype.h>
enum {
Index: b/src/cpp/connection/SerialDevice_lin.cpp
===================================================================
--- a/src/cpp/connection/SerialDevice_lin.cpp
+++ b/src/cpp/connection/SerialDevice_lin.cpp
@@ -13,7 +13,7 @@
#include <cerrno>
#include <cstring>
#include <cstdio>
-
+#include <sys/select.h>
class RawSerialDevice
{

99
bsp/buildroot/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch Normal file
View File

@@ -0,0 +1,99 @@
urg: fix 'narrowing conversion' with gcc6
Fixes:
http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
--- a/src/cpp/urg/ScipHandler.cpp 2016-09-11 16:11:16.083995214 +0200
+++ b/src/cpp/urg/ScipHandler.cpp 2016-09-11 16:11:24.380832543 +0200
@@ -120,7 +120,7 @@ struct ScipHandler::pImpl
// QT の発行
int return_code = -1;
- char qt_expected_response[] = { 0, -1 };
+ char qt_expected_response[] = { 0, (char)-1 };
// return_code を使いたいため、setLaserOutput() を用いずに QT を送信する
if (response(return_code, "QT\n", qt_expected_response)) {
laser_state_ = LaserOff;
@@ -139,7 +139,7 @@ struct ScipHandler::pImpl
} else if (return_code == Scip11Response) {
// SCIP1.1 プロトコルの場合のみ、SCIP2.0 を送信する
- char scip20_expected_response[] = { 0, -1 };
+ char scip20_expected_response[] = { 0, (char)-1 };
if (! response(return_code, "SCIP2.0\n", scip20_expected_response)) {
error_message_ =
"SCIP1.1 protocol is not supported. Please update URG firmware, or reconnect after a few seconds because sensor is booting.";
@@ -150,7 +150,7 @@ struct ScipHandler::pImpl
} else if (return_code == 0xE) {
// TM モードとみなし、TM2 を発行する
- char tm2_expected_response[] = { 0, -1 };
+ char tm2_expected_response[] = { 0, (char)-1 };
if (response(return_code, "TM2\n", tm2_expected_response)) {
laser_state_ = LaserOff;
return changeBothBaudrate(baudrate);
@@ -202,7 +202,7 @@ struct ScipHandler::pImpl
snprintf(send_buffer, 10, "SS%06ld\n", baudrate);
int return_code = -1;
// !!! 既に設定対象のボーレート、の場合の戻り値を ss_expected... に追加する
- char ss_expected_response[] = { 0, 0x3, 0x4, 0xf, -1 };
+ char ss_expected_response[] = { 0, 0x3, 0x4, 0xf, (char)-1 };
if (! response(return_code, send_buffer, ss_expected_response)) {
error_message_ = "Baudrate change fail.";
return false;
@@ -216,7 +216,7 @@ struct ScipHandler::pImpl
{
// PP の送信とデータの受信
int return_code = -1;
- char pp_expected_response[] = { 0, -1 };
+ char pp_expected_response[] = { 0, (char)-1 };
vector<string> lines;
if (! response(return_code, "PP\n", pp_expected_response, &lines)) {
error_message_ = "PP fail.";
@@ -356,7 +356,7 @@ struct ScipHandler::pImpl
if (on) {
int return_code = -1;
- char expected_response[] = { 0, -1 };
+ char expected_response[] = { 0, (char)-1 };
if (! response(return_code, "BM\n", expected_response)) {
error_message_ = "BM fail.";
return false;
@@ -369,7 +369,7 @@ struct ScipHandler::pImpl
if (! mx_capturing_) {
// 消灯するための QT では、応答を待つべき
int return_code = -1;
- char qt_expected_response[] = { 0, -1 };
+ char qt_expected_response[] = { 0, (char)-1 };
if (! response(return_code, "QT\n", qt_expected_response)) {
return false;
}
@@ -777,7 +777,7 @@ bool ScipHandler::loadParameter(RangeSen
bool ScipHandler::versionLines(vector<string>& lines)
{
int return_code = -1;
- char expected_response[] = { 0, -1 };
+ char expected_response[] = { 0, (char)-1 };
if (! pimpl->response(return_code, "VV\n", expected_response, &lines)) {
return false;
}
@@ -792,7 +792,7 @@ bool ScipHandler::setRawTimestampMode(bo
// TM0 or TM2 の送信
int return_code = -1;
- char expected_response[] = { 0, -1 };
+ char expected_response[] = { 0, (char)-1 };
if (! pimpl->response(return_code, send_command, expected_response)) {
pimpl->error_message_ = (on) ? "TM0 fail." : "TM2 fail.";
return false;
@@ -809,7 +809,7 @@ bool ScipHandler::rawTimestamp(int* time
{
// TM1 の値を返す
int return_code = -1;
- char expected_response[] = { 0, -1 };
+ char expected_response[] = { 0, (char)-1 };
vector<string> lines;
if (! pimpl->response(return_code, "TM1\n", expected_response, &lines)) {
pimpl->error_message_ = "TM1 fail.";

2
bsp/buildroot/package/urg/Config.in
View File

@@ -4,7 +4,7 @@ config BR2_PACKAGE_URG
help
Library to control Hokuyo's URG series sensors.
http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
https://sourceforge.net/p/urgnetwork/wiki/Home/
comment "urg needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP

2
bsp/buildroot/package/urg/urg.hash
View File

@@ -1,2 +1,4 @@
# from http://pkgs.fedoraproject.org/repo/pkgs/urg/urg-0.8.18.zip/
md5 93f90d2ccc36e784407c5282ef6bd2cb urg-0.8.18.zip
# Locally calculated
sha256 b2cab7e539c90c60fc99a2350a42b5d5390ff952b694b196c3cbb54623cfee7f urg-0.8.18.zip

2
bsp/buildroot/package/urg/urg.mk
View File

@@ -5,7 +5,7 @@
################################################################################
URG_VERSION = 0.8.18
URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en
URG_SITE = http://pkgs.fedoraproject.org/repo/pkgs/urg/urg-0.8.18.zip/md5/93f90d2ccc36e784407c5282ef6bd2cb
URG_SOURCE = urg-$(URG_VERSION).zip
URG_LICENSE = LGPLv3
URG_LICENSE_FILES = COPYING