Skip to contentSkip to conversation

Install test programs in /usr/lib

PATCH In review Ramesh Thomas 2 participants 5 messages Oct 5, 2022 – Oct 6, 2022 Kbuild

lore
Share & tools
lore

Ramesh Thomas

author
#0 lore raw

cover Install test programs in /usr/lib

Test programs are being installed into /usr/share which violates the policy
https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrshareArchitectureindependentData

Update make file, rpm and debian scripts to install test programs and related config files in /usr/lib

Ramesh Thomas (3):
accel-config: Install test programs in /usr/lib
accel-config: Update rpm scripts to install test programs in /usr/lib
accel-config: Update debian scripts to install test programs in
/usr/lib

 Makefile.am                      | 4 ++--
 accfg-test.spec.in               | 6 +++---
 accfg.spec.in                    | 4 ++--
 debian/accel-config-test.install | 2 +-
 debian/accel-config.install      | 4 ++--
 test/Makefile.am                 | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
Signature · 1 line
2.37.3
author
#1 lore raw

PATCH 1/3 accel-config: Install test programs in /usr/lib

Test programs are being installed into /usr/share which violates the policy
https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrshareArchitectureindependentData

Update make files to install test programs and related config files in /usr/lib

Reported-by Colin Ian King <colin.king(a)intel.com>
Signed-off-by Ramesh Thomas <ramesh.thomas(a)intel.com>
---
 Makefile.am      | 4 ++--
 test/Makefile.am | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Makefile.am +2 -2
index b649934..b5cc850 100644
@@ -34,13 +34,13 @@ bashcompletiondir = $(BASH_COMPLETION_DIR)
 endif
 
 accfgconf_file = contrib/accel-config.conf.sample
-accfgconfdir = $(sysconfdir)/accel-config/
+accfgconfdir = $(prefix)/lib/accel-config/
 accfgconf_DATA = $(accfgconf_file)
 
 EXTRA_DIST += $(accfgconf_file) accfg.spec.in accfg-test.spec.in
 
 contrib_configs = contrib/configs/*
-contribdir = $(prefix)/share/accel-config/contrib/configs
+contribdir = $(prefix)/lib/accel-config/contrib/configs
 contrib_DATA = $(contrib_configs)
 
 noinst_LIBRARIES = libccan.a
test/Makefile.am +1 -1
index a42d16c..78127a2 100644
@@ -13,7 +13,7 @@ check_PROGRAMS =\
 	iaa_test
 
 if ENABLE_TEST
-testprogdir = $(datadir)/accel-config/test/
+testprogdir = $(prefix)/lib/accel-config/test/
 testprog_DATA = common
 testprog_SCRIPTS = dsa_user_test_runner.sh iaa_user_test_runner.sh
 testprog_PROGRAMS = dsa_test iaa_test
Signature · 1 line
2.37.3
author
#2 lore raw

PATCH 2/3 accel-config: Update rpm scripts to install test programs in /usr/lib

In reply to Ramesh Thomas

Test programs are being installed into /usr/share which violates the policy
https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrshareArchitectureindependentData

Update rpm scripts to install test programs and related config files in /usr/lib

Reported-by Colin Ian King <colin.king(a)intel.com>
Signed-off-by Ramesh Thomas <ramesh.thomas(a)intel.com>
---
 accfg-test.spec.in | 6 +++---
 accfg.spec.in      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
accfg-test.spec.in +3 -3
index e279149..b639cc4 100644
@@ -70,8 +70,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %license licenses/accel-config-licenses LICENSE_GPL_2_0
 %{_bindir}/accel-config
 %{_mandir}/man1/accel-config*
-%{_sysconfdir}/accel-config/accel-config.conf.sample
-%{_datadir}/accel-config/contrib/configs/*
+%{_prefix}/lib/accel-config/accel-config.conf.sample
+%{_prefix}/lib/accel-config/contrib/configs/*
 
 %files -n LNAME
 %defattr(-,root,root)
@@ -90,6 +90,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %files -n %{name}-test
 %defattr(-,root,root)
 %license Documentation/COPYING LICENSE_GPL_2_0
-%{_datadir}/accel-config/test/*
+%{_prefix}/lib/accel-config/test/*
 
 %changelog
accfg.spec.in +2 -2
index 7eb65bb..b905d30 100644
@@ -62,8 +62,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %license licenses/accel-config-licenses LICENSE_GPL_2_0
 %{_bindir}/accel-config
 %{_mandir}/man1/accel-config*
-%{_sysconfdir}/accel-config/accel-config.conf.sample
-%{_datadir}/accel-config/contrib/configs/*
+%{_prefix}/lib/accel-config/accel-config.conf.sample
+%{_prefix}/lib/accel-config/contrib/configs/*
 
 %files -n LNAME
 %defattr(-,root,root)
Signature · 1 line
2.37.3
author
#3 lore raw

PATCH 3/3 accel-config: Update debian scripts to install test programs in /usr/lib

In reply to Ramesh Thomas

Test programs are being installed into /usr/share which violates the policy
https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrshareArchitectureindependentData

Update debian scripts to install test programs and related config files in /usr/lib

Reported-by Colin Ian King <colin.king(a)intel.com>
Signed-off-by Ramesh Thomas <ramesh.thomas(a)intel.com>
---
 debian/accel-config-test.install | 2 +-
 debian/accel-config.install      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
debian/accel-config-test.install +1 -1
index 0045205..7af4d78 100644
@@ -1 +1 @@
-usr/share/accel-config/test/*
+usr/lib/accel-config/test/*
debian/accel-config.install +2 -2
index 6da3872..e97d56f 100644
@@ -1,4 +1,4 @@
-etc/accel-config/accel-config.conf.sample
 usr/bin/accel-config
 usr/share/man/man1/accel-config*
-usr/share/accel-config/contrib/configs/*
+usr/lib/accel-config/contrib/configs/*
+usr/lib/accel-config/accel-config.conf.sample
Signature · 1 line
2.37.3
Reviewed-by on the v1 series
#4 lore raw
In reply to Ramesh Thomas
Quoted 6 lines · Ramesh Thomas

Test programs are being installed into /usr/share which violates the policy
https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrshareArchitectureindependentData

Update make file, rpm and debian scripts to install test programs and related config files in /usr/lib

Reviewed-by Dave Jiang <dave.jiang(a)intel.com> for the series.
Quoted 15 lines

Ramesh Thomas (3):
accel-config: Install test programs in /usr/lib
accel-config: Update rpm scripts to install test programs in /usr/lib
accel-config: Update debian scripts to install test programs in
/usr/lib

  Makefile.am                      | 4 ++--
  accfg-test.spec.in               | 6 +++---
  accfg.spec.in                    | 4 ++--
  debian/accel-config-test.install | 2 +-
  debian/accel-config.install      | 4 ++--
  test/Makefile.am                 | 2 +-
  6 files changed, 11 insertions(+), 11 deletions(-)