From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 24 Oct 2021 15:06:34 +0000 (+0200)
Subject: iproute2: build after iptables to get ipt filters for tc
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66bc17dcc16f465fed435f366a8ccf01c6e6d814;p=people%2Fstevee%2Fipfire-2.x.git

iproute2: build after iptables to get ipt filters for tc

to proper filter IPSec im QoS without using mark or connmark i need ipt filters
for tc which are only build if iptables are build prior iproute2.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/common/aarch64/util-linux b/config/rootfiles/common/aarch64/util-linux
index 9f4b9866d5..fe6b0e431e 100644
--- a/config/rootfiles/common/aarch64/util-linux
+++ b/config/rootfiles/common/aarch64/util-linux
@@ -126,6 +126,8 @@ usr/sbin/partx
 usr/sbin/resizepart
 usr/sbin/rtcwake
 #usr/sbin/uuidd
+#usr/share/bash-completion
+#usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/addpart
 #usr/share/bash-completion/completions/blkdiscard
 #usr/share/bash-completion/completions/blkid
diff --git a/config/rootfiles/common/armv6l/util-linux b/config/rootfiles/common/armv6l/util-linux
index d32ed52566..f3f5014f5e 100644
--- a/config/rootfiles/common/armv6l/util-linux
+++ b/config/rootfiles/common/armv6l/util-linux
@@ -126,6 +126,8 @@ usr/sbin/partx
 usr/sbin/resizepart
 usr/sbin/rtcwake
 #usr/sbin/uuidd
+#usr/share/bash-completion
+#usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/addpart
 #usr/share/bash-completion/completions/blkdiscard
 #usr/share/bash-completion/completions/blkid
diff --git a/config/rootfiles/common/i586/util-linux b/config/rootfiles/common/i586/util-linux
index 55cc7ecb7d..beba8ed9c5 100644
--- a/config/rootfiles/common/i586/util-linux
+++ b/config/rootfiles/common/i586/util-linux
@@ -127,6 +127,8 @@ usr/sbin/partx
 usr/sbin/resizepart
 usr/sbin/rtcwake
 #usr/sbin/uuidd
+#usr/share/bash-completion
+#usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/addpart
 #usr/share/bash-completion/completions/blkdiscard
 #usr/share/bash-completion/completions/blkid
diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2
index 609b798e3d..ce316e11e9 100644
--- a/config/rootfiles/common/iproute2
+++ b/config/rootfiles/common/iproute2
@@ -10,12 +10,15 @@ etc/iproute2/rt_scopes
 etc/iproute2/rt_tables
 sbin/bridge
 sbin/ctstat
+sbin/dcb
+sbin/devlink
 sbin/genl
 sbin/ifcfg
 sbin/ifstat
 sbin/ip
 sbin/lnstat
 sbin/nstat
+sbin/rdma
 sbin/routef
 sbin/routel
 sbin/rtacct
@@ -24,16 +27,18 @@ sbin/rtpr
 sbin/rtstat
 sbin/ss
 sbin/tc
+sbin/tipc
+sbin/vdpa
 #usr/include/iproute2
 #usr/include/iproute2/bpf_elf.h
 #usr/lib/tc
 #usr/lib/tc/experimental.dist
+usr/lib/tc/m_ipt.so
+usr/lib/tc/m_xt.so
 #usr/lib/tc/normal.dist
 #usr/lib/tc/pareto.dist
 #usr/lib/tc/paretonormal.dist
 #usr/sbin/arpd
-#usr/share/bash-completion
-#usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/devlink
 usr/share/bash-completion/completions/tc
 #usr/share/man/man3/libnetlink.3
diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
index 0c731e66ab..214a09550d 100644
--- a/config/rootfiles/common/x86_64/util-linux
+++ b/config/rootfiles/common/x86_64/util-linux
@@ -128,6 +128,8 @@ usr/sbin/partx
 usr/sbin/resizepart
 usr/sbin/rtcwake
 #usr/sbin/uuidd
+#usr/share/bash-completion
+#usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/addpart
 #usr/share/bash-completion/completions/blkdiscard
 #usr/share/bash-completion/completions/blkid
diff --git a/make.sh b/make.sh
index 86e92ecd74..e26753f4e0 100755
--- a/make.sh
+++ b/make.sh
@@ -1128,7 +1128,6 @@ buildbase() {
 	lfsmake2 gperf
 	lfsmake2 gzip
 	lfsmake2 hostname
-	lfsmake2 iproute2
 	lfsmake2 jwhois
 	lfsmake2 kbd
 	lfsmake2 less
@@ -1190,6 +1189,7 @@ buildipfire() {
   lfsmake2 libnetfilter_cthelper
   lfsmake2 libnetfilter_cttimeout
   lfsmake2 iptables
+  lfsmake2 iproute2
   lfsmake2 screen
   lfsmake2 elfutils