diff options
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 7936d77b96..5ac6bcadfe 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -58,6 +58,7 @@ fakeroot rootfs_rpm_do_rootfs () { | |||
58 | export INSTALL_PLATFORM_RPM="${TARGET_ARCH}" | 58 | export INSTALL_PLATFORM_RPM="${TARGET_ARCH}" |
59 | export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" | 59 | export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" |
60 | export INSTALL_PACKAGES_NORMAL_RPM="${PACKAGE_INSTALL}" | 60 | export INSTALL_PACKAGES_NORMAL_RPM="${PACKAGE_INSTALL}" |
61 | export INSTALL_PACKAGES_MULTILIB_RPM="${MULTILIB_PACKAGE_INSTALL}" | ||
61 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${PACKAGE_INSTALL_ATTEMPTONLY}" | 62 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${PACKAGE_INSTALL_ATTEMPTONLY}" |
62 | export INSTALL_PACKAGES_LINGUAS_RPM="${LINGUAS_INSTALL}" | 63 | export INSTALL_PACKAGES_LINGUAS_RPM="${LINGUAS_INSTALL}" |
63 | export INSTALL_PROVIDENAME_RPM="" | 64 | export INSTALL_PROVIDENAME_RPM="" |
@@ -210,6 +211,7 @@ python () { | |||
210 | bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d) | 211 | bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d) |
211 | 212 | ||
212 | ml_package_archs = "" | 213 | ml_package_archs = "" |
214 | ml_prefix_list = "" | ||
213 | multilibs = d.getVar('MULTILIBS', True) or "" | 215 | multilibs = d.getVar('MULTILIBS', True) or "" |
214 | for ext in multilibs.split(): | 216 | for ext in multilibs.split(): |
215 | eext = ext.split(':') | 217 | eext = ext.split(':') |
@@ -221,6 +223,8 @@ python () { | |||
221 | localdata.setVar("MACHINE_ARCH", eext[1] + "_" + localdata.getVar("MACHINE_ARCH", False)) | 223 | localdata.setVar("MACHINE_ARCH", eext[1] + "_" + localdata.getVar("MACHINE_ARCH", False)) |
222 | package_archs = localdata.getVar("PACKAGE_ARCHS", True) or "" | 224 | package_archs = localdata.getVar("PACKAGE_ARCHS", True) or "" |
223 | ml_package_archs += " " + package_archs | 225 | ml_package_archs += " " + package_archs |
226 | ml_prefix_list += " " + eext[1] | ||
224 | #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) | 227 | #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) |
225 | bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) | 228 | bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) |
229 | bb.data.setVar('MULTILIB_PREFIX_LIST', ml_prefix_list, d) | ||
226 | } | 230 | } |