From c96e4990feb2eb0f15fa186fe82072a1baf47387 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 8 Nov 2011 17:57:41 +0000 Subject: classes: Remove various bashisms (From OE-Core rev: a057adfbb72454e28294f00075a69e0e7c699bec) Signed-off-by: Richard Purdie --- meta/classes/image-prelink.bbclass | 2 +- meta/classes/kernel.bbclass | 2 +- meta/classes/package_rpm.bbclass | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass index 350c29d424..53ef47e4d4 100644 --- a/meta/classes/image-prelink.bbclass +++ b/meta/classes/image-prelink.bbclass @@ -24,7 +24,7 @@ prelink_image () { ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf # Remove the prelink.conf if we had to add it. - if [ "$dummy_prelink_conf" == "true" ]; then + if [ "$dummy_prelink_conf" = "true" ]; then rm -f ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf fi diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 42543e0e4f..dc711f287a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -152,7 +152,7 @@ kernel_do_install() { # cp -fR * $kerneldir cp .config $kerneldir - if [ ! "${S}" == "${B}" ]; then + if [ "${S}" != "${B}" ]; then cp -fR ${S}/* $kerneldir fi install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 2679e9f480..f804a0fc17 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -87,22 +87,22 @@ package_generate_rpm_conf_common() { shift printf "_solve_dbpath " > ${rpmconf_base}.macro - o_colon=false + o_colon="false" for archvar in "$@"; do printf "_solve_dbpath " > ${rpmconf_base}-${archvar}.macro - colon=false + colon="false" for each in `cat ${rpmconf_base}-${archvar}.conf` ; do - if [ "$o_colon" == true ]; then + if [ "$o_colon" = "true" ]; then printf ":" >> ${rpmconf_base}.macro fi - if [ "$colon" == true ]; then + if [ "$colon" = "true" ]; then printf ":" >> ${rpmconf_base}-${archvar}.macro fi printf "%s" $each >> ${rpmconf_base}.macro - o_colon=true + o_colon="true" printf "%s" $each >> ${rpmconf_base}-${archvar}.macro - colon=true + colon="true" done printf "\n" >> ${rpmconf_base}-${archvar}.macro done @@ -214,7 +214,7 @@ package_install_internal_rpm () { ml_prefix=`echo ${pkg} | cut -d'-' -f1` ml_pkg=$pkg for i in ${MULTILIB_PREFIX_LIST} ; do - if [ ${ml_prefix} == ${i} ]; then + if [ ${ml_prefix} = ${i} ]; then ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,") archvar=ml_archs manifest=install_multilib.manifest @@ -240,7 +240,7 @@ package_install_internal_rpm () { ml_prefix=`echo ${pkg} | cut -d'-' -f1` ml_pkg=$pkg for i in ${MULTILIB_PREFIX_LIST} ; do - if [ ${ml_prefix} == ${i} ]; then + if [ ${ml_prefix} = ${i} ]; then ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,") archvar=ml_archs manifest=install_multilib.manifest @@ -276,7 +276,7 @@ package_install_internal_rpm () { ml_prefix=`echo ${pkg} | cut -d'-' -f1` ml_pkg=$pkg for i in ${MULTILIB_PREFIX_LIST} ; do - if [ ${ml_prefix} == ${i} ]; then + if [ ${ml_prefix} = ${i} ]; then ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,") archvar=ml_archs break -- cgit v1.2.3-54-g00ecf