IMPALA-5739: Correctly handle sles12 SP2 This takes care of the difference in outputs for SLES 12 SP1 and SP2. For reference here's the outputs in sles12sp1 and sp2:
sles12sp1 # lsb_release -irs SUSE LINUX 12.1 sles12sp2 # lsb_release -irs SUSE 12.2 Testing: Did a full build on SLES12 SP2. Before this patch, a build resulted in: 'Pre-built toolchain archives not available for your platform.' After this patch: Toolchain bootstrap complete. ..Followed by a full build. Change-Id: I005e05b8b66de78e6d53a35a894eb34d89843a62 Reviewed-on: http://gerrit.cloudera.org:8080/7535 Tested-by: Tim Armstrong <[email protected]> Reviewed-by: Tim Armstrong <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/fec05231 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/fec05231 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/fec05231 Branch: refs/heads/master Commit: fec05231b14e5309704a185182a087887932addb Parents: 9bfcd78 Author: Hector Acosta <[email protected]> Authored: Fri Jul 28 08:27:34 2017 -0700 Committer: Tim Armstrong <[email protected]> Committed: Fri Jul 28 16:51:02 2017 +0000 ---------------------------------------------------------------------- bin/bootstrap_toolchain.py | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/fec05231/bin/bootstrap_toolchain.py ---------------------------------------------------------------------- diff --git a/bin/bootstrap_toolchain.py b/bin/bootstrap_toolchain.py index 72d4041..afe8780 100755 --- a/bin/bootstrap_toolchain.py +++ b/bin/bootstrap_toolchain.py @@ -47,6 +47,7 @@ OS_MAPPING = { "debian8" : "ec2-package-debian-8", "suselinux11": "ec2-package-sles-11", "suselinux12": "ec2-package-sles-12", + "suse12.2": "ec2-package-sles-12", "ubuntu12.04" : "ec2-package-ubuntu-12-04", "ubuntu14.04" : "ec2-package-ubuntu-14-04", "ubuntu15.04" : "ec2-package-ubuntu-14-04",
