initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,38 @@
|
||||
From e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8 Mon Sep 17 00:00:00 2001
|
||||
From: Vinson Lee <vlee@freedesktop.org>
|
||||
Date: Thu, 30 Jan 2020 22:09:45 -0800
|
||||
Subject: [PATCH] Fix build with GCC 10.
|
||||
|
||||
CC trinity
|
||||
/usr/bin/ld: debug.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
|
||||
/usr/bin/ld: log-files.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
|
||||
/usr/bin/ld: log.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
|
||||
/usr/bin/ld: main.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
|
||||
/usr/bin/ld: output.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
|
||||
/usr/bin/ld: params.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
|
||||
/usr/bin/ld: shm.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
|
||||
/usr/bin/ld: trinity.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
|
||||
|
||||
Fixes: 13856316c259 ("reinstate the log-to-file code for now.")
|
||||
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
include/logfile.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/logfile.h b/include/logfile.h
|
||||
index 90ea8b23..2305ac15 100644
|
||||
--- a/include/logfile.h
|
||||
+++ b/include/logfile.h
|
||||
@@ -5,7 +5,7 @@
|
||||
FILE *find_logfile_handle(void);
|
||||
void synclogs(void);
|
||||
|
||||
-FILE *mainlogfile;
|
||||
+extern FILE *mainlogfile;
|
||||
void open_main_logfile(void);
|
||||
void close_logfile(FILE **handle);
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
From da65f0aa2bfcb4a2d9a77abfaa2955c6be3d37c9 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 17 Jul 2021 08:02:31 +0200
|
||||
Subject: [PATCH] net/proto-ip-raw.c: fix build with kernel >= 5.13
|
||||
|
||||
Fix the following build failure with kernel >= 5.13:
|
||||
|
||||
In file included from /home/buildroot/autobuild/instance-2/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/linux/icmp.h:23,
|
||||
from net/proto-ip-raw.c:1:
|
||||
/home/buildroot/autobuild/instance-2/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/netinet/in.h:33:5: error: redeclaration of enumerator 'IPPROTO_IP'
|
||||
33 | IPPROTO_IP = 0, /* Dummy protocol for TCP. */
|
||||
| ^~~~~~~~~~
|
||||
/home/buildroot/autobuild/instance-2/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/linux/in.h:29:3: note: previous definition of 'IPPROTO_IP' was here
|
||||
29 | IPPROTO_IP = 0, /* Dummy protocol for TCP */
|
||||
| ^~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/c58119baed8d7711da799e34a5ee1117f46b96f4
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/kernelslacker/trinity/pull/35]
|
||||
---
|
||||
net/proto-ip-raw.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/net/proto-ip-raw.c b/net/proto-ip-raw.c
|
||||
index 95f2cb13..b407bb68 100644
|
||||
--- a/net/proto-ip-raw.c
|
||||
+++ b/net/proto-ip-raw.c
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include <netinet/in.h>
|
||||
#include <linux/icmp.h>
|
||||
#include "net.h"
|
||||
#include "trinity.h"
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
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
|
||||
|
||||
config BR2_PACKAGE_TRINITY
|
||||
bool "trinity"
|
||||
depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
|
||||
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 toolchain w/ headers >= 3.4"
|
||||
depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 7e0da953c2cc6fb3907d1f37d35f61836433fb50e97117a72eef113abb783dc6 trinity-1.9.tar.xz
|
||||
sha256 35e3fc68c89fd7b8f72fd910b521cb3292f859e9181f3c26bd0df84d144bc1d4 COPYING
|
||||
@@ -0,0 +1,33 @@
|
||||
################################################################################
|
||||
#
|
||||
# trinity
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TRINITY_VERSION = 1.9
|
||||
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_CPE_ID_VENDOR = trinity_project
|
||||
|
||||
define TRINITY_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure)
|
||||
endef
|
||||
|
||||
define TRINITY_BUILD_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define TRINITY_INSTALL_TARGET_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install
|
||||
endef
|
||||
|
||||
# Install helper scripts
|
||||
define TRINITY_INSTALL_HELPER_SCRIPTS
|
||||
mkdir -p $(TARGET_DIR)/usr/libexec/trinity
|
||||
cp -p $(@D)/scripts/* $(TARGET_DIR)/usr/libexec/trinity/
|
||||
endef
|
||||
TRINITY_POST_INSTALL_TARGET_HOOKS += TRINITY_INSTALL_HELPER_SCRIPTS
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user