From 41451e2e5684f0cd0e4da4005d2de522cc357214 Mon Sep 17 00:00:00 2001 From: Allen Han Date: Thu, 24 Sep 2020 10:15:23 -0500 Subject: [PATCH 1/5] add pkgs for centos --- scripts/eosio_build_centos7_deps | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/eosio_build_centos7_deps b/scripts/eosio_build_centos7_deps index 180c3671425..83f58ab2154 100644 --- a/scripts/eosio_build_centos7_deps +++ b/scripts/eosio_build_centos7_deps @@ -3,6 +3,7 @@ autoconf,rpm -qa automake,rpm -qa libtool,rpm -qa make,rpm -qa +cmake,rpm -qa bzip2,rpm -qa doxygen,rpm -qa graphviz,rpm -qa @@ -11,6 +12,7 @@ openssl-devel,rpm -qa gmp-devel,rpm -qa ocaml,rpm -qa python,rpm -qa +python3,rpm -qa python-devel,rpm -qa rh-python36,rpm -qa gettext-devel,rpm -qa @@ -19,4 +21,5 @@ libusbx-devel,rpm -qa libcurl-devel,rpm -qa patch,rpm -qa llvm-toolset-7.0-llvm-devel,rpm -qa -llvm-toolset-7.0-llvm-static,rpm -qa \ No newline at end of file +llvm-toolset-7.0-llvm-static,rpm -qa +jq,rpm -qa \ No newline at end of file From a966c3d029251598d252501ecf2d6d74cef0fcdc Mon Sep 17 00:00:00 2001 From: Allen Han Date: Thu, 24 Sep 2020 10:29:23 -0500 Subject: [PATCH 2/5] add release rpm install --- scripts/eosio_build_centos.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh index ed03034c547..a8b67578a07 100755 --- a/scripts/eosio_build_centos.sh +++ b/scripts/eosio_build_centos.sh @@ -64,6 +64,12 @@ if [[ "$(echo ${VERSION} | sed 's/ .*//g')" == 8 ]]; then ln -s /usr/lib64/libtinfo.so.6 /usr/local/lib/libtinfo.so fi +if [[ "$(echo ${VERSION} | sed 's/ .*//g')" == 7 ]]; then + echo "Install Development Tools ..." + yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + yum install jq -y +fi + # Handle clang/compiler ensure-compiler # CMAKE Installation From 95e206ec4cb9e8c6cc8fbb4216b8c5bc4c302245 Mon Sep 17 00:00:00 2001 From: Allen Han Date: Thu, 24 Sep 2020 10:35:27 -0500 Subject: [PATCH 3/5] add install pkg before dependency --- scripts/eosio_build_centos.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh index a8b67578a07..57cbdcb0e66 100755 --- a/scripts/eosio_build_centos.sh +++ b/scripts/eosio_build_centos.sh @@ -22,6 +22,11 @@ if [[ -d /opt/rh/devtoolset-8 ]]; then execute-always source /opt/rh/devtoolset-8/enable echo " - ${COLOR_GREEN}Centos devtoolset-8 successfully enabled!${COLOR_NC}" fi + +echo "installing https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" +yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +yum install jq -y + # Ensure packages exist ensure-yum-packages "${REPO_ROOT}/scripts/eosio_build_centos7_deps" export PYTHON3PATH="/opt/rh/rh-python36" @@ -64,12 +69,6 @@ if [[ "$(echo ${VERSION} | sed 's/ .*//g')" == 8 ]]; then ln -s /usr/lib64/libtinfo.so.6 /usr/local/lib/libtinfo.so fi -if [[ "$(echo ${VERSION} | sed 's/ .*//g')" == 7 ]]; then - echo "Install Development Tools ..." - yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - yum install jq -y -fi - # Handle clang/compiler ensure-compiler # CMAKE Installation From 774eb45fcde560f9196bf903412142665312e467 Mon Sep 17 00:00:00 2001 From: Allen Han Date: Thu, 24 Sep 2020 11:25:07 -0500 Subject: [PATCH 4/5] using epel-release --- scripts/eosio_build_centos.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh index 57cbdcb0e66..23ca6832ef7 100755 --- a/scripts/eosio_build_centos.sh +++ b/scripts/eosio_build_centos.sh @@ -23,9 +23,12 @@ if [[ -d /opt/rh/devtoolset-8 ]]; then echo " - ${COLOR_GREEN}Centos devtoolset-8 successfully enabled!${COLOR_NC}" fi -echo "installing https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" -yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -yum install jq -y +yum install epel-release +yum install dnf +yum install jq +#echo "installing https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" +#yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +#yum install jq -y # Ensure packages exist ensure-yum-packages "${REPO_ROOT}/scripts/eosio_build_centos7_deps" From b65f4660dcdd70223818f50eb263fbc605c8de0a Mon Sep 17 00:00:00 2001 From: Allen Han Date: Thu, 24 Sep 2020 11:42:11 -0500 Subject: [PATCH 5/5] remove dnf --- scripts/eosio_build_centos.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh index 23ca6832ef7..2cfff507a66 100755 --- a/scripts/eosio_build_centos.sh +++ b/scripts/eosio_build_centos.sh @@ -24,11 +24,7 @@ if [[ -d /opt/rh/devtoolset-8 ]]; then fi yum install epel-release -yum install dnf yum install jq -#echo "installing https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" -#yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -#yum install jq -y # Ensure packages exist ensure-yum-packages "${REPO_ROOT}/scripts/eosio_build_centos7_deps"