diff options
| -rw-r--r-- | config/deps/sugar-build.json | 4 | ||||
| -rw-r--r-- | config/packages/buildslave.json | 4 | ||||
| -rw-r--r-- | config/packages/deps-3.4.json | 6 | ||||
| -rw-r--r-- | config/packages/deps-3.6.json | 6 | ||||
| -rw-r--r-- | devbot/config.py | 2 |
5 files changed, 18 insertions, 4 deletions
diff --git a/config/deps/sugar-build.json b/config/deps/sugar-build.json index 557f644..be66df2 100644 --- a/config/deps/sugar-build.json +++ b/config/deps/sugar-build.json @@ -5,6 +5,10 @@ "checker": "gtkmodule" }, { "check": "xinit", "checker": "binary" }, + { "check": "xz", + "checker": "binary" }, + { "check": "scp", + "checker": "binary" }, { "check": "Xephyr", "checker": "binary" }, { "check": "dbus-launch", diff --git a/config/packages/buildslave.json b/config/packages/buildslave.json index eccbb9e..f215314 100644 --- a/config/packages/buildslave.json +++ b/config/packages/buildslave.json @@ -1,7 +1,5 @@ { "buildslave": { "fedora": ["buildbot"], "ubuntu": ["buildbot", - "buildbot-slave", - "openssh-client", - "xz-utils"] } + "buildbot-slave"] } } diff --git a/config/packages/deps-3.4.json b/config/packages/deps-3.4.json index 8db174a..310b2f2 100644 --- a/config/packages/deps-3.4.json +++ b/config/packages/deps-3.4.json @@ -55,6 +55,12 @@ "gtk+-3.0": { "fedora": "gtk3-devel", "ubuntu": "libgtk-3-dev" }, + "xz": + { "fedora": "xz", + "ubuntu": "xz-utils" }, + "ssh": + { "fedora": "openssh-clients", + "ubuntu": "openssh-client" }, "sm": { "fedora": "libSM-devel", "ubuntu": "libsm-dev" }, diff --git a/config/packages/deps-3.6.json b/config/packages/deps-3.6.json index 4c7ae12..dbbdc97 100644 --- a/config/packages/deps-3.6.json +++ b/config/packages/deps-3.6.json @@ -1,6 +1,12 @@ { "Xvfb": { "fedora": "xorg-x11-server-Xvfb", "ubuntu": "xvfb" }, + "xz": + { "fedora": "xz", + "ubuntu": "xz-utils" }, + "ssh": + { "fedora": "openssh-clients", + "ubuntu": "openssh-client" }, "sphinx-build": { "fedora": "python-sphinx", "ubuntu": "python-sphinx" }, diff --git a/devbot/config.py b/devbot/config.py index 07fc753..3b08b0c 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -67,7 +67,7 @@ def _get_real_install_dir(dir, relocatable): tmp_dir = os.path.dirname(install_dir) if not os.path.exists(tmp_dir): - os.mkdir(tmpdir) + os.mkdir(tmp_dir) if os.path.islink(install_dir): os.remove(install_dir) |