diff --git a/python/mozboot/mozboot/archlinux.py b/python/mozboot/mozboot/archlinux.py index bfed3fab845c..a415756a2609 100644 --- a/python/mozboot/mozboot/archlinux.py +++ b/python/mozboot/mozboot/archlinux.py @@ -27,7 +27,7 @@ AUR_URL_TEMPLATE = "https://aur.archlinux.org/cgit/aur.git/snapshot/{}.tar.gz" class ArchlinuxBootstrapper(LinuxBootstrapper, BaseBootstrapper): """Archlinux experimental bootstrapper.""" - SYSTEM_PACKAGES = ["base-devel", "unzip", "zip"] + SYSTEM_PACKAGES = ["base-devel", "unzip"] BROWSER_PACKAGES = [ "alsa-lib", diff --git a/python/mozboot/mozboot/debian.py b/python/mozboot/mozboot/debian.py index 489f06e7ded3..7b977c332103 100644 --- a/python/mozboot/mozboot/debian.py +++ b/python/mozboot/mozboot/debian.py @@ -20,7 +20,6 @@ class DebianBootstrapper(LinuxBootstrapper, BaseBootstrapper): "m4", "unzip", "uuid", - "zip", ] # These are common packages for building Firefox for Desktop diff --git a/python/mozboot/mozboot/freebsd.py b/python/mozboot/mozboot/freebsd.py index 7d36a6f16e98..3e481ec12ceb 100644 --- a/python/mozboot/mozboot/freebsd.py +++ b/python/mozboot/mozboot/freebsd.py @@ -23,7 +23,6 @@ class FreeBSDBootstrapper(BaseBootstrapper): "py%d%d-sqlite3" % sys.version_info[0:2], "rust", "watchman", - "zip", ] self.browser_packages = [ diff --git a/python/mozboot/mozboot/gentoo.py b/python/mozboot/mozboot/gentoo.py index 0045c4293dea..bcf36fac81e4 100644 --- a/python/mozboot/mozboot/gentoo.py +++ b/python/mozboot/mozboot/gentoo.py @@ -19,9 +19,7 @@ class GentooBootstrapper(LinuxBootstrapper, BaseBootstrapper): self.ensure_system_packages() def ensure_system_packages(self): - self.run_as_root( - ["emerge", "--noreplace", "--quiet", "app-arch/zip", "dev-util/watchman"] - ) + self.run_as_root(["emerge", "--noreplace", "--quiet", "dev-util/watchman"]) def install_browser_packages(self, mozconfig_builder, artifact_mode=False): # TODO: Figure out what not to install for artifact mode diff --git a/python/mozboot/mozboot/openbsd.py b/python/mozboot/mozboot/openbsd.py index b72841a9dc0f..c99c2e7d4e71 100644 --- a/python/mozboot/mozboot/openbsd.py +++ b/python/mozboot/mozboot/openbsd.py @@ -11,7 +11,7 @@ class OpenBSDBootstrapper(BaseBootstrapper): def __init__(self, version, **kwargs): BaseBootstrapper.__init__(self, **kwargs) - self.packages = ["gmake", "gtar", "rust", "unzip", "zip"] + self.packages = ["gmake", "gtar", "rust", "unzip"] self.browser_packages = ["llvm", "nasm", "gtk+3", "dbus-glib", "pulseaudio"] diff --git a/python/mozboot/mozboot/solus.py b/python/mozboot/mozboot/solus.py index a73521ed1e9c..bd84784c9360 100644 --- a/python/mozboot/mozboot/solus.py +++ b/python/mozboot/mozboot/solus.py @@ -20,7 +20,7 @@ if sys.version_info < (3,): class SolusBootstrapper(LinuxBootstrapper, BaseBootstrapper): """Solus experimental bootstrapper.""" - SYSTEM_PACKAGES = ["unzip", "zip"] + SYSTEM_PACKAGES = ["unzip"] SYSTEM_COMPONENTS = ["system.devel"] BROWSER_PACKAGES = [ diff --git a/python/mozboot/mozboot/void.py b/python/mozboot/mozboot/void.py index 89bd5533bac9..61768070d6a3 100644 --- a/python/mozboot/mozboot/void.py +++ b/python/mozboot/mozboot/void.py @@ -14,7 +14,7 @@ from mozboot.linux_common import LinuxBootstrapper class VoidBootstrapper(LinuxBootstrapper, BaseBootstrapper): - PACKAGES = ["clang", "make", "mercurial", "watchman", "unzip", "zip"] + PACKAGES = ["clang", "make", "mercurial", "watchman", "unzip"] BROWSER_PACKAGES = [ "dbus-devel", diff --git a/python/mozboot/mozboot/windows.py b/python/mozboot/mozboot/windows.py index 3f560d5236c6..1312874db35f 100644 --- a/python/mozboot/mozboot/windows.py +++ b/python/mozboot/mozboot/windows.py @@ -50,7 +50,6 @@ class WindowsBootstrapper(BaseBootstrapper): "patchutils", "diffutils", "tar", - "zip", "unzip", "mingw-w64-x86_64-toolchain", # TODO: Remove when Mercurial is installable from a wheel. "mingw-w64-i686-toolchain",