diff options
| author | Andrew Morrow <andrew.morrow@10gen.com> | 2020-01-15 19:51:39 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2020-01-15 19:51:39 +0000 |
| commit | 3c0c136ecf80d60f512e96b9720af3845f401fd8 (patch) | |
| tree | e8981c04b760b03bb623b2cfaf31d48ba84bc9a7 /buildscripts | |
| parent | c9dbf657e1ef0fdda8a32d1080d4a7c3bb361c5e (diff) | |
| download | mongo-3c0c136ecf80d60f512e96b9720af3845f401fd8.tar.gz | |
SERVER-44763 Remove gotools from build and packaging
Diffstat (limited to 'buildscripts')
| -rwxr-xr-x | buildscripts/packager.py | 7 | ||||
| -rwxr-xr-x | buildscripts/packager_enterprise.py | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/buildscripts/packager.py b/buildscripts/packager.py index defeb191af1..53ae83c6c10 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -491,7 +491,7 @@ def unpack_binaries_into(build_os, arch, spec, where): try: sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)]) release_dir = glob('mongodb-linux-*')[0] - for releasefile in "bin", "LICENSE-Community.txt", "README", "THIRD-PARTY-NOTICES", "THIRD-PARTY-NOTICES.gotools", "MPL-2": + for releasefile in "bin", "LICENSE-Community.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2": print("moving file: %s/%s" % (release_dir, releasefile)) os.rename("%s/%s" % (release_dir, releasefile), releasefile) os.rmdir(release_dir) @@ -524,10 +524,7 @@ def make_package(distro, build_os, arch, spec, srcdir): # packaging infrastructure will move the files to wherever they # need to go. unpack_binaries_into(build_os, arch, spec, sdir) - # Remove the mongoreplay binary due to libpcap dynamic - # linkage. - if os.path.exists(sdir + "bin/mongoreplay"): - os.unlink(sdir + "bin/mongoreplay") + return distro.make_pkg(build_os, arch, spec, srcdir) diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py index a8ebbd06286..ab484114a8d 100755 --- a/buildscripts/packager_enterprise.py +++ b/buildscripts/packager_enterprise.py @@ -220,7 +220,7 @@ def unpack_binaries_into(build_os, arch, spec, where): try: packager.sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)]) release_dir = glob('mongodb-linux-*')[0] - for releasefile in "bin", "snmp", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "THIRD-PARTY-NOTICES.gotools", "MPL-2": + for releasefile in "bin", "snmp", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2": os.rename("%s/%s" % (release_dir, releasefile), releasefile) os.rmdir(release_dir) except Exception: @@ -253,10 +253,7 @@ def make_package(distro, build_os, arch, spec, srcdir): # packaging infrastructure will move the files to wherever they # need to go. unpack_binaries_into(build_os, arch, spec, sdir) - # Remove the mongoreplay binary due to libpcap dynamic - # linkage. - if os.path.exists(sdir + "bin/mongoreplay"): - os.unlink(sdir + "bin/mongoreplay") + return distro.make_pkg(build_os, arch, spec, srcdir) |