[oe-commits] Mike Westerhof : This patch changes hard-coded references to /usr and / opt in the various

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: b162231b359bd218cbe0c1000e4fb33f4d942751
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b162231b359bd218cbe0c1000e4fb33f4d942751

Author: Mike Westerhof <mwester at dls.net>
Date:   Tue Feb 22 09:43:23 2011 -0600

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 at mwester.net>
Acked-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/squid/squid_3.1.9.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/recipes/squid/squid_3.1.9.bb b/recipes/squid/squid_3.1.9.bb
index 713b1ea..24b43ff 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() {