From 89c892ab2fbeba3416446e13667c89fa9f670aaa Mon Sep 17 00:00:00 2001 From: mariadb-AlanMologorsky Date: Tue, 1 Apr 2025 06:41:03 +0300 Subject: [PATCH] fix(bootstrap_mcs): Manual sync with 75f95d3a6be30c2cc2b4c7d6975e313370180d83 Only edd crb repo enable for Rocky9 and fix Cmake typo. --- build/bootstrap_mcs.sh | 4 ++++ cmake/cpackEngineRPM.cmake | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/bootstrap_mcs.sh b/build/bootstrap_mcs.sh index 93cab6427..3821eef46 100755 --- a/build/bootstrap_mcs.sh +++ b/build/bootstrap_mcs.sh @@ -129,6 +129,10 @@ install_deps() yum -y install cmake fi if [ $OS = 'Rocky' ]; then + if [[ "$OS_VERSION" == "9" ]]; then + dnf install -y 'dnf-command(config-manager)' + dnf config-manager --set-enabled crb + fi yum -y groupinstall "Development Tools" && yum config-manager --set-enabled powertools yum install -y checkpolicy fi diff --git a/cmake/cpackEngineRPM.cmake b/cmake/cpackEngineRPM.cmake index 5add7cc10..ac69f7bf9 100644 --- a/cmake/cpackEngineRPM.cmake +++ b/cmake/cpackEngineRPM.cmake @@ -61,7 +61,7 @@ MACRO(SETA var) ENDFOREACH() ENDMACRO(SETA) -SETA(CPACK_RPM_columnstore--engine_PACKAGE_PROVIDES "MariaDB-columnstore-engine") +SETA(CPACK_RPM_columnstore-engine_PACKAGE_PROVIDES "MariaDB-columnstore-engine") #boost is a source build in CentOS 6 so don't require it as a package SET(REDHAT_VERSION_NUMBER OFF)