2010-03-14 01:56:33 +00:00
|
|
|
#
|
2015-01-17 10:58:22 +00:00
|
|
|
# Copyright (C) 2006-2015 OpenWrt.org
|
2006-06-27 00:35:46 +00:00
|
|
|
#
|
|
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
|
|
# See /LICENSE for more information.
|
|
|
|
#
|
2005-03-21 08:12:49 +00:00
|
|
|
|
2005-03-06 03:34:52 +00:00
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
|
|
|
|
PKG_NAME:=iproute2
|
iproute2: update to 5.10.0
c8faeca5 (ss: mptcp: fix add_addr_accepted stat print, 2020-11-18)
0d78e8ea (tc: pedit: fix memory leak in print_pedit, 2020-12-11)
ec1346ac (devlink: fix memory leak in cmd_dev_flash(), 2020-12-11)
309e6027 (man: tc-flower: fix manpage, 2020-12-11)
376367d9 (uapi: merge in change to bpf.h, 2020-12-14)
2e80ae89 (Merge branch 'gcc-10' into main, 2020-12-03)
755b1c58 (tc/mqprio: json-ify output, 2020-12-02)
975c4944 (ip/netns: use flock when setting up /run/netns, 2020-11-27)
fb054cb3 (uapi: update devlink.h, 2020-11-29)
c95d63e4 (uapi: update devlink.h, 2020-11-29)
cae2e929 (f_u32: fix compiler gcc-10 compiler warning, 2020-11-29)
c0149839 (misc: fix compiler warning in ifstat and nstat, 2020-11-29)
2319db90 (tc: fix compiler warnings in ip6 pedit, 2020-11-29)
5bdc4e91 (bridge: fix string length warning, 2020-11-29)
f8176999 (devlink: fix uninitialized warning, 2020-11-29)
7a49ff9d (bridge: report correct version, 2020-11-15)
8682f588 (tc-mpls: fix manpage example and help message string, 2020-11-02)
7c7a0fe0 (tc-vlan: fix help and error message strings, 2020-11-02)
72f88bd4 (uapi: update kernel headers from 5.10-rc2, 2020-11-08)
b90c39be (rdma: fix spelling error in comment, 2020-11-08)
c8424b73 (man: fix spelling errors, 2020-11-08)
cbf64817 (tc/m_gate: fix spelling errors, 2020-11-08)
14b189f0 (uapi: updates from 5.10-rc1, 2020-11-03)
9fc5bf73 (libnetlink: define __aligned conditionally, 2020-10-26)
eb12cc9a (Merge branch 'main' into next, 2020-10-25)
f1298d76 (m_mpls: test the 'mac_push' action after 'modify', 2020-10-22)
2b7a7684 (Merge branch 'tipc-encryption' into next, 2020-10-20)
2bf1ba5a (tipc: add option to set rekeying for encryption, 2020-10-16)
5fb36818 (tipc: add option to set master key for encryption, 2020-10-16)
b4edd6a8 (Merge branch 'tc-mpls-l2-vpn' into next Guillaume Nault says:, 2020-10-20)
02a261b5 (m_mpls: add mac_push action, 2020-10-19)
d61167dd (m_vlan: add pop_eth and push_eth actions, 2020-10-19)
3342688a (devlink: display elapsed time during flash update, 2020-10-14)
cb7ce51c (v5.9.0, 2020-10-15)
b5a583fb (Merge branch 'main' into next Signed-off-by: David Ahern <dsahern@gmail.com>, 2020-10-11)
78120128 (genl: ctrl: print op -> policy idx mapping, 2020-10-03)
91c54917 (Merge branch 'bridge-igmpv3-mldv2' into next Nikolay Aleksandrov says:, 2020-10-11)
86588450 (bridge: mdb: print protocol when available, 2020-10-08)
2de81d1e (bridge: mdb: print source list when available, 2020-10-08)
1d28c480 (bridge: mdb: print filter mode when available, 2020-10-08)
e331677e (bridge: mdb: show igmpv3/mldv2 flags, 2020-10-08)
f94e8b07 (bridge: mdb: print fast_leave flag, 2020-10-08)
547b3197 (bridge: mdb: add support for source address, 2020-10-08)
f905191a (Update kernel headers, 2020-10-11)
4322b13c (ip xfrm: support setting XFRMA_SET_MARK_MASK attribute in states, 2020-10-02)
8dc1db80 (devlink: Add health reporter test command support, 2020-10-01)
01216471 (devlink: support setting the overwrite mask attribute, 2020-09-30)
34be2d26 (Update kernel headers, 2020-10-07)
d2be31d9 (ss: add support for xdp statistics, 2020-09-24)
f481515c (Update kernel headers, 2020-09-29)
b8663da0 (ip: promote missed packets to the -s row, 2020-09-16)
cec67df9 (Merge branch 'devlink-controller-external-info' into next Parav Pandit says:, 2020-09-22)
748cbad3 (devlink: Show controller number of a devlink port, 2020-09-18)
8fadd011 (devlink: Show external port attribute, 2020-09-18)
454429e8 (Update kernel headers, 2020-09-22)
ad34d5fa (iproute2: ss: add support to expose various inet sockopts, 2020-08-19)
c8eb4b52 (Update kernel headers, 2020-09-08)
abee772f (tipc: support 128bit node identity for peer removing, 2020-08-27)
6fd53b2a (iplink: add support for protodown reason, 2020-08-28)
af27494d (ip xfrm: support printing XFRMA_SET_MARK_MASK attribute in states, 2020-08-28)
275eed9b (Merge branch 'main' into next, 2020-09-01)
cc889b82 (genl: ctrl: support dumping netlink policy, 2020-08-24)
d5acae24 (libnetlink: add nl_print_policy() helper, 2020-08-24)
784fa9f6 (libnetlink: add rtattr_for_each_nested() iteration macro, 2020-08-24)
OpenWrt patches unchanged.
Successfully built for ramips/mt7621 and x86/geode with:
CONFIG_PACKAGE_devlink=m
CONFIG_PACKAGE_genl=m
CONFIG_PACKAGE_ip-bridge=m
CONFIG_PACKAGE_ip-full=m
CONFIG_PACKAGE_ip-tiny=m
CONFIG_PACKAGE_nstat=m
CONFIG_PACKAGE_rdma=m
CONFIG_PACKAGE_ss=m
CONFIG_PACKAGE_tc=m
Minimally run-tested ip-tiny on ramips/mt7621 (ubnt-erx).
Signed-off-by: Russell Senior <russell@personaltelco.net>
2020-12-31 07:16:22 +00:00
|
|
|
PKG_VERSION:=5.10.0
|
2020-08-24 09:47:25 +00:00
|
|
|
PKG_RELEASE:=1
|
2005-03-21 08:12:49 +00:00
|
|
|
|
2013-07-28 23:27:35 +00:00
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
2016-05-24 13:13:48 +00:00
|
|
|
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
|
iproute2: update to 5.10.0
c8faeca5 (ss: mptcp: fix add_addr_accepted stat print, 2020-11-18)
0d78e8ea (tc: pedit: fix memory leak in print_pedit, 2020-12-11)
ec1346ac (devlink: fix memory leak in cmd_dev_flash(), 2020-12-11)
309e6027 (man: tc-flower: fix manpage, 2020-12-11)
376367d9 (uapi: merge in change to bpf.h, 2020-12-14)
2e80ae89 (Merge branch 'gcc-10' into main, 2020-12-03)
755b1c58 (tc/mqprio: json-ify output, 2020-12-02)
975c4944 (ip/netns: use flock when setting up /run/netns, 2020-11-27)
fb054cb3 (uapi: update devlink.h, 2020-11-29)
c95d63e4 (uapi: update devlink.h, 2020-11-29)
cae2e929 (f_u32: fix compiler gcc-10 compiler warning, 2020-11-29)
c0149839 (misc: fix compiler warning in ifstat and nstat, 2020-11-29)
2319db90 (tc: fix compiler warnings in ip6 pedit, 2020-11-29)
5bdc4e91 (bridge: fix string length warning, 2020-11-29)
f8176999 (devlink: fix uninitialized warning, 2020-11-29)
7a49ff9d (bridge: report correct version, 2020-11-15)
8682f588 (tc-mpls: fix manpage example and help message string, 2020-11-02)
7c7a0fe0 (tc-vlan: fix help and error message strings, 2020-11-02)
72f88bd4 (uapi: update kernel headers from 5.10-rc2, 2020-11-08)
b90c39be (rdma: fix spelling error in comment, 2020-11-08)
c8424b73 (man: fix spelling errors, 2020-11-08)
cbf64817 (tc/m_gate: fix spelling errors, 2020-11-08)
14b189f0 (uapi: updates from 5.10-rc1, 2020-11-03)
9fc5bf73 (libnetlink: define __aligned conditionally, 2020-10-26)
eb12cc9a (Merge branch 'main' into next, 2020-10-25)
f1298d76 (m_mpls: test the 'mac_push' action after 'modify', 2020-10-22)
2b7a7684 (Merge branch 'tipc-encryption' into next, 2020-10-20)
2bf1ba5a (tipc: add option to set rekeying for encryption, 2020-10-16)
5fb36818 (tipc: add option to set master key for encryption, 2020-10-16)
b4edd6a8 (Merge branch 'tc-mpls-l2-vpn' into next Guillaume Nault says:, 2020-10-20)
02a261b5 (m_mpls: add mac_push action, 2020-10-19)
d61167dd (m_vlan: add pop_eth and push_eth actions, 2020-10-19)
3342688a (devlink: display elapsed time during flash update, 2020-10-14)
cb7ce51c (v5.9.0, 2020-10-15)
b5a583fb (Merge branch 'main' into next Signed-off-by: David Ahern <dsahern@gmail.com>, 2020-10-11)
78120128 (genl: ctrl: print op -> policy idx mapping, 2020-10-03)
91c54917 (Merge branch 'bridge-igmpv3-mldv2' into next Nikolay Aleksandrov says:, 2020-10-11)
86588450 (bridge: mdb: print protocol when available, 2020-10-08)
2de81d1e (bridge: mdb: print source list when available, 2020-10-08)
1d28c480 (bridge: mdb: print filter mode when available, 2020-10-08)
e331677e (bridge: mdb: show igmpv3/mldv2 flags, 2020-10-08)
f94e8b07 (bridge: mdb: print fast_leave flag, 2020-10-08)
547b3197 (bridge: mdb: add support for source address, 2020-10-08)
f905191a (Update kernel headers, 2020-10-11)
4322b13c (ip xfrm: support setting XFRMA_SET_MARK_MASK attribute in states, 2020-10-02)
8dc1db80 (devlink: Add health reporter test command support, 2020-10-01)
01216471 (devlink: support setting the overwrite mask attribute, 2020-09-30)
34be2d26 (Update kernel headers, 2020-10-07)
d2be31d9 (ss: add support for xdp statistics, 2020-09-24)
f481515c (Update kernel headers, 2020-09-29)
b8663da0 (ip: promote missed packets to the -s row, 2020-09-16)
cec67df9 (Merge branch 'devlink-controller-external-info' into next Parav Pandit says:, 2020-09-22)
748cbad3 (devlink: Show controller number of a devlink port, 2020-09-18)
8fadd011 (devlink: Show external port attribute, 2020-09-18)
454429e8 (Update kernel headers, 2020-09-22)
ad34d5fa (iproute2: ss: add support to expose various inet sockopts, 2020-08-19)
c8eb4b52 (Update kernel headers, 2020-09-08)
abee772f (tipc: support 128bit node identity for peer removing, 2020-08-27)
6fd53b2a (iplink: add support for protodown reason, 2020-08-28)
af27494d (ip xfrm: support printing XFRMA_SET_MARK_MASK attribute in states, 2020-08-28)
275eed9b (Merge branch 'main' into next, 2020-09-01)
cc889b82 (genl: ctrl: support dumping netlink policy, 2020-08-24)
d5acae24 (libnetlink: add nl_print_policy() helper, 2020-08-24)
784fa9f6 (libnetlink: add rtattr_for_each_nested() iteration macro, 2020-08-24)
OpenWrt patches unchanged.
Successfully built for ramips/mt7621 and x86/geode with:
CONFIG_PACKAGE_devlink=m
CONFIG_PACKAGE_genl=m
CONFIG_PACKAGE_ip-bridge=m
CONFIG_PACKAGE_ip-full=m
CONFIG_PACKAGE_ip-tiny=m
CONFIG_PACKAGE_nstat=m
CONFIG_PACKAGE_rdma=m
CONFIG_PACKAGE_ss=m
CONFIG_PACKAGE_tc=m
Minimally run-tested ip-tiny on ramips/mt7621 (ubnt-erx).
Signed-off-by: Russell Senior <russell@personaltelco.net>
2020-12-31 07:16:22 +00:00
|
|
|
PKG_HASH:=a54a34ae309c0406b2d1fb3a46158613ffb83d33fefd5d4a27f0010237ac53e9
|
2010-09-09 21:50:07 +00:00
|
|
|
PKG_BUILD_PARALLEL:=1
|
2017-03-20 21:53:46 +00:00
|
|
|
PKG_BUILD_DEPENDS:=iptables
|
2014-11-02 12:20:54 +00:00
|
|
|
PKG_LICENSE:=GPL-2.0
|
2017-09-28 02:55:46 +00:00
|
|
|
PKG_CPE_ID:=cpe:/a:iproute2_project:iproute2
|
2007-09-07 08:34:51 +00:00
|
|
|
|
2017-11-28 07:15:50 +00:00
|
|
|
include $(INCLUDE_DIR)/kernel.mk
|
2006-06-21 02:32:39 +00:00
|
|
|
include $(INCLUDE_DIR)/package.mk
|
2018-12-20 07:08:43 +00:00
|
|
|
include $(INCLUDE_DIR)/nls.mk
|
2005-03-06 03:34:52 +00:00
|
|
|
|
2006-09-23 17:39:46 +00:00
|
|
|
define Package/iproute2/Default
|
|
|
|
SECTION:=net
|
|
|
|
CATEGORY:=Network
|
2014-06-17 12:43:30 +00:00
|
|
|
URL:=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
|
2011-03-12 07:27:57 +00:00
|
|
|
SUBMENU:=Routing and Redirection
|
2014-06-17 12:43:30 +00:00
|
|
|
MAINTAINER:=Russell Senior <russell@personaltelco.net>
|
2006-05-10 19:06:22 +00:00
|
|
|
endef
|
|
|
|
|
2016-10-13 01:07:21 +00:00
|
|
|
define Package/ip-tiny
|
2017-03-04 11:37:43 +00:00
|
|
|
$(call Package/iproute2/Default)
|
|
|
|
TITLE:=Routing control utility (Minimal)
|
|
|
|
VARIANT:=tiny
|
2018-12-16 02:26:48 +00:00
|
|
|
DEFAULT_VARIANT:=1
|
2017-03-04 11:37:43 +00:00
|
|
|
PROVIDES:=ip
|
2018-10-16 12:16:48 +00:00
|
|
|
ALTERNATIVES:=200:/sbin/ip:/usr/libexec/ip-tiny
|
2017-10-01 19:46:27 +00:00
|
|
|
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
|
2014-10-05 17:13:34 +00:00
|
|
|
endef
|
|
|
|
|
2017-03-04 11:37:43 +00:00
|
|
|
define Package/ip-full
|
|
|
|
$(call Package/iproute2/Default)
|
|
|
|
TITLE:=Routing control utility (Full)
|
|
|
|
VARIANT:=full
|
|
|
|
PROVIDES:=ip
|
2018-10-16 12:16:48 +00:00
|
|
|
ALTERNATIVES:=300:/sbin/ip:/usr/libexec/ip-full
|
2020-03-05 19:34:27 +00:00
|
|
|
DEPENDS:=+libnl-tiny +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl
|
2017-03-04 11:37:43 +00:00
|
|
|
endef
|
2014-03-09 13:32:59 +00:00
|
|
|
|
2006-05-10 19:06:22 +00:00
|
|
|
define Package/tc
|
2007-09-07 08:34:51 +00:00
|
|
|
$(call Package/iproute2/Default)
|
2006-09-23 17:39:46 +00:00
|
|
|
TITLE:=Traffic control utility
|
2018-12-16 02:26:48 +00:00
|
|
|
VARIANT:=tc
|
|
|
|
PROVIDES:=tc
|
2020-03-05 19:34:27 +00:00
|
|
|
DEPENDS:=+kmod-sched-core +libxtables +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl
|
2006-05-10 19:06:22 +00:00
|
|
|
endef
|
2005-03-06 03:34:52 +00:00
|
|
|
|
2007-06-09 13:17:46 +00:00
|
|
|
define Package/genl
|
2007-09-07 08:34:51 +00:00
|
|
|
$(call Package/iproute2/Default)
|
2007-06-09 13:17:46 +00:00
|
|
|
TITLE:=General netlink utility frontend
|
2020-03-05 19:34:27 +00:00
|
|
|
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
|
2007-06-09 13:17:46 +00:00
|
|
|
endef
|
|
|
|
|
2015-01-17 10:58:34 +00:00
|
|
|
define Package/ip-bridge
|
|
|
|
$(call Package/iproute2/Default)
|
|
|
|
TITLE:=Bridge configuration utility from iproute2
|
2020-03-05 19:34:27 +00:00
|
|
|
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
|
2015-01-17 10:58:34 +00:00
|
|
|
endef
|
|
|
|
|
2012-04-02 16:25:51 +00:00
|
|
|
define Package/ss
|
|
|
|
$(call Package/iproute2/Default)
|
|
|
|
TITLE:=Socket statistics utility
|
2020-04-07 02:15:59 +00:00
|
|
|
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +kmod-netlink-diag
|
2012-04-02 16:25:51 +00:00
|
|
|
endef
|
|
|
|
|
2016-04-27 09:13:59 +00:00
|
|
|
define Package/nstat
|
|
|
|
$(call Package/iproute2/Default)
|
|
|
|
TITLE:=Network statistics utility
|
2020-03-05 19:34:27 +00:00
|
|
|
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
|
2016-04-27 09:13:59 +00:00
|
|
|
endef
|
|
|
|
|
2017-03-20 21:53:46 +00:00
|
|
|
define Package/devlink
|
|
|
|
$(call Package/iproute2/Default)
|
|
|
|
TITLE:=Network devlink utility
|
2020-03-05 19:34:27 +00:00
|
|
|
DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
|
2017-03-20 21:53:46 +00:00
|
|
|
endef
|
|
|
|
|
2017-10-01 19:46:27 +00:00
|
|
|
define Package/rdma
|
|
|
|
$(call Package/iproute2/Default)
|
|
|
|
TITLE:=Network rdma utility
|
2020-03-05 19:34:27 +00:00
|
|
|
DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
|
2017-10-01 19:46:27 +00:00
|
|
|
endef
|
|
|
|
|
2014-03-09 13:32:59 +00:00
|
|
|
ifeq ($(BUILD_VARIANT),tiny)
|
|
|
|
IP_CONFIG_TINY:=y
|
|
|
|
endif
|
|
|
|
|
2018-12-16 02:26:48 +00:00
|
|
|
ifeq ($(BUILD_VARIANT),full)
|
|
|
|
HAVE_ELF:=y
|
2020-03-05 19:34:27 +00:00
|
|
|
HAVE_CAP:=n
|
2018-12-16 02:26:48 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(BUILD_VARIANT),tc)
|
|
|
|
HAVE_ELF:=y
|
2018-12-13 19:48:55 +00:00
|
|
|
SHARED_LIBS:=y
|
2018-12-16 02:26:48 +00:00
|
|
|
endif
|
|
|
|
|
2017-10-01 19:46:27 +00:00
|
|
|
ifdef CONFIG_PACKAGE_devlink
|
|
|
|
HAVE_MNL:=y
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef CONFIG_PACKAGE_rdma
|
|
|
|
HAVE_MNL:=y
|
|
|
|
endif
|
|
|
|
|
2006-05-10 19:06:22 +00:00
|
|
|
define Build/Configure
|
2017-11-07 08:45:54 +00:00
|
|
|
echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
|
2010-09-09 00:40:25 +00:00
|
|
|
> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
|
2006-05-10 19:06:22 +00:00
|
|
|
endef
|
2005-03-06 03:34:52 +00:00
|
|
|
|
2020-02-12 12:23:01 +00:00
|
|
|
TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
|
iproute2: simplify Makefile, patches and fix feature detection
Compile-based feature detection (e.g. xtables, ipset support) was broken
due to silent compilation errors in the configure script, caused by a
Makefile variable KERNEL_INCLUDE referring to kernel build headers. Use
userspace headers by setting the same "user_headers" kernel include path
as used for the iptables build.
Remove redundant or unused Build/Configure definitions from package
Makefile, including KERNEL_INCLUDE, LIBC_INCLUDE and DBM includes.
Don't pass LDFLAGS within MAKE_FLAGS as this interferes with LDFLAGS in
tc/Makefile and masks a link parameter ("-Wl,-export-dynamic"). Instead,
use standard TARGET_LDFLAGS.
Replace EXTRA_CCOPTS in MAKE_FLAGS with cleaner TARGET_CPPFLAGS, and also
drop now unneeded patch 150-extra-ccopts.patch.
Enable defining XT_LIB_DIR from Makefile, needed to set the iptables
modules directory to something other than /lib/xtables, and also add
libxtables dependency. Both are needed with working xtables detection.
Note that libxtables is also pulled in by iptables, firewall or luci, so
this change has no size impact in most cases.
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2018-11-24 07:56:24 +00:00
|
|
|
TARGET_LDFLAGS += -Wl,--gc-sections
|
|
|
|
TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny
|
2013-12-17 15:59:29 +00:00
|
|
|
|
2009-11-05 22:29:14 +00:00
|
|
|
MAKE_FLAGS += \
|
iproute2: simplify Makefile, patches and fix feature detection
Compile-based feature detection (e.g. xtables, ipset support) was broken
due to silent compilation errors in the configure script, caused by a
Makefile variable KERNEL_INCLUDE referring to kernel build headers. Use
userspace headers by setting the same "user_headers" kernel include path
as used for the iptables build.
Remove redundant or unused Build/Configure definitions from package
Makefile, including KERNEL_INCLUDE, LIBC_INCLUDE and DBM includes.
Don't pass LDFLAGS within MAKE_FLAGS as this interferes with LDFLAGS in
tc/Makefile and masks a link parameter ("-Wl,-export-dynamic"). Instead,
use standard TARGET_LDFLAGS.
Replace EXTRA_CCOPTS in MAKE_FLAGS with cleaner TARGET_CPPFLAGS, and also
drop now unneeded patch 150-extra-ccopts.patch.
Enable defining XT_LIB_DIR from Makefile, needed to set the iptables
modules directory to something other than /lib/xtables, and also add
libxtables dependency. Both are needed with working xtables detection.
Note that libxtables is also pulled in by iptables, firewall or luci, so
this change has no size impact in most cases.
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2018-11-24 07:56:24 +00:00
|
|
|
KERNEL_INCLUDE="$(LINUX_DIR)/user_headers/include" \
|
2018-12-13 19:48:55 +00:00
|
|
|
SHARED_LIBS=$(SHARED_LIBS) \
|
2014-03-09 13:32:59 +00:00
|
|
|
IP_CONFIG_TINY=$(IP_CONFIG_TINY) \
|
2018-12-16 02:26:48 +00:00
|
|
|
HAVE_ELF=$(HAVE_ELF) \
|
2017-10-01 19:46:27 +00:00
|
|
|
HAVE_MNL=$(HAVE_MNL) \
|
2019-07-01 08:57:26 +00:00
|
|
|
HAVE_CAP=$(HAVE_CAP) \
|
2017-03-20 21:53:46 +00:00
|
|
|
IPT_LIB_DIR=/usr/lib/iptables \
|
iproute2: simplify Makefile, patches and fix feature detection
Compile-based feature detection (e.g. xtables, ipset support) was broken
due to silent compilation errors in the configure script, caused by a
Makefile variable KERNEL_INCLUDE referring to kernel build headers. Use
userspace headers by setting the same "user_headers" kernel include path
as used for the iptables build.
Remove redundant or unused Build/Configure definitions from package
Makefile, including KERNEL_INCLUDE, LIBC_INCLUDE and DBM includes.
Don't pass LDFLAGS within MAKE_FLAGS as this interferes with LDFLAGS in
tc/Makefile and masks a link parameter ("-Wl,-export-dynamic"). Instead,
use standard TARGET_LDFLAGS.
Replace EXTRA_CCOPTS in MAKE_FLAGS with cleaner TARGET_CPPFLAGS, and also
drop now unneeded patch 150-extra-ccopts.patch.
Enable defining XT_LIB_DIR from Makefile, needed to set the iptables
modules directory to something other than /lib/xtables, and also add
libxtables dependency. Both are needed with working xtables detection.
Note that libxtables is also pulled in by iptables, firewall or luci, so
this change has no size impact in most cases.
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2018-11-24 07:56:24 +00:00
|
|
|
XT_LIB_DIR=/usr/lib/iptables \
|
2014-07-02 12:41:36 +00:00
|
|
|
FPIC="$(FPIC)"
|
2009-11-05 22:29:14 +00:00
|
|
|
|
2006-05-10 19:06:22 +00:00
|
|
|
define Build/Compile
|
2012-09-23 09:50:01 +00:00
|
|
|
+$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
|
2006-05-10 19:06:22 +00:00
|
|
|
endef
|
2005-03-06 03:34:52 +00:00
|
|
|
|
2009-05-26 21:58:24 +00:00
|
|
|
define Build/InstallDev
|
|
|
|
$(INSTALL_DIR) $(1)/usr/include
|
2018-08-09 15:42:35 +00:00
|
|
|
$(CP) $(PKG_BUILD_DIR)/include/{libgenl,libnetlink}.h $(1)/usr/include/
|
2009-05-26 21:58:24 +00:00
|
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
|
|
$(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/
|
|
|
|
endef
|
|
|
|
|
2016-10-13 01:07:21 +00:00
|
|
|
define Package/ip-tiny/install
|
2018-10-16 12:16:48 +00:00
|
|
|
$(INSTALL_DIR) $(1)/usr/libexec
|
|
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/libexec/ip-tiny
|
2006-05-10 19:06:22 +00:00
|
|
|
endef
|
2005-11-06 01:14:15 +00:00
|
|
|
|
2015-09-08 17:44:17 +00:00
|
|
|
define Package/ip-full/install
|
2018-10-16 12:16:48 +00:00
|
|
|
$(INSTALL_DIR) $(1)/usr/libexec
|
|
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/libexec/ip-full
|
2014-03-09 13:32:59 +00:00
|
|
|
endef
|
|
|
|
|
2006-05-10 19:06:22 +00:00
|
|
|
define Package/tc/install
|
2006-11-23 00:29:07 +00:00
|
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/
|
2012-04-16 15:04:42 +00:00
|
|
|
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
|
2012-12-02 13:04:03 +00:00
|
|
|
$(INSTALL_BIN) ./files/15-teql $(1)/etc/hotplug.d/iface/
|
2018-12-13 19:48:55 +00:00
|
|
|
ifeq ($(SHARED_LIBS),y)
|
|
|
|
$(INSTALL_DIR) $(1)/usr/lib/tc
|
|
|
|
$(CP) $(PKG_BUILD_DIR)/tc/*.so $(1)/usr/lib/tc
|
|
|
|
endif
|
2006-05-10 19:06:22 +00:00
|
|
|
endef
|
2005-03-06 03:34:52 +00:00
|
|
|
|
2007-06-09 13:17:46 +00:00
|
|
|
define Package/genl/install
|
|
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/genl/genl $(1)/usr/sbin/
|
|
|
|
endef
|
|
|
|
|
2015-01-17 10:58:34 +00:00
|
|
|
define Package/ip-bridge/install
|
|
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bridge/bridge $(1)/usr/sbin/
|
|
|
|
endef
|
|
|
|
|
2012-04-02 16:25:51 +00:00
|
|
|
define Package/ss/install
|
|
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/ss $(1)/usr/sbin/
|
|
|
|
endef
|
|
|
|
|
2016-04-27 09:13:59 +00:00
|
|
|
define Package/nstat/install
|
|
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/nstat $(1)/usr/sbin/
|
|
|
|
endef
|
|
|
|
|
2017-03-20 21:53:46 +00:00
|
|
|
define Package/devlink/install
|
|
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/devlink/devlink $(1)/usr/sbin/
|
|
|
|
endef
|
|
|
|
|
2017-10-01 19:46:27 +00:00
|
|
|
define Package/rdma/install
|
|
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/rdma/rdma $(1)/usr/sbin/
|
|
|
|
endef
|
|
|
|
|
2016-10-13 01:07:21 +00:00
|
|
|
$(eval $(call BuildPackage,ip-tiny))
|
2014-03-09 13:32:59 +00:00
|
|
|
$(eval $(call BuildPackage,ip-full))
|
2006-05-31 13:00:11 +00:00
|
|
|
$(eval $(call BuildPackage,tc))
|
2007-06-09 13:17:46 +00:00
|
|
|
$(eval $(call BuildPackage,genl))
|
2015-01-17 10:58:34 +00:00
|
|
|
$(eval $(call BuildPackage,ip-bridge))
|
2012-04-02 16:25:51 +00:00
|
|
|
$(eval $(call BuildPackage,ss))
|
2016-04-27 09:13:59 +00:00
|
|
|
$(eval $(call BuildPackage,nstat))
|
2017-03-20 21:53:46 +00:00
|
|
|
$(eval $(call BuildPackage,devlink))
|
2017-10-01 19:46:27 +00:00
|
|
|
$(eval $(call BuildPackage,rdma))
|