database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

MDEV-39803 RPM dependencies missing from MariaDB-server-galera package

Browse Source 
RPM dependencies where not included in cpack build due to incorrect
component name.

Corrects a103be381b

Becase the wsrep_info plugin installs as a plugin, it overrites the
cpack_rpm server-galera PACKAGE_DEPENDS.

As such make the cmake/plugin.cmake only sets the PACKAGE_DEPENDS if
not already set. This allows plugin to override automatic REQUIRES,
fine-tuning their own dependencies
This commit is contained in:
Daniel Black
2026-06-01 14:22:03 +10:00
parent 51263b851d
commit 9c9282a5fe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/cpack_rpm.cmake
View File

@@ -270,12 +270,12 @@ SETA(CPACK_RPM_server_PACKAGE_REQUIRES
"MariaDB-client >= 11.0.0")
IF(WITH_WSREP)
SETA(CPACK_RPM_server_galera_PACKAGE_REQUIRES
SETA(CPACK_RPM_server-galera_PACKAGE_REQUIRES
"MariaDB-server >= ${SERVER_VERSION}"
"galera-4" "rsync" "grep" "gawk" "iproute"
"coreutils" "findutils" "tar")
SETA(CPACK_RPM_server_galera_PACKAGE_RECOMMENDS "lsof" "socat" "pv")
SETA(CPACK_RPM_server_galera_PACKAGE_CONFLICTS
SETA(CPACK_RPM_server-galera_PACKAGE_RECOMMENDS "lsof" "socat" "pv")
SETA(CPACK_RPM_server-galera_PACKAGE_CONFLICTS
"MariaDB-server <= 12.3.2")
ENDIF()

2
cmake/plugin.cmake
View File

@@ -275,7 +275,7 @@ MACRO(MYSQL_ADD_PLUGIN)
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT} ${ARG_COMPONENT}Symlinks)
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
IF (NOT ARG_CLIENT)
IF (NOT ARG_CLIENT AND NOT CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES)
SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server${ver}" PARENT_SCOPE)
ENDIF()
SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE)