Commit 044b037f authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 17472155 - Stop bootstrapping node/npm from Linux distro packages.... 

Bug 17472155 - Stop bootstrapping node/npm from Linux distro packages. r=firefox-build-system-reviewers,andi

We install it via a toolchain artifact anyways, if not via mach
bootstrap, via configure's autobootstrap.

Differential Revision: https://phabricator.services.mozilla.com/D134488
parent 40cad9af

python/mozboot/mozboot/archlinux.py

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,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", "nodejs", "unzip", "zip"]

    SYSTEM_PACKAGES = ["base-devel", "unzip", "zip"]



    BROWSER_PACKAGES = [

        "alsa-lib",

python/mozboot/mozboot/centosfedora.py

+2 −6
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ class CentOSFedoraBootstrapper(LinuxBootstrapper, BaseBootstrapper): 


        self.group_packages = []



        # For CentOS 7, later versions of nodejs come from nodesource

        # and include the npm package.

        self.packages = ["nodejs", "which"]

        self.packages = ["which"]



        self.browser_group_packages = ["GNOME Software Development"]
@@ -50,8 +48,6 @@ class CentOSFedoraBootstrapper(LinuxBootstrapper, BaseBootstrapper): 
                    "GNOME Software Development",

                ]



                self.packages += ["npm"]



            else:

                self.packages += ["redhat-rpm-config"]
@@ -60,7 +56,7 @@ class CentOSFedoraBootstrapper(LinuxBootstrapper, BaseBootstrapper): 
        elif self.distro == "fedora":

            self.group_packages += ["C Development Tools and Libraries"]



            self.packages += ["npm", "redhat-rpm-config"]

            self.packages += ["redhat-rpm-config"]

            if self.version >= 33:

                self.packages.append("perl-FindBin")

python/mozboot/mozboot/debian.py

+0 −9
Original line number Diff line number Diff line
@@ -34,18 +34,11 @@ class DebianBootstrapper(LinuxBootstrapper, BaseBootstrapper): 
        "build-essential",

        "libpython3-dev",

        "m4",

        "nodejs",

        "unzip",

        "uuid",

        "zip",

    ]



    # Ubuntu and Debian don't often differ, but they do for npm.

    DEBIAN_PACKAGES = [

        # Comment the npm package until Debian bring it back

        # 'npm'

    ]



    # These are common packages for building Firefox for Desktop

    # (browser) for all Debian-derived distros (such as Ubuntu).

    BROWSER_COMMON_PACKAGES = [
@@ -76,8 +69,6 @@ class DebianBootstrapper(LinuxBootstrapper, BaseBootstrapper): 
        self.codename = codename



        self.packages = list(self.COMMON_PACKAGES)

        if self.distro == "debian":

            self.packages += self.DEBIAN_PACKAGES



    def suggest_install_distutils(self):

        print(

python/mozboot/mozboot/opensuse.py

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ class OpenSUSEBootstrapper(LinuxBootstrapper, BaseBootstrapper): 
    """openSUSE experimental bootstrapper."""



    SYSTEM_PACKAGES = [

        "nodejs",

        "npm",

        "which",

        "rpmconf",

        "libcurl-devel",

python/mozboot/mozboot/solus.py

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ if sys.version_info < (3,): 
class SolusBootstrapper(LinuxBootstrapper, BaseBootstrapper):

    """Solus experimental bootstrapper."""



    SYSTEM_PACKAGES = ["nodejs", "unzip", "zip"]

    SYSTEM_PACKAGES = ["unzip", "zip"]

    SYSTEM_COMPONENTS = ["system.devel"]



    BROWSER_PACKAGES = [