summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-05-04 12:28:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-09 14:09:08 +0100
commit610ba36030b811646cde5f741ef0c8db9af305cb (patch)
tree4ef8b4b42d84804bbc15339affcf378b490f469b
parent6e884c3bd72755a3ccac3bffae60d5ea83730882 (diff)
downloadpoky-610ba36030b811646cde5f741ef0c8db9af305cb.tar.gz
binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS
When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks and update-alternatives weren't working. TARGET_PREFIX is what we use when configuring so it's what we should be using here. This is 79b497edc0ce5d54db564818e59b690d3391d6ce from OE. (From OE-Core rev: 371205d21723ec911a77d5e7c1ef51fb26d854f5) Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index d9e859ef2b..882fe7b5cb 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -110,7 +110,7 @@ do_install () {
110 110
111 # Symlinks for ease of running these on the native target 111 # Symlinks for ease of running these on the native target
112 for p in ${TARGET_SYS}-* ; do 112 for p in ${TARGET_SYS}-* ; do
113 ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,` 113 ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,`
114 done 114 done
115 115
116 rm ${D}${bindir}/ar ${D}${bindir}/strings 116 rm ${D}${bindir}/ar ${D}${bindir}/strings
@@ -139,11 +139,11 @@ do_install_virtclass-native () {
139} 139}
140 140
141pkg_postinst_${PN}-symlinks () { 141pkg_postinst_${PN}-symlinks () {
142 update-alternatives --install ${bindir}/ar ar ${TARGET_SYS}-ar 100 142 update-alternatives --install ${bindir}/ar ar ${TARGET_PREFIX}ar 100
143 update-alternatives --install ${bindir}/strings strings ${TARGET_SYS}-strings 100 143 update-alternatives --install ${bindir}/strings strings ${TARGET_PREFIX}strings 100
144} 144}
145 145
146pkg_prerm_${PN}-symlinks () { 146pkg_prerm_${PN}-symlinks () {
147 update-alternatives --remove ar ${TARGET_SYS}-ar 147 update-alternatives --remove ar ${TARGET_PREFIX}ar
148 update-alternatives --remove strings ${TARGET_SYS}-strings 148 update-alternatives --remove strings ${TARGET_PREFIX}strings
149} 149}