diff --git a/dist/redhat/build_relocatable_python3_rpm.sh b/dist/redhat/python3/build_rpm.sh similarity index 87% rename from dist/redhat/build_relocatable_python3_rpm.sh rename to dist/redhat/python3/build_rpm.sh index 4389345f95..54d4a964e7 100755 --- a/dist/redhat/build_relocatable_python3_rpm.sh +++ b/dist/redhat/python3/build_rpm.sh @@ -67,5 +67,5 @@ mkdir -p "$RPMBUILD"/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} PYVER=$(python3 -V | cut -d' ' -f2) ln -fv "$RELOC_PKG" "$RPMBUILD"/SOURCES/ -pystache "$SPEC"/relocatable_python.spec.mustache "{ \"version\": \"${PYVER}\", \"reloc_pkg\": \"${RELOC_PKG_BASENAME}\", \"name\": \"scylla-python3\", \"target\": \"/opt/scylladb/python3\" }" > "$RPMBUILD"/SPECS/relocatable_python.spec -rpmbuild --nodebuginfo -ba --define "_build_id_links none" --define "_topdir ${RPMBUILD}" --define "dist .el7" "$RPMBUILD"/SPECS/relocatable_python.spec +pystache "$SPEC"/python.spec.mustache "{ \"version\": \"${PYVER}\", \"reloc_pkg\": \"${RELOC_PKG_BASENAME}\", \"name\": \"scylla-python3\", \"target\": \"/opt/scylladb/python3\" }" > "$RPMBUILD"/SPECS/python.spec +rpmbuild --nodebuginfo -ba --define "_build_id_links none" --define "_topdir ${RPMBUILD}" --define "dist .el7" "$RPMBUILD"/SPECS/python.spec diff --git a/dist/redhat/relocatable_python.spec.mustache b/dist/redhat/python3/python.spec.mustache similarity index 100% rename from dist/redhat/relocatable_python.spec.mustache rename to dist/redhat/python3/python.spec.mustache diff --git a/reloc/build_python3.sh b/reloc/python3/build_reloc.sh similarity index 92% rename from reloc/build_python3.sh rename to reloc/python3/build_reloc.sh index 21ca16272b..f47c9320c5 100755 --- a/reloc/build_python3.sh +++ b/reloc/python3/build_reloc.sh @@ -27,4 +27,4 @@ if [ -f "$TARGET" ]; then fi PACKAGES="python3-PyYAML python3-urwid python3-pyparsing python3-requests python3-pyudev python3-setuptools" -./scripts/create-relocatable-python.py --output "$TARGET" $PACKAGES +./scripts/create-relocatable-package-python3.py --output "$TARGET" $PACKAGES diff --git a/scripts/create-relocatable-python.py b/scripts/create-relocatable-package-python3.py similarity index 100% rename from scripts/create-relocatable-python.py rename to scripts/create-relocatable-package-python3.py