diff options
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 9f50764886..95e9455e5c 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
| @@ -200,14 +200,14 @@ install_all_locales() { | |||
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | python () { | 202 | python () { |
| 203 | if bb.data.getVar('BUILD_IMAGES_FROM_FEEDS', d, True): | 203 | if d.getVar('BUILD_IMAGES_FROM_FEEDS', True): |
| 204 | flags = bb.data.getVarFlag('do_rootfs', 'recrdeptask', d) | 204 | flags = d.getVarFlag('do_rootfs', 'recrdeptask') |
| 205 | flags = flags.replace("do_package_write_rpm", "") | 205 | flags = flags.replace("do_package_write_rpm", "") |
| 206 | flags = flags.replace("do_deploy", "") | 206 | flags = flags.replace("do_deploy", "") |
| 207 | flags = flags.replace("do_populate_sysroot", "") | 207 | flags = flags.replace("do_populate_sysroot", "") |
| 208 | bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d) | 208 | d.setVarFlag('do_rootfs', 'recrdeptask', flags) |
| 209 | bb.data.setVar('RPM_PREPROCESS_COMMANDS', '', d) | 209 | d.setVar('RPM_PREPROCESS_COMMANDS', '') |
| 210 | bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d) | 210 | d.setVar('RPM_POSTPROCESS_COMMANDS', '') |
| 211 | 211 | ||
| 212 | ml_package_archs = "" | 212 | ml_package_archs = "" |
| 213 | ml_prefix_list = "" | 213 | ml_prefix_list = "" |
| @@ -224,6 +224,6 @@ python () { | |||
| 224 | ml_package_archs += " " + package_archs | 224 | ml_package_archs += " " + package_archs |
| 225 | ml_prefix_list += " " + eext[1] | 225 | ml_prefix_list += " " + eext[1] |
| 226 | #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) | 226 | #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) |
| 227 | bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) | 227 | d.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs) |
| 228 | bb.data.setVar('MULTILIB_PREFIX_LIST', ml_prefix_list, d) | 228 | d.setVar('MULTILIB_PREFIX_LIST', ml_prefix_list) |
| 229 | } | 229 | } |