From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 1 Jun 2010 16:39:07 +0000 (+0200)
Subject: QA: Add some new option to allow $ORIGIN as rpath.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=370830cf88c10028953d3cf47b764df91f652719;p=ipfire-3.x.git

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

diff --git a/pkgs/Constants b/pkgs/Constants
index 7b8d20356..b1adf570a 100644
--- 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 83c08c627..6f4b17789 100644
--- 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 fd43b2884..37efa9fe1 100755
--- 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