diff options
-rw-r--r-- | meta/lib/oe/package_manager.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 5a189cff97..60d6e52a58 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -550,12 +550,19 @@ class RpmPM(PackageManager): | |||
550 | bb.utils.mkdirhier(oe.path.join(self.target_rootfs, "etc", "yum.repos.d")) | 550 | bb.utils.mkdirhier(oe.path.join(self.target_rootfs, "etc", "yum.repos.d")) |
551 | remote_uris = self.construct_uris(feed_uris.split(), feed_base_paths.split()) | 551 | remote_uris = self.construct_uris(feed_uris.split(), feed_base_paths.split()) |
552 | for uri in remote_uris: | 552 | for uri in remote_uris: |
553 | repo_name = "oe-remote-repo" + "-".join(urlparse(uri).path.split("/")) | 553 | repo_base = "oe-remote-repo" + "-".join(urlparse(uri).path.split("/")) |
554 | if feed_archs is not None: | 554 | if feed_archs is not None: |
555 | repo_uris = [uri + "/" + arch for arch in feed_archs.split()] | 555 | for arch in feed_archs.split(): |
556 | repo_uri = uri + "/" + arch | ||
557 | repo_id = "oe-remote-repo" + "-".join(urlparse(repo_uri).path.split("/")) | ||
558 | repo_name = "OE Remote Repo:" + " ".join(urlparse(repo_uri).path.split("/")) | ||
559 | open(oe.path.join(self.target_rootfs, "etc", "yum.repos.d", repo_base + ".repo"), 'a').write( | ||
560 | "[%s]\nname=%s\nbaseurl=%s\n\n" % (repo_id, repo_name, repo_uri)) | ||
556 | else: | 561 | else: |
557 | repo_uris = [uri] | 562 | repo_name = "OE Remote Repo:" + " ".join(urlparse(uri).path.split("/")) |
558 | open(oe.path.join(self.target_rootfs, "etc", "yum.repos.d", repo_name + ".repo"), 'w').write("[%s]\nname=%s\nbaseurl=%s\n" % (repo_name, repo_name, " ".join(repo_uris))) | 563 | repo_uri = uri |
564 | open(oe.path.join(self.target_rootfs, "etc", "yum.repos.d", repo_base + ".repo"), 'w').write( | ||
565 | "[%s]\nname=%s\nbaseurl=%s\n" % (repo_base, repo_name, repo_uri)) | ||
559 | 566 | ||
560 | def _prepare_pkg_transaction(self): | 567 | def _prepare_pkg_transaction(self): |
561 | os.environ['D'] = self.target_rootfs | 568 | os.environ['D'] = self.target_rootfs |