diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-21 23:17:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-05 15:13:47 +0100 |
commit | 0200ab2a22c9d068e307d6e088264b88b662c1ab (patch) | |
tree | 201193b66eff0ec27337a1d4b93b018d30a2ec1e /meta/lib/oe/package_manager.py | |
parent | 55049700e498e5300fcafc2d2ed4f70920ebfb1b (diff) | |
download | poky-0200ab2a22c9d068e307d6e088264b88b662c1ab.tar.gz |
lib/oe/package_manager/sdk: Ensure do_populate_sdk_ext and do_populate_sdk repos don't conflict
(From OE-Core rev: c9c0927bb6e71253cbdd5b6b780dca829526e1d8)
(From OE-Core rev: a18942b0b3b848ccfa4bc50c56a565c279da9d74)
(From OE-Core rev: 94e21cf21f8d8adad352ef2f94d4f75e36cd843a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[Fixup do to merge conflicts]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-rw-r--r-- | meta/lib/oe/package_manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index ede11b2e63..78d2421421 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -656,7 +656,8 @@ class RpmPM(PackageManager): | |||
656 | task_name='target', | 656 | task_name='target', |
657 | providename=None, | 657 | providename=None, |
658 | arch_var=None, | 658 | arch_var=None, |
659 | os_var=None): | 659 | os_var=None, |
660 | rpm_repo_workdir="oe-rootfs-repo"): | ||
660 | super(RpmPM, self).__init__(d) | 661 | super(RpmPM, self).__init__(d) |
661 | self.target_rootfs = target_rootfs | 662 | self.target_rootfs = target_rootfs |
662 | self.target_vendor = target_vendor | 663 | self.target_vendor = target_vendor |