QA: Add some new option to allow $ORIGIN as rpath.

diff --git a/pkgs/Constants b/pkgs/Constants
index 7b8d20356d634f0475e7ad8b091c07f4a985dc75..b1adf570a15600746fc24c770071bcba95a85c1f 100644 (file)
--- a/pkgs/Constants
+++ b/pkgs/Constants
@@ -79,6 +79,7 @@ export PKG_DEPS PKG_BUILD_DEPS
 
 export CONTROL_PREIN CONTROL_PREUN CONTROL_POSTIN CONTROL_POSTUN
 
+export QUALITY_AGENT_RPATH_ALLOW_ORIGIN
 export QUALITY_AGENT_WHITELIST_EXECSTACK
 export QUALITY_AGENT_WHITELIST_NX
 export QUALITY_AGENT_WHITELIST_RPATH

diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index 83c08c62729a46cdec7bba53c9532da25fc0b928..6f4b1778995bc8a57d4d0d481830faede7e90e05 100644 (file)
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -120,9 +120,7 @@ PKG_OBJECTS   += $(THISAPP).tar.bz2
 # $(THISAPP)-resolv_response_length.patch
 #      This patch does a check on the buffer size of res_* functions.
 
-###############################################################################
-# Installation Details
-###############################################################################
+QUALITY_AGENT_RPATH_ALLOW_ORIGIN=yes
 
 define STAGE_PREPARE
        @cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(firstword $(PKG_OBJECTS))

diff --git a/tools/quality-agent.d/050-rpaths b/tools/quality-agent.d/050-rpaths
index fd43b28848eb242e9aafce0478fe097eb0a314a8..37efa9fe117e15bf21fcfad565e03205b82fff24 100755 (executable)
--- a/tools/quality-agent.d/050-rpaths
+++ b/tools/quality-agent.d/050-rpaths
@@ -19,6 +19,9 @@ check() {
 
                rpath=$(get_rpath ${file})
                if [ -n "${rpath}" ]; then
+                       if [ "${QUALITY_AGENT_RPATH_ALLOW_ORIGIN}" = "yes" ]; then
+                               [ "${rpath}" = '$ORIGIN' ] && continue
+                       fi
                        if listmatch ${rpath} ${QUALITY_AGENT_WHITELIST_RPATH}; then
                                continue
                        fi