From: Kefu Chai Date: Thu, 5 Sep 2019 15:48:20 +0000 (+0800) Subject: ceph-*build: install python36-devel for rpm macros X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5d93cea792ab9f7f4dd40fe92adfcb9a3830a21a;p=ceph-build.git ceph-*build: install python36-devel for rpm macros see also 100a0fb5 see also https://github.com/ceph/ceph/pull/30190 Fixes: https://tracker.ceph.com/issues/41603 Signed-off-by: Kefu Chai --- diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index 649279a3..6905a103 100644 --- a/ceph-build/build/setup_rpm +++ b/ceph-build/build/setup_rpm @@ -39,8 +39,11 @@ elif [ "$ARCH" = arm64 ]; then fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec -# Make sure we have all the rpm macros installed and at the latest version before installing the dependencies -$SUDO yum install -y \*rpm-macros +# Make sure we have all the rpm macros installed and at the latest version +# before installing the dependencies, python3.6 is the main python offered +# by CentOS/RHEL7 at this moment, and it requires the python-rpm-macro and +# python2-rpm-macro we use for identify the python related dependencies +$SUDO yum install -y python36-devel $SUDO yum-builddep -y $DIR/ceph.spec diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm index 92102174..05796891 100644 --- a/ceph-dev-build/build/setup_rpm +++ b/ceph-dev-build/build/setup_rpm @@ -39,8 +39,11 @@ elif [ "$ARCH" = arm64 ]; then fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec -# Make sure we have all the rpm macros installed and at the latest version before installing the dependencies -$SUDO yum install -y \*rpm-macros +# Make sure we have all the rpm macros installed and at the latest version +# before installing the dependencies, python3.6 is the main python offered +# by CentOS/RHEL7 at this moment, and it requires the python-rpm-macro and +# python2-rpm-macro we use for identify the python related dependencies +$SUDO yum install -y python36-devel $SUDO yum-builddep -y $DIR/ceph.spec diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm index 92102174..05796891 100644 --- a/ceph-dev-new-build/build/setup_rpm +++ b/ceph-dev-new-build/build/setup_rpm @@ -39,8 +39,11 @@ elif [ "$ARCH" = arm64 ]; then fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec -# Make sure we have all the rpm macros installed and at the latest version before installing the dependencies -$SUDO yum install -y \*rpm-macros +# Make sure we have all the rpm macros installed and at the latest version +# before installing the dependencies, python3.6 is the main python offered +# by CentOS/RHEL7 at this moment, and it requires the python-rpm-macro and +# python2-rpm-macro we use for identify the python related dependencies +$SUDO yum install -y python36-devel $SUDO yum-builddep -y $DIR/ceph.spec