Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,61 @@
|
||||
From e4f31d5a1ce65974c2a6b2e6e1a2b16fffc51518 Mon Sep 17 00:00:00 2001
|
||||
From: Jiri Slaby <jslaby@suse.cz>
|
||||
Date: Tue, 28 Nov 2017 10:15:22 +0100
|
||||
Subject: [PATCH] compat: handle removed autofs macros
|
||||
|
||||
In file included from ioctls/autofs.c:4:0:
|
||||
ioctls/autofs.c:241:8: error: 'AUTOFS_IOC_EXPIRE_INDIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_CMD'?
|
||||
IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
|
||||
^
|
||||
include/ioctls.h:53:15: note: in definition of macro 'IOCTL'
|
||||
{ .request = _request, .name = #_request, }
|
||||
^~~~~~~~
|
||||
ioctls/autofs.c:242:8: error: 'AUTOFS_IOC_EXPIRE_DIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_INDIRECT'?
|
||||
IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
|
||||
^
|
||||
include/ioctls.h:53:15: note: in definition of macro 'IOCTL'
|
||||
{ .request = _request, .name = #_request, }
|
||||
^~~~~~~~
|
||||
|
||||
Define them as AUTOFS_IOC_EXPIRE_MULTI as they used to be.
|
||||
|
||||
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Patch status: upstream commit e4f31d5a1ce
|
||||
|
||||
include/compat.h | 8 ++++++++
|
||||
ioctls/autofs.c | 1 +
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/include/compat.h b/include/compat.h
|
||||
index 10065ceca5f6..fc9a1b95ac4c 100644
|
||||
--- a/include/compat.h
|
||||
+++ b/include/compat.h
|
||||
@@ -1209,3 +1209,11 @@ struct kvm_get_htab_fd {
|
||||
#ifndef SO_IP_SET
|
||||
#define SO_IP_SET 83
|
||||
#endif
|
||||
+
|
||||
+/* linux/auto_fs4.h */
|
||||
+#ifndef AUTOFS_IOC_EXPIRE_INDIRECT
|
||||
+#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI
|
||||
+#endif
|
||||
+#ifndef AUTOFS_IOC_EXPIRE_DIRECT
|
||||
+#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI
|
||||
+#endif
|
||||
diff --git a/ioctls/autofs.c b/ioctls/autofs.c
|
||||
index 04a3eb811326..a39ccccc056b 100644
|
||||
--- a/ioctls/autofs.c
|
||||
+++ b/ioctls/autofs.c
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "shm.h"
|
||||
#include "syscall.h"
|
||||
#include "utils.h"
|
||||
+#include "compat.h"
|
||||
|
||||
/* include/linux/auto_dev-ioctl.h */
|
||||
/*
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From d61dd102b95b9791e45d6bbf1e34814b8c6c1731 Mon Sep 17 00:00:00 2001
|
||||
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
Date: Mon, 14 Dec 2015 14:46:37 +0000
|
||||
Subject: [PATCH] mips: fix prctl's
|
||||
|
||||
It looks like a typo in the syscalls/prctl.c file. It's lacking the PR_
|
||||
preffix, and due to that is causing build failures like this one:
|
||||
|
||||
CC syscalls/prctl.o
|
||||
syscalls/prctl.c:37:2: error: 'GET_FP_MODE' undeclared here (not in a
|
||||
function)
|
||||
GET_FP_MODE, SET_FP_MODE,
|
||||
^
|
||||
syscalls/prctl.c:37:15: error: 'SET_FP_MODE' undeclared here (not
|
||||
in a function)
|
||||
GET_FP_MODE, SET_FP_MODE,
|
||||
^
|
||||
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
---
|
||||
syscalls/prctl.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/syscalls/prctl.c b/syscalls/prctl.c
|
||||
index 523f03e..5a64fb3 100644
|
||||
--- a/syscalls/prctl.c
|
||||
+++ b/syscalls/prctl.c
|
||||
@@ -34,7 +34,7 @@ static int prctl_opts[] = {
|
||||
PR_GET_NO_NEW_PRIVS, PR_GET_TID_ADDRESS, PR_SET_THP_DISABLE, PR_GET_THP_DISABLE,
|
||||
PR_MPX_ENABLE_MANAGEMENT, PR_MPX_DISABLE_MANAGEMENT,
|
||||
#ifdef __mips__
|
||||
- GET_FP_MODE, SET_FP_MODE,
|
||||
+ PR_GET_FP_MODE, PR_SET_FP_MODE,
|
||||
#endif
|
||||
PR_CAP_AMBIENT,
|
||||
};
|
||||
--
|
||||
2.4.10
|
||||
|
||||
@@ -2,6 +2,7 @@ config BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
|
||||
bool
|
||||
default y
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_val_compare_and_swap_4
|
||||
depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \
|
||||
BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \
|
||||
BR2_powerpc64le || BR2_sparc || BR2_x86_64
|
||||
@@ -9,14 +10,12 @@ config BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
|
||||
config BR2_PACKAGE_TRINITY
|
||||
bool "trinity"
|
||||
depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # FTW_ACTIONRETVAL
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # IPV6_UNICAST_IF
|
||||
help
|
||||
A Linux System call fuzz tester
|
||||
|
||||
http://codemonkey.org.uk/projects/trinity/
|
||||
|
||||
comment "trinity needs a uClibc or glibc toolchain w/ headers >= 3.4"
|
||||
comment "trinity needs a toolchain w/ headers >= 3.4"
|
||||
depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_USES_MUSL || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 3ef7ae05dba14f8bb626121983a08bb09d1d51a19de38bd9a8e0f29b11d9e3c9 trinity-v1.6.tar.gz
|
||||
sha256 5601474b10973b99f6f4ecc67c8ac54000754d7110553cc81c7648bd7e73c810 b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch
|
||||
sha256 8cadc4221660b7accc4728311ce1a130ac9b9d1f3b04e35508ba0cc80d9c3f94 trinity-1.8.tar.xz
|
||||
sha256 35e3fc68c89fd7b8f72fd910b521cb3292f859e9181f3c26bd0df84d144bc1d4 COPYING
|
||||
|
||||
@@ -4,15 +4,14 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TRINITY_VERSION = v1.6
|
||||
TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION))
|
||||
TRINITY_LICENSE = GPLv2
|
||||
TRINITY_VERSION = 1.8
|
||||
TRINITY_SITE = http://codemonkey.org.uk/projects/trinity
|
||||
TRINITY_SOURCE = trinity-$(TRINITY_VERSION).tar.xz
|
||||
TRINITY_LICENSE = GPL-2.0
|
||||
TRINITY_LICENSE_FILES = COPYING
|
||||
|
||||
TRINITY_PATCH = https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch
|
||||
|
||||
define TRINITY_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.sh)
|
||||
(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure)
|
||||
endef
|
||||
|
||||
define TRINITY_BUILD_CMDS
|
||||
|
||||
Reference in New Issue
Block a user