summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-06-26 12:38:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-28 09:14:06 +0100
commit8b45f23237aaf50f2d8d34c57f28cd21deba0f9e (patch)
treeac9f398ec3970a8dfd6fb3d94d234066472bad0f
parent3907ed52119929182a8dea691a357cda8ab74ea4 (diff)
downloadpoky-8b45f23237aaf50f2d8d34c57f28cd21deba0f9e.tar.gz
adt_installer_internal: fix perl modules relocated failed on older distributions
The perl module for automake has an embedded path in it, this needs to be relocated. Older versions of 'file' do not return the "ASCII" text in the output for a perl module file. Hence, the regex pattern didn't match perl module and they were not getting relocated at all on older distributions. 1) On CentOS release 6.4, the version of file is 5.04 $ file /usr/lib/perl5/Config_heavy.pl $ /usr/lib/perl5/Config_heavy.pl: Perl5 module source text 2) On Ubuntu 13.04, the version of file is 5.11 $ file /usr/lib/perl/5.14/Config_heavy.pl $ /usr/lib/perl/5.14/Config_heavy.pl: C source, ASCII text, with very long lines [YOCTO #4550] (From OE-Core rev: 7cfab2c895bf4daa7716fb7509e367bf74f016e4) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 4322964b21..25c955a5cb 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -212,8 +212,8 @@ check_result
212env_setup_script=$(find $NATIVE_INSTALL_DIR/ -name "environment-setup-*") 212env_setup_script=$(find $NATIVE_INSTALL_DIR/ -name "environment-setup-*")
213$SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script 213$SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script
214 214
215find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*\(ASCII\|script\).*text"|cut -d':' -f1|\ 215find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \; | grep ":.*\(ASCII\|script\|source\).*text" | \
216 xargs $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" 216 cut -d':' -f1 | xargs $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g"
217 217
218# change all symlinks pointing to /opt/${DISTRO}/${SDK_VERSION} 218# change all symlinks pointing to /opt/${DISTRO}/${SDK_VERSION}
219for l in $(find $NATIVE_INSTALL_DIR -type l); do 219for l in $(find $NATIVE_INSTALL_DIR -type l); do