summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass18
1 files changed, 9 insertions, 9 deletions
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() {
87 shift 87 shift
88 88
89 printf "_solve_dbpath " > ${rpmconf_base}.macro 89 printf "_solve_dbpath " > ${rpmconf_base}.macro
90 o_colon=false 90 o_colon="false"
91 91
92 for archvar in "$@"; do 92 for archvar in "$@"; do
93 printf "_solve_dbpath " > ${rpmconf_base}-${archvar}.macro 93 printf "_solve_dbpath " > ${rpmconf_base}-${archvar}.macro
94 colon=false 94 colon="false"
95 for each in `cat ${rpmconf_base}-${archvar}.conf` ; do 95 for each in `cat ${rpmconf_base}-${archvar}.conf` ; do
96 if [ "$o_colon" == true ]; then 96 if [ "$o_colon" = "true" ]; then
97 printf ":" >> ${rpmconf_base}.macro 97 printf ":" >> ${rpmconf_base}.macro
98 fi 98 fi
99 if [ "$colon" == true ]; then 99 if [ "$colon" = "true" ]; then
100 printf ":" >> ${rpmconf_base}-${archvar}.macro 100 printf ":" >> ${rpmconf_base}-${archvar}.macro
101 fi 101 fi
102 printf "%s" $each >> ${rpmconf_base}.macro 102 printf "%s" $each >> ${rpmconf_base}.macro
103 o_colon=true 103 o_colon="true"
104 printf "%s" $each >> ${rpmconf_base}-${archvar}.macro 104 printf "%s" $each >> ${rpmconf_base}-${archvar}.macro
105 colon=true 105 colon="true"
106 done 106 done
107 printf "\n" >> ${rpmconf_base}-${archvar}.macro 107 printf "\n" >> ${rpmconf_base}-${archvar}.macro
108 done 108 done
@@ -214,7 +214,7 @@ package_install_internal_rpm () {
214 ml_prefix=`echo ${pkg} | cut -d'-' -f1` 214 ml_prefix=`echo ${pkg} | cut -d'-' -f1`
215 ml_pkg=$pkg 215 ml_pkg=$pkg
216 for i in ${MULTILIB_PREFIX_LIST} ; do 216 for i in ${MULTILIB_PREFIX_LIST} ; do
217 if [ ${ml_prefix} == ${i} ]; then 217 if [ ${ml_prefix} = ${i} ]; then
218 ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,") 218 ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
219 archvar=ml_archs 219 archvar=ml_archs
220 manifest=install_multilib.manifest 220 manifest=install_multilib.manifest
@@ -240,7 +240,7 @@ package_install_internal_rpm () {
240 ml_prefix=`echo ${pkg} | cut -d'-' -f1` 240 ml_prefix=`echo ${pkg} | cut -d'-' -f1`
241 ml_pkg=$pkg 241 ml_pkg=$pkg
242 for i in ${MULTILIB_PREFIX_LIST} ; do 242 for i in ${MULTILIB_PREFIX_LIST} ; do
243 if [ ${ml_prefix} == ${i} ]; then 243 if [ ${ml_prefix} = ${i} ]; then
244 ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,") 244 ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
245 archvar=ml_archs 245 archvar=ml_archs
246 manifest=install_multilib.manifest 246 manifest=install_multilib.manifest
@@ -276,7 +276,7 @@ package_install_internal_rpm () {
276 ml_prefix=`echo ${pkg} | cut -d'-' -f1` 276 ml_prefix=`echo ${pkg} | cut -d'-' -f1`
277 ml_pkg=$pkg 277 ml_pkg=$pkg
278 for i in ${MULTILIB_PREFIX_LIST} ; do 278 for i in ${MULTILIB_PREFIX_LIST} ; do
279 if [ ${ml_prefix} == ${i} ]; then 279 if [ ${ml_prefix} = ${i} ]; then
280 ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,") 280 ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
281 archvar=ml_archs 281 archvar=ml_archs
282 break 282 break