From f0b2862ea82299cf4d00d4c62378f8443d62b975 Mon Sep 17 00:00:00 2001
From: Peter Surda <peter@bitmessage.at>
Date: Mon, 4 Mar 2024 08:00:03 +0800
Subject: [PATCH] Fix buildbot worker on older ubuntu

---
 bionic.user | 5 ++++-
 trusty.user | 7 +++++--
 xenial.user | 7 +++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bionic.user b/bionic.user
index a8e6c3e..1c001e8 100644
--- a/bionic.user
+++ b/bionic.user
@@ -9,6 +9,8 @@ packages:
   - wget
   - python3-wheel
   - pkg-config
+  - rustc
+  - cargo
 
 # apt
 apt:
@@ -101,7 +103,8 @@ ca_certs:
 
 # post boot
 runcmd:
-  - [ pip3, install, buildbot-worker, pyOpenSSL, setuptools_rust ]
+  - [ pip3, install, setuptools_rust ]
+  - [ pip3, install, buildbot-worker, pyOpenSSL ]
   - [ sudo, -u, buildbot, --, buildbot-worker, create-worker, 
     /var/lib/buildbot/workers/default, '--use-tls',
     'buildbot.bitmessage.org',
diff --git a/trusty.user b/trusty.user
index 629b354..bfd1fd7 100644
--- a/trusty.user
+++ b/trusty.user
@@ -14,6 +14,8 @@ packages:
   - python-virtualenv
   - python-wheel
   - pkg-config
+  - rustc
+  - cargo
 
 # root
 disable_root: false
@@ -112,8 +114,9 @@ write_files:
 
 # post boot
 runcmd:
-  - [ pip, install, buildbot-worker, pyOpenSSL, setuptools_rust ]
-  - [ sudo, -u, buildbot, --, buildslave, create-slave, 
+  - [ pip, install, setuptools_rust ]
+  - [ pip, install, buildbot-worker, pyOpenSSL ]
+  - [ sudo, -u, buildbot, --, buildslave, create-worker, 
     /var/lib/buildbot/slaves/default, '--use-tls',
     'buildbot.bitmessage.org',
     {{buildbot_username}}, {{buildbot_password}} ]
diff --git a/xenial.user b/xenial.user
index 59bf0e8..42baf5d 100644
--- a/xenial.user
+++ b/xenial.user
@@ -14,6 +14,8 @@ packages:
   - python-virtualenv
   - python-wheel
   - pkg-config
+  - rustc
+  - cargo
 
 # apt
 apt:
@@ -117,8 +119,9 @@ write_files:
 
 # post boot
 runcmd:
-  - [ pip, install, buildbot-worker, pyOpenSSL, setuptools_rust ]
-  - [ sudo, -u, buildbot, --, buildslave, create-slave, 
+  - [ pip, install, setuptools_rust ]
+  - [ pip, install, buildbot-worker, pyOpenSSL ]
+  - [ sudo, -u, buildbot, --, buildslave, create-worker, 
     /var/lib/buildbot/slaves/default, '--use-tls',
     'buildbot.bitmessage.org',
     {{buildbot_username}}, {{buildbot_password}} ]