Commit 56959e7b authored by Alexey Botchkov's avatar Alexey Botchkov

MDEV-11963 RPM Lint: script-without-shebang /usr/bin/wsrep_sst_common.

        Don't set the +x on /bin/wsrep_sst_common when installing.
parent d1b3e428
...@@ -291,12 +291,16 @@ ELSE() ...@@ -291,12 +291,16 @@ ELSE()
IF(WITH_WSREP) IF(WITH_WSREP)
SET(WSREP_SCRIPTS SET(WSREP_SCRIPTS
wsrep_sst_mysqldump wsrep_sst_mysqldump
wsrep_sst_common
wsrep_sst_rsync wsrep_sst_rsync
wsrep_sst_xtrabackup wsrep_sst_xtrabackup
wsrep_sst_xtrabackup-v2 wsrep_sst_xtrabackup-v2
wsrep_sst_mariabackup wsrep_sst_mariabackup
) )
# The following script is sourced from other SST scripts, so it should
# not be made executable.
SET(WSREP_SOURCE
wsrep_sst_common
)
ENDIF() ENDIF()
IF (NOT WITHOUT_SERVER) IF (NOT WITHOUT_SERVER)
SET(SERVER_SCRIPTS SET(SERVER_SCRIPTS
...@@ -336,6 +340,9 @@ ELSE() ...@@ -336,6 +340,9 @@ ELSE()
MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file} in " MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file} in "
"${CMAKE_CURRENT_SOURCE_DIR}" ) "${CMAKE_CURRENT_SOURCE_DIR}" )
ENDIF() ENDIF()
# TODO: The following EXECUTE could be redundant as INSTALL_SCRIPT
# macro does an INSTALL(PROGRAMS ..) that automatically sets +x on
# the executable.
EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/${file}) EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/${file})
IF(NOT ${file}_COMPONENT) IF(NOT ${file}_COMPONENT)
SET(${file}_COMPONENT Server) SET(${file}_COMPONENT Server)
...@@ -346,6 +353,20 @@ ELSE() ...@@ -346,6 +353,20 @@ ELSE()
COMPONENT ${${file}_COMPONENT} COMPONENT ${${file}_COMPONENT}
) )
ENDFOREACH() ENDFOREACH()
FOREACH(file ${WSREP_SOURCE})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
IF(NOT ${file}_COMPONENT)
SET(${file}_COMPONENT Server)
ENDIF()
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/${file}
DESTINATION ${INSTALL_BINDIR}
COMPONENT ${${file}_COMPONENT}
)
ENDFOREACH()
ENDIF() ENDIF()
# Install libgcc as mylibgcc.a # Install libgcc as mylibgcc.a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment