Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
Pascal Vizeli
@@ -1,91 +0,0 @@
|
||||
From cdc63fe259c70a8a5304aa07087650ebf4ee6b5d Mon Sep 17 00:00:00 2001
|
||||
From: Philippe Gerum <rpm@xenomai.org>
|
||||
Date: Wed, 24 Oct 2018 11:28:49 +0200
|
||||
Subject: [PATCH] demos/posix: prevent unterminated destination buffer with
|
||||
strncpy()
|
||||
|
||||
GCC 8.x introduced -Wstringop-truncation to help detecting likely
|
||||
unwanted outcomes of strncpy(dst, src, n), such as omitting the NUL
|
||||
character into the destination buffer whenever n < sizeof(src).
|
||||
|
||||
Fix unsafe strncpy() calls when we do expect a null-terminated
|
||||
destination buffer.
|
||||
|
||||
Signed-off-by: Philippe Gerum <rpm@xenomai.org>
|
||||
[Retrieved from
|
||||
https://gitlab.denx.de/Xenomai/xenomai/commit/cdc63fe259c70a8a5304aa07087650ebf4ee6b5d]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
demo/posix/cobalt/can-rtt.c | 4 ++--
|
||||
demo/posix/cobalt/eth_p_all.c | 3 ++-
|
||||
demo/posix/cyclictest/cyclictest.c | 4 ++--
|
||||
3 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/demo/posix/cobalt/can-rtt.c b/demo/posix/cobalt/can-rtt.c
|
||||
index 61cad05e5..dd212d804 100644
|
||||
--- a/demo/posix/cobalt/can-rtt.c
|
||||
+++ b/demo/posix/cobalt/can-rtt.c
|
||||
@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
|
||||
return -1;
|
||||
}
|
||||
|
||||
- strncpy(ifr.ifr_name, rxdev, IFNAMSIZ);
|
||||
+ namecpy(ifr.ifr_name, rxdev);
|
||||
printf("RX rxsock=%d, ifr_name=%s\n", rxsock, ifr.ifr_name);
|
||||
|
||||
if (ioctl(rxsock, SIOCGIFINDEX, &ifr) < 0) {
|
||||
@@ -282,7 +282,7 @@ int main(int argc, char *argv[])
|
||||
goto failure1;
|
||||
}
|
||||
|
||||
- strncpy(ifr.ifr_name, txdev, IFNAMSIZ);
|
||||
+ namecpy(ifr.ifr_name, txdev);
|
||||
printf("TX txsock=%d, ifr_name=%s\n", txsock, ifr.ifr_name);
|
||||
|
||||
if (ioctl(txsock, SIOCGIFINDEX, &ifr) < 0) {
|
||||
diff --git a/demo/posix/cobalt/eth_p_all.c b/demo/posix/cobalt/eth_p_all.c
|
||||
index 6ac12ab3e..91aef9fbd 100644
|
||||
--- a/demo/posix/cobalt/eth_p_all.c
|
||||
+++ b/demo/posix/cobalt/eth_p_all.c
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <net/if.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/ether.h>
|
||||
+#include <boilerplate/ancillaries.h>
|
||||
|
||||
char buffer[10*1024];
|
||||
int sock;
|
||||
@@ -72,7 +73,7 @@ int main(int argc, char *argv[])
|
||||
if (argc > 1) {
|
||||
struct ifreq ifr;
|
||||
|
||||
- strncpy(ifr.ifr_name, argv[1], IFNAMSIZ);
|
||||
+ namecpy(ifr.ifr_name, argv[1]);
|
||||
if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0) {
|
||||
perror("cannot get interface index");
|
||||
close(sock);
|
||||
diff --git a/demo/posix/cyclictest/cyclictest.c b/demo/posix/cyclictest/cyclictest.c
|
||||
index ebe5461db..76983bd02 100644
|
||||
--- a/demo/posix/cyclictest/cyclictest.c
|
||||
+++ b/demo/posix/cyclictest/cyclictest.c
|
||||
@@ -1353,7 +1353,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
|
||||
case 'F':
|
||||
case OPT_FIFO:
|
||||
use_fifo = 1;
|
||||
- strncpy(fifopath, optarg, strlen(optarg));
|
||||
+ strncpy(fifopath, optarg, sizeof(fifopath) - 1);
|
||||
break;
|
||||
|
||||
case 'H':
|
||||
@@ -1458,7 +1458,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
|
||||
case 'T':
|
||||
case OPT_TRACER:
|
||||
tracetype = CUSTOM;
|
||||
- strncpy(tracer, optarg, sizeof(tracer));
|
||||
+ strncpy(tracer, optarg, sizeof(tracer) - 1);
|
||||
break;
|
||||
case 'u':
|
||||
case OPT_UNBUFFERED:
|
||||
--
|
||||
2.18.1
|
||||
|
||||
@@ -170,11 +170,6 @@ config BR2_PACKAGE_XENOMAI_RTAI_SKIN
|
||||
help
|
||||
This option allows to install the RTAI Xenomai skin
|
||||
|
||||
config BR2_PACKAGE_XENOMAI_SMOKEY_SKIN
|
||||
bool "Smokey skin"
|
||||
help
|
||||
This option allows to install the Smokey Xenomai skin
|
||||
|
||||
config BR2_PACKAGE_XENOMAI_UITRON_SKIN
|
||||
bool "uITRON skin"
|
||||
help
|
||||
|
||||
@@ -1,2 +1,17 @@
|
||||
# Locally computed;
|
||||
sha256 2c0dd3f0e36e4a10f97e0028989bb873e80f4d1ce212ac55fd3b28857c464f94 xenomai-3.0.6.tar.bz2
|
||||
sha256 080f893d6ab8e3065285fbb482695477a0502b9490dccd1f744cebaac94691e5 xenomai-3.0.10.tar.bz2
|
||||
sha256 d37ebe86bf618942dad958927c44403f9b02fbebb3071a4a08408ccbdab5290f debian/copyright
|
||||
sha256 f3380321da72ff509bf6939aa80e6d02fd22268f5c705137b34c205b39bc63a0 include/COPYING
|
||||
sha256 d6b6d8ed1b12309085caf1cf775ea4acdad3288c7f7d993c2502bd19c87e4764 kernel/cobalt/COPYING
|
||||
sha256 d6b6d8ed1b12309085caf1cf775ea4acdad3288c7f7d993c2502bd19c87e4764 kernel/cobalt/posix/COPYING
|
||||
sha256 9c90501baa30534ffed6b39eef413bd1727170ef691fd9768dc8644c3042df54 kernel/cobalt/rtdm/COPYING
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/alchemy/COPYING
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/analogy/COPYING
|
||||
sha256 0519083691511d71408f8c9a2794fa2f6ad13a5eec00717f4572b54d18d6f9da lib/boilerplate/iniparser/LICENSE
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/boilerplate/COPYING
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/cobalt/COPYING
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/copperplate/COPYING
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/psos/COPYING
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/smokey/COPYING
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/trank/COPYING
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/vxworks/COPYING
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
|
||||
ifeq ($(XENOMAI_VERSION),)
|
||||
XENOMAI_VERSION = 3.0.6
|
||||
XENOMAI_VERSION = 3.0.10
|
||||
else
|
||||
BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
|
||||
endif
|
||||
@@ -62,6 +62,9 @@ define XENOMAI_REMOVE_UNNEEDED_FILES
|
||||
for i in xeno xeno-config xeno-info wrap-link.sh ; do \
|
||||
rm -f $(TARGET_DIR)/usr/bin/$$i ; \
|
||||
done
|
||||
for i in cobalt modechk ; do \
|
||||
rm -f $(TARGET_DIR)/usr/lib/$$i.wrappers ; \
|
||||
done
|
||||
for i in autotune corectl hdb rtnet nomaccfg rtcfg rtifconfig \
|
||||
rtiwconfig rtping rtroute tdmacfg rtps slackspot version; do \
|
||||
rm -f $(TARGET_DIR)/usr/sbin/$$i ; \
|
||||
@@ -73,7 +76,7 @@ XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES
|
||||
ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
|
||||
define XENOMAI_REMOVE_TESTSUITE
|
||||
rm -rf $(TARGET_DIR)/usr/share/xenomai/
|
||||
for i in clocktest gpiotest latency spitest switchtest \
|
||||
for i in clocktest gpiotest latency smokey spitest switchtest \
|
||||
xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \
|
||||
rm -f $(TARGET_DIR)/usr/bin/$$i ; \
|
||||
done
|
||||
@@ -109,28 +112,22 @@ endef
|
||||
XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY
|
||||
endif
|
||||
|
||||
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy)
|
||||
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix)
|
||||
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos)
|
||||
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai)
|
||||
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_SMOKEY_SKIN),,smokey)
|
||||
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron)
|
||||
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
|
||||
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx)
|
||||
XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy)
|
||||
XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix)
|
||||
XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos)
|
||||
XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai)
|
||||
XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_TESTSUITE),,smokey)
|
||||
XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron)
|
||||
XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
|
||||
XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx)
|
||||
|
||||
define XENOMAI_REMOVE_SKINS
|
||||
for i in $(XENOMAI_REMOVE_SKIN_LIST) ; do \
|
||||
define XENOMAI_REMOVE_LIBS
|
||||
for i in $(XENOMAI_REMOVE_LIBS_LIST) ; do \
|
||||
rm -f $(TARGET_DIR)/usr/lib/lib$$i.* ; \
|
||||
if [ $$i == "posix" ] ; then \
|
||||
rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \
|
||||
fi ; \
|
||||
if [ $$i == "smokey" ] ; then \
|
||||
rm -f $(TARGET_DIR)/usr/bin/smokey* ; \
|
||||
fi ; \
|
||||
done
|
||||
endef
|
||||
|
||||
XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS
|
||||
XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_LIBS
|
||||
|
||||
define XENOMAI_DEVICES
|
||||
/dev/rtheap c 666 0 0 10 254 0 0 -
|
||||
|
||||
Reference in New Issue
Block a user