summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-04-05 19:41:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-06 01:12:46 +0100
commitc7283aa15f1db3409e951a8014c4b9ccd2334e02 (patch)
tree1c765c105edf06ce0342b91d314f430bd3013020
parentdf21414331815a2ba5102796005c47afcaf7eb28 (diff)
downloadpoky-c7283aa15f1db3409e951a8014c4b9ccd2334e02.tar.gz
package_ipk.bbclass: fixing muttilib prefix extracting.
Fixed an error in multilib prefix extracting. (From OE-Core rev: 0e66900cbe6438b9b3ecfef1c348a5575bd27c41) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_ipk.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index e7d038fbad..0e4fea8d53 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -74,7 +74,7 @@ package_tryout_install_multilib_ipk() {
74 local pkgname_prefix="${item}-" 74 local pkgname_prefix="${item}-"
75 local pkgname_len=${#pkgname_prefix} 75 local pkgname_len=${#pkgname_prefix}
76 for pkg in ${INSTALL_PACKAGES_MULTILIB_IPK}; do 76 for pkg in ${INSTALL_PACKAGES_MULTILIB_IPK}; do
77 local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' ) 77 local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var); print pkgname; }' )
78 if [ ${pkgname} = ${pkgname_prefix} ]; then 78 if [ ${pkgname} = ${pkgname_prefix} ]; then
79 selected_pkg="${selected_pkg} ${pkg}" 79 selected_pkg="${selected_pkg} ${pkg}"
80 fi 80 fi
@@ -97,7 +97,7 @@ split_multilib_packages() {
97 for item in ${MULTILIB_VARIANTS}; do 97 for item in ${MULTILIB_VARIANTS}; do
98 local pkgname_prefix="${item}-" 98 local pkgname_prefix="${item}-"
99 local pkgname_len=${#pkgname_prefix} 99 local pkgname_len=${#pkgname_prefix}
100 local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' ) 100 local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var); print pkgname; }' )
101 if [ ${pkgname} = ${pkgname_prefix} ]; then 101 if [ ${pkgname} = ${pkgname_prefix} ]; then
102 is_multilib=1 102 is_multilib=1
103 break 103 break