From: Mike Westerhof <mwester@dls.net>
Date: Tue, 22 Feb 2011 15:43:23 +0000 (-0600)
Subject: This patch changes hard-coded references to /usr and /opt in the various
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b162231b359bd218cbe0c1000e4fb33f4d942751;p=openembedded.git

This patch changes hard-coded references to /usr and /opt in the various
squid config.test scripts to point to the correct sysroot paths.
This version accommodates the unusual staging dir layout used by micro.
Signed-off-by: Mike Westerhof <mike@mwester.net>
Acked-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/recipes/squid/squid_3.1.9.bb b/recipes/squid/squid_3.1.9.bb
index 713b1ea534..24b43ff7d9 100644
--- a/recipes/squid/squid_3.1.9.bb
+++ b/recipes/squid/squid_3.1.9.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 include squid.inc
 
@@ -18,6 +18,11 @@ do_configure_prepend() {
 	export ac_cv_epoll_ctl=yes
 	export ac_cv_epoll_works=yes
 	export ac_cv_func_setresuid=yes
+	# Patch up the various config scripts to refer to sysroot
+	for i in `find ${S} -name config.test`; do
+	    sed -i -e 's|/usr|${STAGING_DIR_HOST}${exec_prefix}|g' \
+	           -e 's|/opt|${STAGING_DIR_HOST}/opt|g' "$i"
+	done
 }
 
 do_install_append() {