From c7283aa15f1db3409e951a8014c4b9ccd2334e02 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Thu, 5 Apr 2012 19:41:47 +0800 Subject: package_ipk.bbclass: fixing muttilib prefix extracting. Fixed an error in multilib prefix extracting. (From OE-Core rev: 0e66900cbe6438b9b3ecfef1c348a5575bd27c41) Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 4 ++-- 1 file 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() { 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 -- cgit v1.2.3-54-g00ecf