summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Weber <matthew.weber@rockwellcollins.com>2017-07-22 20:53:03 -0500
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-25 22:20:59 +0200
commite29061a9e657ecbc4d9b25e1d643bd06b27c0b15 (patch)
treea7054dc4de46670d317273fb170203017f0c8df9
parentdd3f8369a291dfc727e5831549f6e31c1c90d60f (diff)
downloadbuildroot-e29061a9e657ecbc4d9b25e1d643bd06b27c0b15.tar.gz
buildroot-e29061a9e657ecbc4d9b25e1d643bd06b27c0b15.zip
paxtest: install helper applications/libs to /usr/lib/paxtest
RUNDIR installs the test applications and shared libraries into a different folder then /usr/lib. This is desired as there are a lot of test apps which would get installed into /usr/lib without organization. Instead, set RUNDIR=/usr/lib/paxtest to install the test apps and libraries in a sub folder. The genpaxtest script accounts for this path and handles a LD_LIBRARY_PATH update as part of the paxtest script's exeuction. Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/paxtest/paxtest.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/paxtest/paxtest.mk b/package/paxtest/paxtest.mk
index 5eaee86e69..e632e222c3 100644
--- a/package/paxtest/paxtest.mk
+++ b/package/paxtest/paxtest.mk
@@ -11,15 +11,20 @@ PAXTEST_LICENSE_FILES = README
define PAXTEST_BUILD_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
- CC="$(TARGET_CC)" LD="$(TARGET_CC)" linux
+ RUNDIR="/usr/lib/paxtest" CC="$(TARGET_CC)" LD="$(TARGET_CC)" linux
endef
+# The files installed to RUNDIR include test apps and shared libs.
+# Assuming /usr/bin/paxtest script solely uses these libs and apps, the
+# genpaxtest script updates LD_LIBRARY_PATH in the paxtest script
+# as part of the paxtest's creation to include the RUNDIR path for shared
+# library use.
define PAXTEST_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
CC="$(TARGET_CC)" LD="$(TARGET_CC)" \
DESTDIR=$(TARGET_DIR) \
BINDIR="usr/bin" \
- RUNDIR="usr/lib" -f Makefile.psm install
+ RUNDIR="/usr/lib/paxtest" -f Makefile.psm install
endef
$(eval $(generic-package))
OpenPOWER on IntegriCloud