classes: Remove various bashisms
PATCH 1/1 classes: Remove various bashisms
Signed-off-by Richard Purdie <[email protected]>
---
meta/classes/image-prelink.bbclass +1 -1
@@ -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
meta/classes/kernel.bbclass +1 -1
@@ -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}
meta/classes/package_rpm.bbclass +10 -10
@@ -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 break
@@ -238,7 +238,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
@@ -273,7 +273,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
@@ -364,7 +364,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
Great, this was on my To Do!
Quoted 1 line · Richard Purdie
Signed-off-by Richard Purdie <[email protected]>
Signed-off-by Joshua Lock <[email protected]>
Quoted 103 lines
---
meta/classes/image-prelink.bbclass +1
-1@@ -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 fimeta/classes/kernel.bbclass +1
-1@@ -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}meta/classes/package_rpm.bbclass +10
-10@@ -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 break@@ -238,7 +238,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@@ -273,7 +273,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@@ -364,7 +364,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_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 3 lines
Joshua Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology Centre