Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
From d7b20d9bbed23a7a7e40af2f5e78f37ff67e8d93 Mon Sep 17 00:00:00 2001
|
||||
From: Rodrigo Rebello <rprebello@gmail.com>
|
||||
Date: Mon, 23 Nov 2015 02:12:48 -0200
|
||||
Subject: [PATCH] src: fix build with musl libc
|
||||
|
||||
The GNU version of 'struct tcphdr' is not exposed by musl libc headers
|
||||
unless _GNU_SOURCE is defined. Without this definition, the build fails
|
||||
with:
|
||||
|
||||
rpc.c: In function 'rpc_helper_cb':
|
||||
rpc.c:351:15: error: 'struct tcphdr' has no member named 'doff'
|
||||
offset += th->doff * 4;
|
||||
^
|
||||
|
||||
Upstream status: sent
|
||||
http://patchwork.ozlabs.org/patch/547376/
|
||||
|
||||
Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
|
||||
---
|
||||
src/helpers/rpc.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/helpers/rpc.c b/src/helpers/rpc.c
|
||||
index 82493c2..3a7b337 100644
|
||||
--- a/src/helpers/rpc.c
|
||||
+++ b/src/helpers/rpc.c
|
||||
@@ -28,6 +28,7 @@
|
||||
|
||||
#include <rpc/rpc_msg.h>
|
||||
#include <rpc/pmap_prot.h>
|
||||
+#define _GNU_SOURCE
|
||||
#include <netinet/tcp.h>
|
||||
#include <netinet/udp.h>
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
config BR2_PACKAGE_CONNTRACK_TOOLS
|
||||
bool "conntrack-tools"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
|
||||
select BR2_PACKAGE_LIBNETFILTER_CTHELPER
|
||||
select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
|
||||
select BR2_PACKAGE_LIBNETFILTER_QUEUE
|
||||
select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
help
|
||||
The conntrack-tools are a set of tools targeted at
|
||||
system administrators.
|
||||
They are conntrack, the userspace command line interface,
|
||||
and conntrackd, the userspace daemon.
|
||||
|
||||
http://www.netfilter.org/projects/conntrack-tools/
|
||||
|
||||
comment "conntrack-tools needs a toolchain w/ threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) || \
|
||||
BR2_STATIC_LIBS
|
||||
@@ -0,0 +1,3 @@
|
||||
# From ftp://ftp.netfilter.org/pub/conntrack-tools/conntrack-tools-1.4.3.tar.bz2.{md5sum,sha1sum}
|
||||
md5 966a5d8f846ddf5304bcd12685c0707f conntrack-tools-1.4.3.tar.bz2
|
||||
sha1 509db30f34b283f4a74a7e638ba0ca713d3fe98c conntrack-tools-1.4.3.tar.bz2
|
||||
@@ -0,0 +1,34 @@
|
||||
################################################################################
|
||||
#
|
||||
# conntrack-tools
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CONNTRACK_TOOLS_VERSION = 1.4.3
|
||||
CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
|
||||
CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
|
||||
CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
|
||||
libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \
|
||||
libnetfilter_queue host-bison host-flex
|
||||
CONNTRACK_TOOLS_LICENSE = GPLv2+
|
||||
CONNTRACK_TOOLS_LICENSE_FILES = COPYING
|
||||
|
||||
CONNTRACK_TOOLS_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
# Some of conntrack-tools source files include both linux/in.h (via
|
||||
# linux/netfilter.h for kernel headers >= 4.2) and netinet/in.h, which
|
||||
# causes some symbol conflicts when musl is used. Defining __GLIBC__
|
||||
# works around that issue since the kernel headers are prepared to
|
||||
# avoid redefinition of certain symbols when they see __GLIBC__.
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
|
||||
CONNTRACK_TOOLS_CFLAGS += -D__GLIBC__
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
CONNTRACK_TOOLS_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
|
||||
CONNTRACK_TOOLS_DEPENDENCIES += libtirpc host-pkgconf
|
||||
endif
|
||||
|
||||
CONNTRACK_TOOLS_CONF_ENV = CFLAGS="$(CONNTRACK_TOOLS_CFLAGS)"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user