From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] iproute2: Update to version 6.5.0
Date: Wed, 13 Sep 2023 12:32:39 +0200
Message-ID: <6b969e4e-e919-4c7f-9271-c34860ac447e@ipfire.org>
In-Reply-To: <20230913101414.3434376-3-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2426853013779971741=="
List-Id: <development.lists.ipfire.org>

--===============2426853013779971741==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi All,

Realised that I forgot to mention in the commit about the addition of the CON=
F_USR_DIR=3D/etc/iproute2

In previous versions of iproute2 they just had a single CONF_DIR which was /e=
tc/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:-

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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.
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

This resulted in the files that used to be in /etc/iproute2 not being there a=
nd the directory also being missing.

I could have just created the directory and copied across all the files in th=
e LFS but it seemed that this would duplicate the files and we are not a typi=
cal 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 def=
ault /usr/lib/iproute2 This basically keeps everything in the same place as i=
t 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/
>=20
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   config/rootfiles/common/iproute2 |  1 +
>   lfs/iproute2                     | 13 +++++++++----
>   2 files changed, 10 insertions(+), 4 deletions(-)
>=20
> diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/ipr=
oute2
> 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 @@
>  =20
>   include Config
>  =20
> -VER        =3D 6.4.0
> +VER        =3D 6.5.0
>  =20
>   THISAPP    =3D iproute2-$(VER)
>   DL_FILE    =3D $(THISAPP).tar.xz
> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
>  =20
>   $(DL_FILE)             =3D $(DL_FROM)/$(DL_FILE)
>  =20
> -$(DL_FILE)_BLAKE2 =3D 76369d2a794afd13dba1a34ee9a7425775bb7b43c22164274749=
c01b18d061669aa5abd51d32a15d68f48e75f4837a887dfc28ea41e34d8e4c36b2ab865628dd
> +$(DL_FILE)_BLAKE2 =3D 537a956c2fb59df25e90d7899a981e5408c5ee029df2bb87461b=
899ecf8fe4424a1db5d1b1b67a67bdb2555f6cc4aaf099b0544a2c92ffc3843adc3d17defb96
>  =20
>   install : $(TARGET)
>  =20
> @@ -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=3D/sbin
> -	cd $(DIR_APP) && make SBINDIR=3D/sbin install
> +	cd $(DIR_APP) && make $(MAKETUNING) \
> +					SBINDIR=3D/sbin \
> +					CONF_USR_DIR=3D/etc/iproute2
> +	cd $(DIR_APP) && make \
> +				SBINDIR=3D/sbin \
> +				CONF_USR_DIR=3D/etc/iproute2 \
> +				install
>   	cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin
>  =20
>   	# Add table for static routing

--===============2426853013779971741==--