package_ipk.bbclass: fixing muttilib prefix extracting.
authorLianhao Lu <lianhao.lu@intel.com>
Thu, 5 Apr 2012 11:41:47 +0000 (19:41 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 6 Apr 2012 00:12:46 +0000 (01:12 +0100)
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>
meta/classes/package_ipk.bbclass

index e7d038f..0e4fea8 100644 (file)
@@ -74,7 +74,7 @@ package_tryout_install_multilib_ipk() {
                local pkgname_prefix="${item}-"
                local pkgname_len=${#pkgname_prefix}
                for pkg in ${INSTALL_PACKAGES_MULTILIB_IPK}; do
-                       local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' )
+                       local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var); print pkgname; }' )
                        if [ ${pkgname} = ${pkgname_prefix} ]; then
                            selected_pkg="${selected_pkg} ${pkg}"
                        fi
@@ -97,7 +97,7 @@ split_multilib_packages() {
                for item in ${MULTILIB_VARIANTS}; do
                        local pkgname_prefix="${item}-"
                        local pkgname_len=${#pkgname_prefix}
-                       local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' )
+                       local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var); print pkgname; }' )
                        if [ ${pkgname} = ${pkgname_prefix} ]; then
                                is_multilib=1
                                break