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

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
bsp/buildroot/package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch Normal file
View File

@@ -0,0 +1,56 @@
From 7cd698eb31059012305d8bb7516577c8cd383e32 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Jun 2017 16:52:37 +0200
Subject: [PATCH] shared/util.c: assert_cc() can only be used inside functions
shared/macro.h has two versions of assert_cc, one that uses gcc
_Static_assert(), which requires recent enough gcc versions, and one
that uses a fake array to trigger a build error. The latter can only
work inside functions, so assert_cc() should only be used inside
functions.
Fixes the following build failure when building kmod with old gcc
versions such as gcc 4.3.x:
shared/util.c:52: error: expected identifier or '(' before 'do'
shared/util.c:52: error: expected identifier or '(' before 'while'
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
shared/util.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/shared/util.c b/shared/util.c
index 9de080a..fd2028d 100644
--- a/shared/util.c
+++ b/shared/util.c
@@ -49,8 +49,6 @@ static const struct kmod_ext {
{ }
};
-assert_cc(EAGAIN == EWOULDBLOCK);
-
/* string handling functions and memory allocations */
/* ************************************************************************ */
@@ -201,6 +199,8 @@ ssize_t read_str_safe(int fd, char *buf, size_t buflen)
size_t todo = buflen - 1;
size_t done = 0;
+ assert_cc(EAGAIN == EWOULDBLOCK);
+
do {
ssize_t r = read(fd, buf + done, todo);
@@ -226,6 +226,8 @@ ssize_t write_str_safe(int fd, const char *buf, size_t buflen)
size_t todo = buflen;
size_t done = 0;
+ assert_cc(EAGAIN == EWOULDBLOCK);
+
do {
ssize_t r = write(fd, buf + done, todo);
--
2.7.4

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

@@ -1,2 +1,2 @@
# From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc
sha256 d303d5519faec9d69e1132f6b37db2579db17a7fb5c1517da0115d03ba168155 kmod-23.tar.xz
sha256 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397 kmod-24.tar.xz

8
bsp/buildroot/package/kmod/kmod.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
KMOD_VERSION = 23
KMOD_VERSION = 24
KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
KMOD_INSTALL_STAGING = YES
@@ -12,7 +12,7 @@ KMOD_DEPENDENCIES = host-pkgconf
HOST_KMOD_DEPENDENCIES = host-pkgconf
# license info for libkmod only, conditionally add more below
KMOD_LICENSE = LGPLv2.1+ (library)
KMOD_LICENSE = LGPL-2.1+ (library)
KMOD_LICENSE_FILES = libkmod/COPYING
# --gc-sections triggers binutils ld segfault
@@ -46,7 +46,7 @@ endif
ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y)
# add license info for kmod tools
KMOD_LICENSE := $(KMOD_LICENSE), GPLv2+ (tools)
KMOD_LICENSE := $(KMOD_LICENSE), GPL-2.0+ (tools)
KMOD_LICENSE_FILES += COPYING
# take precedence over busybox implementation
@@ -74,7 +74,7 @@ endif
# host.
define HOST_KMOD_INSTALL_TOOLS
mkdir -p $(HOST_DIR)/sbin/
ln -sf ../usr/bin/kmod $(HOST_DIR)/sbin/depmod
ln -sf ../bin/kmod $(HOST_DIR)/sbin/depmod
endef
HOST_KMOD_POST_INSTALL_HOOKS += HOST_KMOD_INSTALL_TOOLS