mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
@@ -0,0 +1,50 @@
|
||||
From f8079671326e9fd079391d24911a9a8a77f1d6fd Mon Sep 17 00:00:00 2001
|
||||
From: Felix Janda <felix.janda@posteo.de>
|
||||
Date: Sat, 16 May 2015 12:31:58 +0200
|
||||
Subject: [PATCH] ethernetdb.h: Remove C++ specific compiler hint macro _THROW
|
||||
|
||||
Fixes compilation with musl libc
|
||||
|
||||
Signed-off-by: Felix Janda <felix.janda@posteo.de>
|
||||
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Patch status: upstream commit f8079671326e9fd0
|
||||
|
||||
include/ethernetdb.h | 11 +++++------
|
||||
1 file changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/include/ethernetdb.h b/include/ethernetdb.h
|
||||
index 46d8bfd1b7e5..1683abe01987 100644
|
||||
--- a/include/ethernetdb.h
|
||||
+++ b/include/ethernetdb.h
|
||||
@@ -38,21 +38,20 @@ struct ethertypeent {
|
||||
|
||||
/* Open ethertype data base files and mark them as staying open even
|
||||
after a later search if STAY_OPEN is non-zero. */
|
||||
-extern void setethertypeent(int __stay_open) __THROW;
|
||||
+extern void setethertypeent(int __stay_open);
|
||||
|
||||
/* Close ethertype data base files and clear `stay open' flag. */
|
||||
-extern void endethertypeent(void) __THROW;
|
||||
+extern void endethertypeent(void);
|
||||
|
||||
/* Get next entry from ethertype data base file. Open data base if
|
||||
necessary. */
|
||||
-extern struct ethertypeent *getethertypeent(void) __THROW;
|
||||
+extern struct ethertypeent *getethertypeent(void);
|
||||
|
||||
/* Return entry from ethertype data base for network with NAME. */
|
||||
-extern struct ethertypeent *getethertypebyname(__const char *__name)
|
||||
- __THROW;
|
||||
+extern struct ethertypeent *getethertypebyname(__const char *__name);
|
||||
|
||||
/* Return entry from ethertype data base which number is PROTO. */
|
||||
-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW;
|
||||
+extern struct ethertypeent *getethertypebynumber(int __ethertype);
|
||||
|
||||
|
||||
#endif /* ethernetdb.h */
|
||||
--
|
||||
2.11.0
|
||||
|
||||
30
package/ebtables/0002-Fix-musl-compatibility.patch
Normal file
30
package/ebtables/0002-Fix-musl-compatibility.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From 138e7efdc8cad6453620c6366e6fa5e786593f7f Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 16 Feb 2017 14:41:48 +0200
|
||||
Subject: [PATCH] Fix musl compatibility
|
||||
|
||||
Include netinet/ether.h before kernel headers to suppress the conflicting
|
||||
definition of struct ethhdr.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: not upstreamable; depends on Buildroot local musl patch
|
||||
---
|
||||
include/ebtables_u.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/ebtables_u.h b/include/ebtables_u.h
|
||||
index 35a5bcc54c86..268b1fd599d2 100644
|
||||
--- a/include/ebtables_u.h
|
||||
+++ b/include/ebtables_u.h
|
||||
@@ -24,6 +24,7 @@
|
||||
#ifndef EBTABLES_U_H
|
||||
#define EBTABLES_U_H
|
||||
#include <netinet/in.h>
|
||||
+#include <netinet/ether.h>
|
||||
#include <linux/netfilter_bridge/ebtables.h>
|
||||
#include <linux/netfilter/x_tables.h>
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
7
package/ebtables/Config.in
Normal file
7
package/ebtables/Config.in
Normal file
@@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_EBTABLES
|
||||
bool "ebtables"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
Ethernet bridge frame table administration
|
||||
|
||||
http://ebtables.netfilter.org/
|
||||
3
package/ebtables/ebtables.hash
Normal file
3
package/ebtables/ebtables.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d ebtables-v2.0.10-4.tar.gz
|
||||
sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING
|
||||
39
package/ebtables/ebtables.mk
Normal file
39
package/ebtables/ebtables.mk
Normal file
@@ -0,0 +1,39 @@
|
||||
################################################################################
|
||||
#
|
||||
# ebtables
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EBTABLES_VERSION = 2.0.10-4
|
||||
EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
|
||||
EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables
|
||||
EBTABLES_LICENSE = GPL-2.0+
|
||||
EBTABLES_LICENSE_FILES = COPYING
|
||||
EBTABLES_STATIC = $(if $(BR2_STATIC_LIBS),static)
|
||||
EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32)
|
||||
|
||||
define EBTABLES_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables $(EBTABLES_STATIC) \
|
||||
CFLAGS="$(TARGET_CFLAGS) $(EBTABLES_K64U32)" -C $(@D)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
define EBTABLES_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/static \
|
||||
$(TARGET_DIR)/sbin/ebtables
|
||||
endef
|
||||
else
|
||||
define EBTABLES_INSTALL_TARGET_CMDS
|
||||
for so in $(@D)/$(EBTABLES_SUBDIR)/*.so \
|
||||
$(@D)/$(EBTABLES_SUBDIR)/extensions/*.so; \
|
||||
do \
|
||||
$(INSTALL) -m 0755 -D $${so} \
|
||||
$(TARGET_DIR)/lib/ebtables/`basename $${so}` || exit 1; \
|
||||
done
|
||||
$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/ebtables \
|
||||
$(TARGET_DIR)/sbin/ebtables
|
||||
$(INSTALL) -m 0644 -D $(@D)/ethertypes $(TARGET_DIR)/etc/ethertypes
|
||||
endef
|
||||
endif
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user