diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2013-04-08 19:06:33 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-10 09:23:18 +0100 |
commit | 4330e152ab743b2df447221ee953b8a1f8990903 (patch) | |
tree | 5285d71fdbba0672a55e26fda182a77d6242533e /bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |
parent | f32d58076e969d43bf9ffb3592ed2788d1741da8 (diff) | |
download | poky-4330e152ab743b2df447221ee953b8a1f8990903.tar.gz |
bitbake: bitbake:hob: use a socks proxy mechanism for git
Instead of a custom git proxy mechanism, Hob now
uses a SOCKS proxy in order to work with external
repos via the oe-git-proxy helper script.
Fixes [YOCTO #4187]
(Bitbake rev: 0b81a2c4a5611b64dbdd40131730a82c149b94a2)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Cristian Iorga <ubik3000@gmail.com>
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/hobeventhandler.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index c33fb74100..d060bc0b42 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
@@ -367,9 +367,8 @@ class HobHandler(gobject.GObject): | |||
367 | def set_ftp_proxy(self, ftp_proxy): | 367 | def set_ftp_proxy(self, ftp_proxy): |
368 | self.runCommand(["setVariable", "ftp_proxy", ftp_proxy]) | 368 | self.runCommand(["setVariable", "ftp_proxy", ftp_proxy]) |
369 | 369 | ||
370 | def set_git_proxy(self, host, port): | 370 | def set_socks_proxy(self, socks_proxy): |
371 | self.runCommand(["setVariable", "GIT_PROXY_HOST", host]) | 371 | self.runCommand(["setVariable", "all_proxy", socks_proxy]) |
372 | self.runCommand(["setVariable", "GIT_PROXY_PORT", port]) | ||
373 | 372 | ||
374 | def set_cvs_proxy(self, host, port): | 373 | def set_cvs_proxy(self, host, port): |
375 | self.runCommand(["setVariable", "CVS_PROXY_HOST", host]) | 374 | self.runCommand(["setVariable", "CVS_PROXY_HOST", host]) |
@@ -565,9 +564,7 @@ class HobHandler(gobject.GObject): | |||
565 | 564 | ||
566 | params["default_task"] = self.runCommand(["getVariable", "BB_DEFAULT_TASK"]) or "build" | 565 | params["default_task"] = self.runCommand(["getVariable", "BB_DEFAULT_TASK"]) or "build" |
567 | 566 | ||
568 | params["git_proxy_host"] = self.runCommand(["getVariable", "GIT_PROXY_HOST"]) or "" | 567 | params["socks_proxy"] = self.runCommand(["getVariable", "all_proxy"]) or "" |
569 | params["git_proxy_port"] = self.runCommand(["getVariable", "GIT_PROXY_PORT"]) or "" | ||
570 | |||
571 | params["http_proxy"] = self.runCommand(["getVariable", "http_proxy"]) or "" | 568 | params["http_proxy"] = self.runCommand(["getVariable", "http_proxy"]) or "" |
572 | params["ftp_proxy"] = self.runCommand(["getVariable", "ftp_proxy"]) or "" | 569 | params["ftp_proxy"] = self.runCommand(["getVariable", "ftp_proxy"]) or "" |
573 | params["https_proxy"] = self.runCommand(["getVariable", "https_proxy"]) or "" | 570 | params["https_proxy"] = self.runCommand(["getVariable", "https_proxy"]) or "" |