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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass
index 69dac2f56747470f08d0ea67e48858ad6ba3b2e4..762381520e238722ab3336191453fb9ad7e7945b 100644 (file)
--- a/meta/classes/image-mklibs.bbclass
+++ b/meta/classes/image-mklibs.bbclass
@@ -60,7 +60,7 @@ mklibs_optimize_image_doit() {
 mklibs_optimize_image() {
        for img in ${MKLIBS_OPTIMIZED_IMAGES}
        do
-               if [ "${img}" == "${PN}" ] || [ "${img}" == "all" ]
+               if [ "${img}" = "${PN}" ] || [ "${img}" = "all" ]
                then
                        mklibs_optimize_image_doit
                        break

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index aeabc110185b2f4b115fdfd169857aab67cb035c..36dedb9c611d3a975781de2cc196595081e92501 100644 (file)
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -72,8 +72,10 @@ package_tryout_install_multilib_ipk() {
                local ipkg_args="-f ${INSTALL_CONF_IPK} -o ${target_rootfs} --force_overwrite"
                local selected_pkg=""
                local pkgname_prefix="${item}-"
+               local pkgname_len=${#pkgname_prefix}
                for pkg in ${INSTALL_PACKAGES_MULTILIB_IPK}; do
-                       if [ ${pkg:0:${#pkgname_prefix}} == ${pkgname_prefix} ]; then
+                       local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' )
+                       if [ ${pkgname} = ${pkgname_prefix} ]; then
                            selected_pkg="${selected_pkg} ${pkg}"
                        fi
                done
@@ -94,7 +96,9 @@ split_multilib_packages() {
                is_multilib=0
                for item in ${MULTILIB_VARIANTS}; do
                        local pkgname_prefix="${item}-"
-                       if [ ${pkg:0:${#pkgname_prefix}} == ${pkgname_prefix} ]; then
+                       local pkgname_len=${#pkgname_prefix}
+                       local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' )
+                       if [ ${pkgname} = ${pkgname_prefix} ]; then
                                is_multilib=1
                                break
                        fi