Hi All,
Realised that I forgot to mention in the commit about the addition of the CONF_USR_DIR=/etc/iproute2
In previous versions of iproute2 they just had a single CONF_DIR which was /etc/iproute2
In version 6.5.0 they have split this into two CONF_ETC_DIR and CONF_USR_DIR
Here is a quote from the commit regarding this change:-
======================== Add support for the so called "stateless" configuration pattern (read from /etc, fall back to /usr), giving system administrators a way to define local configuration without changing any distro-provided files.
In practice this means that each configuration file FOO is loaded from /usr/lib/iproute2/FOO unless /etc/iproute2/FOO exists. ========================
This resulted in the files that used to be in /etc/iproute2 not being there and the directory also being missing.
I could have just created the directory and copied across all the files in the LFS but it seemed that this would duplicate the files and we are not a typical distro where the user might create customised conf files.
So I changed the lfs to set CONF_USR_DIR to /etc/iproute2 rather than the default /usr/lib/iproute2 This basically keeps everything in the same place as it used to be with the earlier versions.
If anyone thinks it should be done differently I can always change it at the next update.
Regards,
Adolf.
On 13/09/2023 12:14, Adolf Belka wrote:
- Update from version 6.4.0 to 6.5.0
- Update of rootfile
- Changelog is only available by reviewing the github commits https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/iproute2 | 1 + lfs/iproute2 | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2 index 420a33c85..15bad27f7 100644 --- a/config/rootfiles/common/iproute2 +++ b/config/rootfiles/common/iproute2 @@ -50,6 +50,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/dcb-ets.8 #usr/share/man/man8/dcb-maxrate.8 #usr/share/man/man8/dcb-pfc.8 +#usr/share/man/man8/dcb-rewr.8 #usr/share/man/man8/dcb.8 #usr/share/man/man8/devlink-dev.8 #usr/share/man/man8/devlink-dpipe.8 diff --git a/lfs/iproute2 b/lfs/iproute2 index cfdb474cb..1a55a1bb8 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@
include Config
-VER = 6.4.0 +VER = 6.5.0
THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 76369d2a794afd13dba1a34ee9a7425775bb7b43c22164274749c01b18d061669aa5abd51d32a15d68f48e75f4837a887dfc28ea41e34d8e4c36b2ab865628dd +$(DL_FILE)_BLAKE2 = 537a956c2fb59df25e90d7899a981e5408c5ee029df2bb87461b899ecf8fe4424a1db5d1b1b67a67bdb2555f6cc4aaf099b0544a2c92ffc3843adc3d17defb96
install : $(TARGET)
@@ -70,8 +70,13 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin
- cd $(DIR_APP) && make SBINDIR=/sbin install
cd $(DIR_APP) && make $(MAKETUNING) \
SBINDIR=/sbin \CONF_USR_DIR=/etc/iproute2cd $(DIR_APP) && make \
SBINDIR=/sbin \CONF_USR_DIR=/etc/iproute2 \installcd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin
# Add table for static routing