diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-05 12:50:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-05 22:26:25 +0000 |
commit | 5797feac5f06f5cc363869cd440b82b3eaafd456 (patch) | |
tree | 5df88eefaac2c76f38c863ad7778cdefbe19d80f /meta/classes/package_ipk.bbclass | |
parent | a10af679ec0cc497c0ddeb672a16d3200080720e (diff) | |
download | poky-5797feac5f06f5cc363869cd440b82b3eaafd456.tar.gz |
image-mklibs/package_ipk: Remove bashisms
We now support using dash but these bashisms triggered build failures for me
when using it. This replaces the code with something which works on dash.
(From OE-Core rev: 4a85312568a6bb052cc511c15b4ae842ff7f8e59)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index aeabc11018..36dedb9c61 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -72,8 +72,10 @@ package_tryout_install_multilib_ipk() { | |||
72 | local ipkg_args="-f ${INSTALL_CONF_IPK} -o ${target_rootfs} --force_overwrite" | 72 | local ipkg_args="-f ${INSTALL_CONF_IPK} -o ${target_rootfs} --force_overwrite" |
73 | local selected_pkg="" | 73 | local selected_pkg="" |
74 | local pkgname_prefix="${item}-" | 74 | local pkgname_prefix="${item}-" |
75 | local pkgname_len=${#pkgname_prefix} | ||
75 | for pkg in ${INSTALL_PACKAGES_MULTILIB_IPK}; do | 76 | for pkg in ${INSTALL_PACKAGES_MULTILIB_IPK}; do |
76 | if [ ${pkg:0:${#pkgname_prefix}} == ${pkgname_prefix} ]; then | 77 | local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' ) |
78 | if [ ${pkgname} = ${pkgname_prefix} ]; then | ||
77 | selected_pkg="${selected_pkg} ${pkg}" | 79 | selected_pkg="${selected_pkg} ${pkg}" |
78 | fi | 80 | fi |
79 | done | 81 | done |
@@ -94,7 +96,9 @@ split_multilib_packages() { | |||
94 | is_multilib=0 | 96 | is_multilib=0 |
95 | for item in ${MULTILIB_VARIANTS}; do | 97 | for item in ${MULTILIB_VARIANTS}; do |
96 | local pkgname_prefix="${item}-" | 98 | local pkgname_prefix="${item}-" |
97 | if [ ${pkg:0:${#pkgname_prefix}} == ${pkgname_prefix} ]; then | 99 | local pkgname_len=${#pkgname_prefix} |
100 | local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' ) | ||
101 | if [ ${pkgname} = ${pkgname_prefix} ]; then | ||
98 | is_multilib=1 | 102 | is_multilib=1 |
99 | break | 103 | break |
100 | fi | 104 | fi |