summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.16.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 85eb5fef1e..182818ee09 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -626,8 +626,9 @@ def multilib_rpmmacros(d):
626 localdata.delVar('TOOLCHAIN_OPTIONS') 626 localdata.delVar('TOOLCHAIN_OPTIONS')
627 627
628 # Set 'localdata' values to be consistent with 'd' values. 628 # Set 'localdata' values to be consistent with 'd' values.
629 localdata.setVar('distromacrodir', d.getVar('distromacrodir', True)) 629 distromacrodirVal = d.getVar('distromacrodir', True)
630 localdata.setVar('WORKDIR', d.getVar('WORKDIR', True)) 630 workdirVal = d.getVar('WORKDIR', True)
631 dval = d.getVar('D', True)
631 632
632 ret = gen_arch_macro(localdata) 633 ret = gen_arch_macro(localdata)
633 634
@@ -639,6 +640,9 @@ def multilib_rpmmacros(d):
639 localdata.setVar("OVERRIDES", overrides) 640 localdata.setVar("OVERRIDES", overrides)
640 localdata.setVar("MLPREFIX", item + "-") 641 localdata.setVar("MLPREFIX", item + "-")
641 bb.data.update_data(localdata) 642 bb.data.update_data(localdata)
643 localdata.setVar('WORKDIR', workdirVal)
644 localdata.setVar('distromacrodir', distromacrodirVal)
645 localdata.setVar('D', dval)
642 ret += gen_arch_macro(localdata) 646 ret += gen_arch_macro(localdata)
643 return ret 647 return ret
644 648