Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-04 07:35:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Install tshark for automated tests in #36033 (#36201)

Browse source 
Signed-off-by: Delan Azabani <dazabani@igalia.com>
This commit is contained in:
Delan Azabani 2025-03-28 17:43:03 +08:00 • committed by GitHub
parent a2b46cf6e6
commit 4814e7f742
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
python/servo/platform/linux.py
View file

@ -15,15 +15,15 @@ from typing import Optional, Tuple
from .base import Base from .base import Base
from .build_target import BuildTarget from .build_target import BuildTarget
# Please keep these in sync with the packages on the wiki, using the instructions below # Please keep these in sync with the packages in the book, using the instructions below
# https://github.com/servo/servo/wiki/Building # https://book.servo.org/hacking/setting-up-your-environment.html
# https://packages.debian.org # https://packages.debian.org
# https://packages.ubuntu.com # https://packages.ubuntu.com
# 1. open devtools # 1. open devtools
# 2. paste in the whole APT_PKGS = [...] # 2. paste in the whole APT_PKGS = [...]
# 3. copy(`sudo apt install ${APT_PKGS.join(" ")}`) # 3. copy(`sudo apt install ${APT_PKGS.join(" ")}`)
# 4. paste into https://github.com/servo/servo/wiki/Building#debian-based-distributions # 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md
APT_PKGS = [ APT_PKGS = [
'build-essential', 'ccache', 'clang', 'cmake', 'curl', 'g++', 'git', 'build-essential', 'ccache', 'clang', 'cmake', 'curl', 'g++', 'git',
'gperf', 'libdbus-1-dev', 'libfreetype6-dev', 'libgl1-mesa-dri', 'gperf', 'libdbus-1-dev', 'libfreetype6-dev', 'libgl1-mesa-dri',
@ -39,14 +39,15 @@ APT_PKGS = [
'libharfbuzz-dev', 'liblzma-dev', 'libudev-dev', 'libunwind-dev', 'libharfbuzz-dev', 'liblzma-dev', 'libudev-dev', 'libunwind-dev',
'libvulkan1', 'libx11-dev', 'libxcb-render0-dev', 'libxcb-shape0-dev', 'libvulkan1', 'libx11-dev', 'libxcb-render0-dev', 'libxcb-shape0-dev',
'libxcb-xfixes0-dev', 'libxmu-dev', 'libxmu6', 'libegl1-mesa-dev', 'libxcb-xfixes0-dev', 'libxmu-dev', 'libxmu6', 'libegl1-mesa-dev',
'llvm-dev', 'm4', 'xorg-dev', 'libxkbcommon0', "libxkbcommon-x11-0" 'llvm-dev', 'm4', 'xorg-dev', 'libxkbcommon0', "libxkbcommon-x11-0",
'tshark',
] ]
# https://packages.fedoraproject.org # https://packages.fedoraproject.org
# 1. open devtools # 1. open devtools
# 2. paste in the whole DNF_PKGS = [...] # 2. paste in the whole DNF_PKGS = [...]
# 3. copy(`sudo dnf install ${DNF_PKGS.join(" ")}`) # 3. copy(`sudo dnf install ${DNF_PKGS.join(" ")}`)
# 4. paste into https://github.com/servo/servo/wiki/Building#fedora # 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md
DNF_PKGS = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel', DNF_PKGS = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel',
'libunwind-devel', 'mesa-libGL-devel', 'mesa-libEGL-devel', 'libunwind-devel', 'mesa-libGL-devel', 'mesa-libEGL-devel',
'glib2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf', 'glib2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf',
@ -58,13 +59,13 @@ DNF_PKGS = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel',
'gstreamer1-plugins-good', 'gstreamer1-plugins-bad-free-devel', 'gstreamer1-plugins-good', 'gstreamer1-plugins-bad-free-devel',
'gstreamer1-plugins-ugly-free', 'libjpeg-turbo-devel', 'gstreamer1-plugins-ugly-free', 'libjpeg-turbo-devel',
'zlib-ng', 'libjpeg-turbo', 'vulkan-loader', 'libxkbcommon', 'zlib-ng', 'libjpeg-turbo', 'vulkan-loader', 'libxkbcommon',
'libxkbcommon-x11'] 'libxkbcommon-x11', 'wireshark-cli']
# https://voidlinux.org/packages/ # https://voidlinux.org/packages/
# 1. open devtools # 1. open devtools
# 2. paste in the whole XBPS_PKGS = [...] # 2. paste in the whole XBPS_PKGS = [...]
# 3. copy(`sudo xbps-install ${XBPS_PKGS.join(" ")}`) # 3. copy(`sudo xbps-install ${XBPS_PKGS.join(" ")}`)
# 4. paste into https://github.com/servo/servo/wiki/Building#void-linux # 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md
XBPS_PKGS = ['libtool', 'gcc', 'libXi-devel', 'freetype-devel', XBPS_PKGS = ['libtool', 'gcc', 'libXi-devel', 'freetype-devel',
'libunwind-devel', 'MesaLib-devel', 'glib-devel', 'pkg-config', 'libunwind-devel', 'MesaLib-devel', 'glib-devel', 'pkg-config',
'libX11-devel', 'libXrandr-devel', 'gperf', 'bzip2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf', 'bzip2-devel',

1
shell.nix
View file

@ -81,6 +81,7 @@ stdenv.mkDerivation (androidEnvironment // {
llvmPackages.bintools # provides lld llvmPackages.bintools # provides lld
udev # Needed by libudev-sys for GamePad API. udev # Needed by libudev-sys for GamePad API.
wireshark-cli # for `tshark` in etc/devtools_parser.py
# Build utilities # Build utilities
cmake dbus gcc git pkg-config which llvm perl yasm m4 cmake dbus gcc git pkg-config which llvm perl yasm m4