mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SERVER-26841: fix rhel62 packages after regression

This commit is contained in:
Sam Kleinman 2016-11-02 10:51:28 -04:00
parent 64a44616e6
commit 17ffe1f8b3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buildscripts/packager.py
View File

@ -647,6 +647,7 @@ def make_rpm(distro, build_os, arch, spec, srcdir):
sdir=setupdir(distro, build_os, arch, spec) sdir=setupdir(distro, build_os, arch, spec)
specfile = srcdir + "rpm/mongodb%s.spec" % suffix specfile = srcdir + "rpm/mongodb%s.spec" % suffix
init_spec = specfile.replace(".spec", "-init.spec")
# The Debian directory is here for the manpages so we we need to remove the service file # The Debian directory is here for the manpages so we we need to remove the service file
# from it so that RPM packages don't end up with the Debian file. # from it so that RPM packages don't end up with the Debian file.
@ -662,13 +663,13 @@ def make_rpm(distro, build_os, arch, spec, srcdir):
os.link(sdir+"rpm/init.d-mongod.suse", sdir+"rpm/init.d-mongod") os.link(sdir+"rpm/init.d-mongod.suse", sdir+"rpm/init.d-mongod")
os.unlink(specfile) os.unlink(specfile)
os.link(specfile.replace(".spec", "-init.spec"), specfile) os.link(init_spec, specfile)
elif distro.name() == "rhel" and distro.repo_os_version(build_os) in ("5", "6"): elif distro.name() == "redhat" and distro.repo_os_version(build_os) in ("5", "6"):
os.unlink(specfile) os.unlink(specfile)
os.link(specfile.replace(".spec", "-init.spec"), specfile) os.link(init_spec, specfile)
elif distro.name() == "amazon": elif distro.name() == "amazon":
os.unlink(specfile) os.unlink(specfile)
os.link(specfile.replace(".spec", "-init.spec"), specfile) os.link(init_spec, specfile)
topdir=ensure_dir('%s/rpmbuild/%s/' % (os.getcwd(), build_os)) topdir=ensure_dir('%s/rpmbuild/%s/' % (os.getcwd(), build_os))
for subdir in ["BUILD", "RPMS", "SOURCES", "SPECS", "SRPMS"]: for subdir in ["BUILD", "RPMS", "SOURCES", "SPECS", "SRPMS"]: