mirror of
https://github.com/servo/servo.git
synced 2025-07-03 13:33:39 +01:00
Auto merge of #23324 - marcinwiacek:ubuntu1904, r=jdm
Changes for Ubuntu/Ubuntu 19.04 in bootstrap.py Update handling Ubuntu distributions: 1. script correctly returns error when some version is/was not supported (checked with Ubuntu 19.04) 2. for Ubuntu 19.04 Disco Dingo there are correct packages installed Note: this is my commit to this project, please forgive any mistakes. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #___ (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because are updating bootstrap.py script <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23324) <!-- Reviewable:end -->
This commit is contained in:
commit
f821fc6533
1 changed files with 5 additions and 3 deletions
|
@ -124,7 +124,7 @@ def linux(context, force=False):
|
||||||
'ccache', 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel',
|
'ccache', 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel',
|
||||||
'gstreamer1-plugins-base-devel', 'gstreamer1-plugins-bad-free-devel', 'autoconf213']
|
'gstreamer1-plugins-base-devel', 'gstreamer1-plugins-bad-free-devel', 'autoconf213']
|
||||||
if context.distro == "Ubuntu":
|
if context.distro == "Ubuntu":
|
||||||
if context.distro_version == "17.04":
|
if context.distro_version in ["17.04", "19.04"]:
|
||||||
pkgs_apt += ["libssl-dev"]
|
pkgs_apt += ["libssl-dev"]
|
||||||
elif int(context.distro_version.split(".")[0]) < 17:
|
elif int(context.distro_version.split(".")[0]) < 17:
|
||||||
pkgs_apt += ["libssl-dev"]
|
pkgs_apt += ["libssl-dev"]
|
||||||
|
@ -384,14 +384,16 @@ def get_linux_distribution():
|
||||||
base_version = '10.10'
|
base_version = '10.10'
|
||||||
else:
|
else:
|
||||||
raise Exception('unsupported version of %s: %s' % (distro, version))
|
raise Exception('unsupported version of %s: %s' % (distro, version))
|
||||||
|
|
||||||
distro, version = 'Ubuntu', base_version
|
distro, version = 'Ubuntu', base_version
|
||||||
|
elif distro.lower() == 'ubuntu':
|
||||||
|
if version > '19.04':
|
||||||
|
raise Exception('unsupported version of %s: %s' % (distro, version))
|
||||||
|
# Fixme: we should allow checked/supported versions only
|
||||||
elif distro.lower() not in [
|
elif distro.lower() not in [
|
||||||
'centos',
|
'centos',
|
||||||
'centos linux',
|
'centos linux',
|
||||||
'debian',
|
'debian',
|
||||||
'fedora',
|
'fedora',
|
||||||
'ubuntu',
|
|
||||||
]:
|
]:
|
||||||
raise Exception('mach bootstrap does not support %s, please file a bug' % distro)
|
raise Exception('mach bootstrap does not support %s, please file a bug' % distro)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue