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 <kchai@redhat.com>

diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index 649279a36ec5c5e0435e97e3d03b899d1edcbbce..6905a103762b0352b6db2498ec3287dd75e56683 100644 (file)
--- 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 921021742fdff793a9f5b86c2b3aa135f93b4a06..057968915a4b31eac64fa2cc2a807dea78f9ac40 100644 (file)
--- 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 921021742fdff793a9f5b86c2b3aa135f93b4a06..057968915a4b31eac64fa2cc2a807dea78f9ac40 100644 (file)
--- 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