浏览代码

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>
Matt Weber 8 年之前
父节点
当前提交
e29061a9e6
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      package/paxtest/paxtest.mk

+ 7 - 2
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))