The build oder is changed to build iproute2 atfer xtables ipset and linux-atm.

Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/common/iproute2 | 11 ++++++++++- lfs/iproute2 | 6 ++---- make.sh | 6 +++--- 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2 index 2339d83..3feb10e 100644 --- a/config/rootfiles/common/iproute2 +++ b/config/rootfiles/common/iproute2 @@ -8,8 +8,10 @@ etc/iproute2/rt_protos etc/iproute2/rt_realms etc/iproute2/rt_scopes etc/iproute2/rt_tables +sbin/arpd sbin/bridge sbin/ctstat +sbin/devlink sbin/genl sbin/ifcfg sbin/ifstat @@ -24,12 +26,15 @@ sbin/rtpr sbin/rtstat sbin/ss sbin/tc +sbin/tipc #usr/lib/tc #usr/lib/tc/experimental.dist +usr/lib/tc/m_ipt.so +usr/lib/tc/m_xt.so +usr/lib/tc/q_atm.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/tc @@ -67,6 +72,7 @@ usr/share/bash-completion/completions/tc #usr/share/doc/iproute2/tc-filters.tex #usr/share/man/man3/libnetlink.3 #usr/share/man/man7/tc-hfsc.7 +#usr/share/man/man8/arpd.8 #usr/share/man/man8/bridge.8 #usr/share/man/man8/ctstat.8 #usr/share/man/man8/devlink-dev.8 @@ -123,6 +129,8 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/tc-fw.8 #usr/share/man/man8/tc-hfsc.8 #usr/share/man/man8/tc-htb.8 +#usr/share/man/man8/tc-ife.8 +#usr/share/man/man8/tc-matchall.8 #usr/share/man/man8/tc-mirred.8 #usr/share/man/man8/tc-mqprio.8 #usr/share/man/man8/tc-nat.8 @@ -153,3 +161,4 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/tipc-node.8 #usr/share/man/man8/tipc-socket.8 #usr/share/man/man8/tipc.8 +var/lib/arpd diff --git a/lfs/iproute2 b/lfs/iproute2 index 47ce077..372d06c 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@

include Config

-VER = 4.7.0 +VER = 4.9.0

THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = d4b205830cdc2702f8a0cbd6232129cd +$(DL_FILE)_MD5 = 44a8371a4b2c40e48e4c9f98cbd41391

install : $(TARGET)

@@ -70,10 +70,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_arpd.patch cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin cd $(DIR_APP) && make SBINDIR=/sbin install - cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin

# Add table for static routing echo "200 static" >> /etc/iproute2/rt_tables diff --git a/make.sh b/make.sh index 24ea777..5bab3aa 100755 --- a/make.sh +++ b/make.sh @@ -367,7 +367,6 @@ buildbase() { lfsmake2 gperf lfsmake2 gzip lfsmake2 hostname - lfsmake2 iproute2 lfsmake2 jwhois lfsmake2 kbd lfsmake2 less @@ -492,13 +491,15 @@ buildipfire() { ipfiremake libevent ipfiremake libevent2 ipfiremake expat + ipfiremake linux-atm + ipfiremake ipset + ipfiremake iproute2 ipfiremake unbound ipfiremake gnutls ipfiremake bind ipfiremake dhcp ipfiremake dhcpcd ipfiremake boost - ipfiremake linux-atm ipfiremake gdbm ipfiremake pam ipfiremake curl @@ -871,7 +872,6 @@ buildipfire() { ipfiremake perl-Text-CSV_XS ipfiremake swconfig ipfiremake haproxy - ipfiremake ipset ipfiremake lua ipfiremake dnsdist ipfiremake bird