Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install-deps.sh: use DTS on centos if GCC is too old #19398

Merged
merged 3 commits into from Dec 9, 2017

Conversation

tchaikov
Copy link
Contributor

@tchaikov tchaikov commented Dec 8, 2017

Signed-off-by: Kefu Chai kchai@redhat.com

@tchaikov tchaikov force-pushed the wip-install-deps-use-dts branch 2 times, most recently from 062f266 to 3c84eea Compare December 8, 2017 09:40
@tchaikov
Copy link
Contributor Author

tchaikov commented Dec 8, 2017

@shinobu-x could you help test this? the goal here is to make sure that run-make-check.sh builds even if running on centos.

@tchaikov tchaikov force-pushed the wip-install-deps-use-dts branch 3 times, most recently from a89c585 to 987d06f Compare December 8, 2017 09:56
@shinobu-x
Copy link
Contributor

@tchaikov ack

@shinobu-x
Copy link
Contributor

@tchaikov

@octopus:ceph [sk-test-19398]$ rm -fRv build
@octopus:ceph [sk-test-19398]$ ./run-make-check.sh 
./run-make-check.sh: line 72: cd: build: No such file or directory
make: *** No rule to make target `tests'.  Stop.
@octopus:ceph [sk-test-19398]$ ls | grep build | wc -l
1

@shinobu-x
Copy link
Contributor

@octopus:ceph [sk-test-19398]$ ./do_cmake.sh 
+ git submodule update --init --recursive
+ test -e build
+ echo 'build dir already exists; rm -rf build and re-run'
build dir already exists; rm -rf build and re-run
+ exit 1

@tchaikov tchaikov force-pushed the wip-install-deps-use-dts branch 2 times, most recently from c673062 to decf048 Compare December 8, 2017 11:25
please note, run-make-check.sh sources install-deps.sh here to import
the $PATH and other environmental variables, which could be changed by
the the DTS "enable" script.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
Copy link
Contributor Author

tchaikov commented Dec 8, 2017

@shinobu-x thanks for testing. fixed and repushed.

@ceph ceph deleted a comment from shinobu-x Dec 8, 2017
@ceph ceph deleted a comment from shinobu-x Dec 8, 2017
@tchaikov tchaikov force-pushed the wip-install-deps-use-dts branch 3 times, most recently from 835ede6 to 97dbcdb Compare December 8, 2017 12:53
the DTS-6 is only available in the testing repo

Signed-off-by: Kefu Chai <kchai@redhat.com>
. /opt/rh/devtoolset-6/enable
%else
. /opt/rh/devtoolset-7/enable
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ktdreyer this reflects the different support of DTS from RHEL and CentOS.

@liewegas
Copy link
Member

liewegas commented Dec 8, 2017

lgtm!

devtoolset-7 is available for RHEL, but not for centos. only dts-6 is
available for centos.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
Copy link
Contributor Author

tchaikov commented Dec 9, 2017

@tchaikov tchaikov merged commit 74a132d into ceph:master Dec 9, 2017
@tchaikov tchaikov deleted the wip-install-deps-use-dts branch December 9, 2017 03:51
@@ -50,6 +50,38 @@ function ensure_decent_gcc {
$SUDO ln -nsf /usr/bin/g++ /usr/bin/x86_64-linux-gnu-g++
}

function version_lt {
test $1 != $(echo -e "$1\n$2" | sort -rV | head -n 1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants