diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 53b4700cdd..43a825ad42 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -300,13 +300,13 @@ python write_specfile () { | |||
300 | srccustomtagschunk = get_package_additional_metadata("rpm", localdata) | 300 | srccustomtagschunk = get_package_additional_metadata("rpm", localdata) |
301 | 301 | ||
302 | srcdepends = d.getVar('DEPENDS') | 302 | srcdepends = d.getVar('DEPENDS') |
303 | srcrdepends = [] | 303 | srcrdepends = "" |
304 | srcrrecommends = [] | 304 | srcrrecommends = "" |
305 | srcrsuggests = [] | 305 | srcrsuggests = "" |
306 | srcrprovides = [] | 306 | srcrprovides = "" |
307 | srcrreplaces = [] | 307 | srcrreplaces = "" |
308 | srcrconflicts = [] | 308 | srcrconflicts = "" |
309 | srcrobsoletes = [] | 309 | srcrobsoletes = "" |
310 | 310 | ||
311 | srcrpreinst = [] | 311 | srcrpreinst = [] |
312 | srcrpostinst = [] | 312 | srcrpostinst = [] |
@@ -365,13 +365,13 @@ python write_specfile () { | |||
365 | # Map the dependencies into their final form | 365 | # Map the dependencies into their final form |
366 | mapping_rename_hook(localdata) | 366 | mapping_rename_hook(localdata) |
367 | 367 | ||
368 | splitrdepends = localdata.getVar('RDEPENDS') | 368 | splitrdepends = localdata.getVar('RDEPENDS') or "" |
369 | splitrrecommends = localdata.getVar('RRECOMMENDS') | 369 | splitrrecommends = localdata.getVar('RRECOMMENDS') or "" |
370 | splitrsuggests = localdata.getVar('RSUGGESTS') | 370 | splitrsuggests = localdata.getVar('RSUGGESTS') or "" |
371 | splitrprovides = localdata.getVar('RPROVIDES') | 371 | splitrprovides = localdata.getVar('RPROVIDES') or "" |
372 | splitrreplaces = localdata.getVar('RREPLACES') | 372 | splitrreplaces = localdata.getVar('RREPLACES') or "" |
373 | splitrconflicts = localdata.getVar('RCONFLICTS') | 373 | splitrconflicts = localdata.getVar('RCONFLICTS') or "" |
374 | splitrobsoletes = [] | 374 | splitrobsoletes = "" |
375 | 375 | ||
376 | splitrpreinst = localdata.getVar('pkg_preinst') | 376 | splitrpreinst = localdata.getVar('pkg_preinst') |
377 | splitrpostinst = localdata.getVar('pkg_postinst') | 377 | splitrpostinst = localdata.getVar('pkg_postinst') |
@@ -439,9 +439,9 @@ python write_specfile () { | |||
439 | spec_preamble_bottom.append(splitcustomtagschunk) | 439 | spec_preamble_bottom.append(splitcustomtagschunk) |
440 | 440 | ||
441 | # Replaces == Obsoletes && Provides | 441 | # Replaces == Obsoletes && Provides |
442 | robsoletes = bb.utils.explode_dep_versions2(splitrobsoletes or "") | 442 | robsoletes = bb.utils.explode_dep_versions2(splitrobsoletes) |
443 | rprovides = bb.utils.explode_dep_versions2(splitrprovides or "") | 443 | rprovides = bb.utils.explode_dep_versions2(splitrprovides) |
444 | rreplaces = bb.utils.explode_dep_versions2(splitrreplaces or "") | 444 | rreplaces = bb.utils.explode_dep_versions2(splitrreplaces) |
445 | for dep in rreplaces: | 445 | for dep in rreplaces: |
446 | if not dep in robsoletes: | 446 | if not dep in robsoletes: |
447 | robsoletes[dep] = rreplaces[dep] | 447 | robsoletes[dep] = rreplaces[dep] |
@@ -533,9 +533,9 @@ python write_specfile () { | |||
533 | tail_source(d) | 533 | tail_source(d) |
534 | 534 | ||
535 | # Replaces == Obsoletes && Provides | 535 | # Replaces == Obsoletes && Provides |
536 | robsoletes = bb.utils.explode_dep_versions2(srcrobsoletes or "") | 536 | robsoletes = bb.utils.explode_dep_versions2(srcrobsoletes) |
537 | rprovides = bb.utils.explode_dep_versions2(srcrprovides or "") | 537 | rprovides = bb.utils.explode_dep_versions2(srcrprovides) |
538 | rreplaces = bb.utils.explode_dep_versions2(srcrreplaces or "") | 538 | rreplaces = bb.utils.explode_dep_versions2(srcrreplaces) |
539 | for dep in rreplaces: | 539 | for dep in rreplaces: |
540 | if not dep in robsoletes: | 540 | if not dep in robsoletes: |
541 | robsoletes[dep] = rreplaces[dep] | 541 | robsoletes[dep] = rreplaces[dep] |