diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index a87d091cd..049b2537d 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -724,15 +724,15 @@ class NopBuilder(BuilderBase): shutil.copytree(self.src_dir, self.inst_dir) -class OpenBCMBuilder(NopBuilder): - # OpenBCM libraries are stored with git LFS. As a result, fetcher fetches +class OpenNSABuilder(NopBuilder): + # OpenNSA libraries are stored with git LFS. As a result, fetcher fetches # LFS pointers and not the contents. Use git-lfs to pull the real contents # before copying to install dir using NoopBuilder. # In future, if more builders require git-lfs, we would consider installing # git-lfs as part of the sandcastle infra as against repeating similar # logic for each builder that requires git-lfs. def __init__(self, build_opts, ctx, manifest, src_dir, inst_dir): - super(OpenBCMBuilder, self).__init__( + super(OpenNSABuilder, self).__init__( build_opts, ctx, manifest, src_dir, inst_dir ) @@ -741,7 +741,7 @@ class OpenBCMBuilder(NopBuilder): self._run_cmd(["git", "lfs", "install", "--local"], cwd=self.src_dir, env=env) self._run_cmd(["git", "lfs", "pull"], cwd=self.src_dir, env=env) - super(OpenBCMBuilder, self).build(install_dirs, reconfigure) + super(OpenNSABuilder, self).build(install_dirs, reconfigure) class SqliteBuilder(BuilderBase): diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 94552fdf2..a898112ca 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -18,7 +18,7 @@ from .builder import ( MakeBuilder, NinjaBootstrap, NopBuilder, - OpenBCMBuilder, + OpenNSABuilder, OpenSSLBuilder, SqliteBuilder, ) @@ -425,8 +425,8 @@ class ManifestParser(object): build_options, ctx, self, src_dir, build_dir, inst_dir, build_doc ) - if builder == "OpenBCM": - return OpenBCMBuilder(build_options, ctx, self, src_dir, inst_dir) + if builder == "OpenNSA": + return OpenNSABuilder(build_options, ctx, self, src_dir, inst_dir) raise KeyError("project %s has no known builder" % (self.name)) diff --git a/build/fbcode_builder/manifests/OpenBCM b/build/fbcode_builder/manifests/OpenNSA similarity index 81% rename from build/fbcode_builder/manifests/OpenBCM rename to build/fbcode_builder/manifests/OpenNSA index fe4026b07..a75d4050f 100644 --- a/build/fbcode_builder/manifests/OpenBCM +++ b/build/fbcode_builder/manifests/OpenNSA @@ -1,11 +1,11 @@ [manifest] -name = OpenBCM +name = OpenNSA [git] -repo_url = https://github.com/Broadcom-Network-Switching-Software/OpenBCM.git +repo_url = https://github.com/Broadcom-Network-Switching-Software/OpenNSA.git [build.os=linux] -builder = OpenBCM +builder = OpenNSA [build.not(os=linux)] builder = nop