| Message ID | 71e8bd3f2d49cd4fd745fb264e84c15e123c5788.1700068869.git.aclaudi@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 962692356a1cc41932e43575f3c50927e455ab53 |
| Delegated to: | Stephen Hemminger |
| Headers | show |
| Series | [iproute2,v2] Makefile: use /usr/share/iproute2 for config files | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Wed, 15 Nov 2023 at 17:25, Andrea Claudi <aclaudi@redhat.com> wrote: > > According to FHS: > > "/usr/lib includes object files and libraries. On some systems, it may > also include internal binaries that are not intended to be executed > directly by users or shell scripts." > > A better directory to store config files is /usr/share: > > "The /usr/share hierarchy is for all read-only architecture independent > data files. > > This hierarchy is intended to be shareable among all architecture > platforms of a given OS; thus, for example, a site with i386, Alpha, and > PPC platforms might maintain a single /usr/share directory that is > centrally-mounted." > > Accordingly, move configuration files to $(DATADIR)/iproute2. > > Fixes: 946753a4459b ("Makefile: ensure CONF_USR_DIR honours the libdir config") > Reported-by: Luca Boccassi <luca.boccassi@gmail.com> > Signed-off-by: Andrea Claudi <aclaudi@redhat.com> > --- > > v2: > - Rebased on commit deb66acabe44, changed commit message > > Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index a24844cf..8024d45e 100644 > --- a/Makefile > +++ b/Makefile > @@ -16,12 +16,12 @@ endif > > PREFIX?=/usr > SBINDIR?=/sbin > -CONF_ETC_DIR?=/etc/iproute2 > -CONF_USR_DIR?=$(PREFIX)/lib/iproute2 > NETNS_RUN_DIR?=/var/run/netns > NETNS_ETC_DIR?=/etc/netns > DATADIR?=$(PREFIX)/share > HDRDIR?=$(PREFIX)/include/iproute2 > +CONF_ETC_DIR?=/etc/iproute2 > +CONF_USR_DIR?=$(DATADIR)/iproute2 > DOCDIR?=$(DATADIR)/doc/iproute2 > MANDIR?=$(DATADIR)/man > ARPDDIR?=/var/lib/arpd Acked-by: Luca Boccassi <bluca@debian.org>
On Wed, Nov 15, 2023 at 06:25:35PM +0100, Andrea Claudi wrote: > According to FHS: > > "/usr/lib includes object files and libraries. On some systems, it may > also include internal binaries that are not intended to be executed > directly by users or shell scripts." > > A better directory to store config files is /usr/share: > > "The /usr/share hierarchy is for all read-only architecture independent > data files. > > This hierarchy is intended to be shareable among all architecture > platforms of a given OS; thus, for example, a site with i386, Alpha, and > PPC platforms might maintain a single /usr/share directory that is > centrally-mounted." > > Accordingly, move configuration files to $(DATADIR)/iproute2. > > Fixes: 946753a4459b ("Makefile: ensure CONF_USR_DIR honours the libdir config") > Reported-by: Luca Boccassi <luca.boccassi@gmail.com> > Signed-off-by: Andrea Claudi <aclaudi@redhat.com> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <stephen@networkplumber.org>: On Wed, 15 Nov 2023 18:25:35 +0100 you wrote: > According to FHS: > > "/usr/lib includes object files and libraries. On some systems, it may > also include internal binaries that are not intended to be executed > directly by users or shell scripts." > > A better directory to store config files is /usr/share: > > [...] Here is the summary with links: - [iproute2,v2] Makefile: use /usr/share/iproute2 for config files https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=962692356a1c You are awesome, thank you!
diff --git a/Makefile b/Makefile index a24844cf..8024d45e 100644 --- a/Makefile +++ b/Makefile @@ -16,12 +16,12 @@ endif PREFIX?=/usr SBINDIR?=/sbin -CONF_ETC_DIR?=/etc/iproute2 -CONF_USR_DIR?=$(PREFIX)/lib/iproute2 NETNS_RUN_DIR?=/var/run/netns NETNS_ETC_DIR?=/etc/netns DATADIR?=$(PREFIX)/share HDRDIR?=$(PREFIX)/include/iproute2 +CONF_ETC_DIR?=/etc/iproute2 +CONF_USR_DIR?=$(DATADIR)/iproute2 DOCDIR?=$(DATADIR)/doc/iproute2 MANDIR?=$(DATADIR)/man ARPDDIR?=/var/lib/arpd
According to FHS: "/usr/lib includes object files and libraries. On some systems, it may also include internal binaries that are not intended to be executed directly by users or shell scripts." A better directory to store config files is /usr/share: "The /usr/share hierarchy is for all read-only architecture independent data files. This hierarchy is intended to be shareable among all architecture platforms of a given OS; thus, for example, a site with i386, Alpha, and PPC platforms might maintain a single /usr/share directory that is centrally-mounted." Accordingly, move configuration files to $(DATADIR)/iproute2. Fixes: 946753a4459b ("Makefile: ensure CONF_USR_DIR honours the libdir config") Reported-by: Luca Boccassi <luca.boccassi@gmail.com> Signed-off-by: Andrea Claudi <aclaudi@redhat.com> --- v2: - Rebased on commit deb66acabe44, changed commit message Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)