From b162231b359bd218cbe0c1000e4fb33f4d942751 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Tue, 22 Feb 2011 09:43:23 -0600 Subject: [PATCH] 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 Acked-by: Khem Raj --- recipes/squid/squid_3.1.9.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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() { -- 2.39.5