classes: Remove various bashisms
(From OE-Core rev: a057adfbb72454e28294f00075a69e0e7c699bec) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a3b987a2f7
commit
c96e4990fe
|
@ -24,7 +24,7 @@ prelink_image () {
|
||||||
${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf
|
${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.
|
# 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
|
rm -f ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,7 @@ kernel_do_install() {
|
||||||
#
|
#
|
||||||
cp -fR * $kerneldir
|
cp -fR * $kerneldir
|
||||||
cp .config $kerneldir
|
cp .config $kerneldir
|
||||||
if [ ! "${S}" == "${B}" ]; then
|
if [ "${S}" != "${B}" ]; then
|
||||||
cp -fR ${S}/* $kerneldir
|
cp -fR ${S}/* $kerneldir
|
||||||
fi
|
fi
|
||||||
install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE}
|
install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE}
|
||||||
|
|
|
@ -87,22 +87,22 @@ package_generate_rpm_conf_common() {
|
||||||
shift
|
shift
|
||||||
|
|
||||||
printf "_solve_dbpath " > ${rpmconf_base}.macro
|
printf "_solve_dbpath " > ${rpmconf_base}.macro
|
||||||
o_colon=false
|
o_colon="false"
|
||||||
|
|
||||||
for archvar in "$@"; do
|
for archvar in "$@"; do
|
||||||
printf "_solve_dbpath " > ${rpmconf_base}-${archvar}.macro
|
printf "_solve_dbpath " > ${rpmconf_base}-${archvar}.macro
|
||||||
colon=false
|
colon="false"
|
||||||
for each in `cat ${rpmconf_base}-${archvar}.conf` ; do
|
for each in `cat ${rpmconf_base}-${archvar}.conf` ; do
|
||||||
if [ "$o_colon" == true ]; then
|
if [ "$o_colon" = "true" ]; then
|
||||||
printf ":" >> ${rpmconf_base}.macro
|
printf ":" >> ${rpmconf_base}.macro
|
||||||
fi
|
fi
|
||||||
if [ "$colon" == true ]; then
|
if [ "$colon" = "true" ]; then
|
||||||
printf ":" >> ${rpmconf_base}-${archvar}.macro
|
printf ":" >> ${rpmconf_base}-${archvar}.macro
|
||||||
fi
|
fi
|
||||||
printf "%s" $each >> ${rpmconf_base}.macro
|
printf "%s" $each >> ${rpmconf_base}.macro
|
||||||
o_colon=true
|
o_colon="true"
|
||||||
printf "%s" $each >> ${rpmconf_base}-${archvar}.macro
|
printf "%s" $each >> ${rpmconf_base}-${archvar}.macro
|
||||||
colon=true
|
colon="true"
|
||||||
done
|
done
|
||||||
printf "\n" >> ${rpmconf_base}-${archvar}.macro
|
printf "\n" >> ${rpmconf_base}-${archvar}.macro
|
||||||
done
|
done
|
||||||
|
@ -214,7 +214,7 @@ package_install_internal_rpm () {
|
||||||
ml_prefix=`echo ${pkg} | cut -d'-' -f1`
|
ml_prefix=`echo ${pkg} | cut -d'-' -f1`
|
||||||
ml_pkg=$pkg
|
ml_pkg=$pkg
|
||||||
for i in ${MULTILIB_PREFIX_LIST} ; do
|
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,")
|
ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
|
||||||
archvar=ml_archs
|
archvar=ml_archs
|
||||||
manifest=install_multilib.manifest
|
manifest=install_multilib.manifest
|
||||||
|
@ -240,7 +240,7 @@ package_install_internal_rpm () {
|
||||||
ml_prefix=`echo ${pkg} | cut -d'-' -f1`
|
ml_prefix=`echo ${pkg} | cut -d'-' -f1`
|
||||||
ml_pkg=$pkg
|
ml_pkg=$pkg
|
||||||
for i in ${MULTILIB_PREFIX_LIST} ; do
|
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,")
|
ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
|
||||||
archvar=ml_archs
|
archvar=ml_archs
|
||||||
manifest=install_multilib.manifest
|
manifest=install_multilib.manifest
|
||||||
|
@ -276,7 +276,7 @@ package_install_internal_rpm () {
|
||||||
ml_prefix=`echo ${pkg} | cut -d'-' -f1`
|
ml_prefix=`echo ${pkg} | cut -d'-' -f1`
|
||||||
ml_pkg=$pkg
|
ml_pkg=$pkg
|
||||||
for i in ${MULTILIB_PREFIX_LIST} ; do
|
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,")
|
ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
|
||||||
archvar=ml_archs
|
archvar=ml_archs
|
||||||
break
|
break
|
||||||
|
|
Loading…
Reference in New Issue