diff options
| author | Chad Smith <chad.smith@canonical.com> | 2021-07-12 16:37:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 16:37:34 -0600 |
| commit | a185f31911dfc58662eb1eb5d39a9ab3ed178ff5 (patch) | |
| tree | 0d2acbc57a6778dece35b90ee70129cf579be310 /tools/read-dependencies | |
| parent | 9b52405c6f0de5e00d5ee9c1d13540425d8f6bf5 (diff) | |
| download | vyos-cloud-init-a185f31911dfc58662eb1eb5d39a9ab3ed178ff5.tar.gz vyos-cloud-init-a185f31911dfc58662eb1eb5d39a9ab3ed178ff5.zip | |
tools: add support for building rpms on rocky linux (#940)
Diffstat (limited to 'tools/read-dependencies')
| -rwxr-xr-x | tools/read-dependencies | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/read-dependencies b/tools/read-dependencies index 6ad5f701..a2577e87 100755 --- a/tools/read-dependencies +++ b/tools/read-dependencies @@ -23,6 +23,7 @@ DEFAULT_REQUIREMENTS = 'requirements.txt' # Map the appropriate package dir needed for each distro choice DISTRO_PKG_TYPE_MAP = { 'centos': 'redhat', + 'rocky': 'redhat', 'redhat': 'redhat', 'debian': 'debian', 'ubuntu': 'debian', @@ -64,11 +65,13 @@ ZYPPER_INSTALL = [ '--auto-agree-with-licenses'] DRY_DISTRO_INSTALL_PKG_CMD = { + 'rocky': ['yum', 'install', '--assumeyes'], 'centos': ['yum', 'install', '--assumeyes'], 'redhat': ['yum', 'install', '--assumeyes'], } DISTRO_INSTALL_PKG_CMD = { + 'rocky': MAYBE_RELIABLE_YUM_INSTALL, 'centos': MAYBE_RELIABLE_YUM_INSTALL, 'redhat': MAYBE_RELIABLE_YUM_INSTALL, 'debian': ['apt', 'install', '-y'], @@ -273,10 +276,10 @@ def pkg_install(pkg_list, distro, test_distro=False, dry_run=False): cmd = DRY_DISTRO_INSTALL_PKG_CMD[distro] install_cmd.extend(cmd) - if distro in ['centos', 'redhat']: + if distro in ['centos', 'redhat', 'rocky']: # CentOS and Redhat need epel-release to access oauthlib and jsonschema subprocess.check_call(install_cmd + ['epel-release']) - if distro in ['suse', 'opensuse', 'redhat', 'centos']: + if distro in ['suse', 'opensuse', 'redhat', 'rocky', 'centos']: pkg_list.append('rpm-build') subprocess.check_call(install_cmd + pkg_list) |