initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,38 @@
|
||||
The char * to unsigned char * change happened for the libnetfilter_queue
|
||||
1.0.0 release, not the linux headers.
|
||||
So drop the linux headers version check since it causes more harm than
|
||||
good by trying the old API when the toolchain uses old linux headers
|
||||
with a new-enough libnetfilter_queue.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff -Nura norm-1.5r6.orig/protolib/src/linux/linuxDetour.cpp norm-1.5r6/protolib/src/linux/linuxDetour.cpp
|
||||
--- norm-1.5r6.orig/protolib/src/linux/linuxDetour.cpp 2016-03-31 10:17:20.674745597 -0300
|
||||
+++ norm-1.5r6/protolib/src/linux/linuxDetour.cpp 2016-03-31 10:36:58.923084395 -0300
|
||||
@@ -16,8 +16,6 @@
|
||||
#include <linux/if_ether.h> // for ETH_P_IP
|
||||
#include <net/if_arp.h> // for ARPHRD_ETHER
|
||||
|
||||
-#include <linux/version.h> // for LINUX_VERSION_CODE
|
||||
-
|
||||
/** NOTES:
|
||||
*
|
||||
* 1) This newer implementation of LinuxDetour uses netfilter_queue
|
||||
@@ -591,17 +589,7 @@
|
||||
|
||||
// Finally record packet length and cache pointer to IP packet data
|
||||
|
||||
- // A change to the nfq_get_payload() prototype seemed to kick in around Linux header files
|
||||
- // version 3.6? (This will probably need to be fine tuned for the right version threshold.)
|
||||
-
|
||||
-#define LINUX_VERSION_MAJOR (LINUX_VERSION_CODE/65536)
|
||||
-#define LINUX_VERSION_MINOR ((LINUX_VERSION_CODE - (LINUX_VERSION_MAJOR*65536)) / 256)
|
||||
-
|
||||
-#if ((LINUX_VERSION_MAJOR > 3) || ((LINUX_VERSION_MAJOR == 3) && (LINUX_VERSION_MINOR > 5)))
|
||||
linuxDetour->nfq_pkt_len = nfq_get_payload(nfqData, (unsigned char**)(&linuxDetour->nfq_pkt_data));
|
||||
-#else
|
||||
- linuxDetour->nfq_pkt_len = nfq_get_payload(nfqData, &linuxDetour->nfq_pkt_data);
|
||||
-#endif //
|
||||
return 0;
|
||||
} // end LinuxDetour::NfqCallback()
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 8c02c2cbc6f07ddaef23e6bf2f6b9a269ed85ff4 Mon Sep 17 00:00:00 2001
|
||||
From: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||
Date: Tue, 4 Feb 2020 11:59:07 +0100
|
||||
Subject: [PATCH] Use print as function call for Python3 compatibility
|
||||
|
||||
A similar patch has already been applied upstream, in commit
|
||||
ada15125a1cbb3b1718d6eef78512a36ed327fcc, which will therefore be
|
||||
available in the next norm release
|
||||
|
||||
Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||
---
|
||||
wscript | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index 8428899..0fdae96 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -32,7 +32,7 @@ for line in vfile.readlines():
|
||||
if "#define" == line[0] and "VERSION" == line[1]:
|
||||
VERSION = line[2].strip('"')
|
||||
if VERSION is None:
|
||||
- print "Warning: NORM VERSION not found!?"
|
||||
+ print("Warning: NORM VERSION not found!?")
|
||||
|
||||
# So you don't need to do ./waf configure if you are just using the defaults
|
||||
waflib.Configure.autoconfig = True
|
||||
--
|
||||
2.24.1
|
||||
@@ -0,0 +1,41 @@
|
||||
From 0ff75628845d3c86974c31b50ecd60c0b0144c6d Mon Sep 17 00:00:00 2001
|
||||
From: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||
Date: Tue, 4 Feb 2020 13:44:27 +0100
|
||||
Subject: [PATCH] Fix mixed tabs/spaces in protolib wscript
|
||||
|
||||
This fixes the following error when using waf in Python3:
|
||||
TabError: inconsistent use of tabs and spaces in indentation
|
||||
|
||||
The upstream file has since diverged, but with similar issues.
|
||||
[Upstream status: https://github.com/USNavalResearchLaboratory/protolib/pull/6]
|
||||
|
||||
Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||
---
|
||||
protolib/wscript | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/protolib/wscript b/protolib/wscript
|
||||
index 155a660..97dda93 100644
|
||||
--- a/protolib/wscript
|
||||
+++ b/protolib/wscript
|
||||
@@ -120,7 +120,7 @@ def configure(ctx):
|
||||
# Compiler-specific flags
|
||||
if ctx.options.debug:
|
||||
#ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG', '_DEBUG']
|
||||
- ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG']
|
||||
+ ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG']
|
||||
else:
|
||||
ctx.env.DEFINES_BUILD_PROTOLIB += ['NDEBUG', "PROTO_DEBUG"]
|
||||
|
||||
@@ -139,7 +139,7 @@ def configure(ctx):
|
||||
ctx.env.CFLAGS += ['/Od', '/RTC1', '/ZI']
|
||||
else:
|
||||
ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG']
|
||||
- #ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG', '/DWINVER=0x0501']
|
||||
+ #ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG', '/DWINVER=0x0501']
|
||||
ctx.env.CFLAGS
|
||||
|
||||
def build(ctx):
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
comment "norm needs a toolchain w/ C++, threads, dynamic library"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_NORM
|
||||
bool "norm"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
The NORM protocol is designed to provide end-to-end reliable
|
||||
transport of bulk data objects or streams over generic IP
|
||||
multicast routing and forwarding services.
|
||||
|
||||
http://www.nrl.navy.mil/itd/ncs/products/norm
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 4480a6ea53fb7ce45b4bc2061d18fbfd46ee9990fc2ed9a9dc303ce4d87888a6 src-norm-with-protolib-1.5.8.tgz
|
||||
sha256 ba4b7e49b0163d6839830e3f47505696c6eaac77ccd93531831dc837b2160608 LICENSE.TXT
|
||||
@@ -0,0 +1,24 @@
|
||||
################################################################################
|
||||
#
|
||||
# norm
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NORM_VERSION = 1.5.8
|
||||
NORM_SITE = https://github.com/USNavalResearchLaboratory/norm/releases/download/v$(NORM_VERSION)
|
||||
NORM_SOURCE = src-norm-with-protolib-$(NORM_VERSION).tgz
|
||||
NORM_INSTALL_STAGING = YES
|
||||
NORM_LICENSE = NRL License
|
||||
NORM_LICENSE_FILES = LICENSE.TXT
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y)
|
||||
NORM_DEPENDENCIES += libnetfilter_queue
|
||||
endif
|
||||
|
||||
# install target doesn't install headers unfortunately...
|
||||
define NORM_INSTALL_HEADERS
|
||||
cp -f $(@D)/include/norm* $(STAGING_DIR)/usr/include
|
||||
endef
|
||||
NORM_POST_INSTALL_STAGING_HOOKS += NORM_INSTALL_HEADERS
|
||||
|
||||
$(eval $(waf-package))
|
||||
Reference in New Issue
Block a user