diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2014-09-08 12:58:26 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-10 11:33:22 +0100 |
| commit | d06839e7ddb51c83dfdf831e4473254b16be5f22 (patch) | |
| tree | 2b14119e76e66ef3f34bd83cf9ba83a6ae9b54c0 /meta/lib/oe/rootfs.py | |
| parent | 124ad8087026b7d9d7229a2e081ddba7bc96c779 (diff) | |
| download | poky-d06839e7ddb51c83dfdf831e4473254b16be5f22.tar.gz | |
package_manager.py: use RPM_PREFER_ELF_ARCH
Use RPM_PREFER_ELF_ARCH to instead of RPM_PREFER_COLOR as rpm upstream
suggested, and use "4" to instead of "3" since it is a bit mask (not
enumeration), so we need "4" here.
(From OE-Core rev: 8dcfa7143a6690455c3bd5772621f142f2d9e559)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
| -rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 0424a01aa5..3d8ae81e6f 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
| @@ -330,7 +330,7 @@ class RpmRootfs(Rootfs): | |||
| 330 | @staticmethod | 330 | @staticmethod |
| 331 | def _depends_list(): | 331 | def _depends_list(): |
| 332 | return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS', | 332 | return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS', |
| 333 | 'RPM_POSTPROCESS_COMMANDS', 'RPM_PREFER_COLOR'] | 333 | 'RPM_POSTPROCESS_COMMANDS', 'RPM_PREFER_ELF_ARCH'] |
| 334 | 334 | ||
| 335 | def _get_delayed_postinsts(self): | 335 | def _get_delayed_postinsts(self): |
| 336 | postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts") | 336 | postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts") |