Patchwork tcl: Fix dangerous do_install staging references

login
register
mail settings
Submitter Richard Purdie
Date Sept. 27, 2012, 10:05 p.m.
Message ID <1348783527.15753.29.camel@ted>
Download mbox | patch
Permalink /patch/37373/
State Accepted
Commit 7642143760c0157aba80cea7b427024ee097cc2c
Headers show

Comments

Richard Purdie - Sept. 27, 2012, 10:05 p.m.
Nothing should ever be poking files directly into the staging/sysroot
directories, it should always go through ${D}.

This patch ensures this recipe does this and hence fixes various
potential build issues such as lack of sstate tracking of files.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index e5fe7d3..fab6057 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -44,7 +44,7 @@  do_compile_prepend() {
 
 do_install() {
 	autotools_do_install
-	oe_libinstall -so libtcl8.5 ${STAGING_LIBDIR}
+	oe_libinstall -so libtcl8.5 ${D}${libdir}
 	ln -sf ./tclsh8.5 ${D}${bindir}/tclsh
 	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
@@ -54,8 +54,8 @@  do_install() {
 	cd ..
 	for dir in compat generic unix
 	do
-		install -d ${STAGING_INCDIR}/tcl${PV}/$dir
-		install -m 0644 $dir/*.h ${STAGING_INCDIR}/tcl${PV}/$dir/
+		install -d ${D}${includedir}/tcl${PV}/$dir
+		install -m 0644 $dir/*.h ${D}${includedir}/tcl${PV}/$dir/
 	done
 }