From b445bb71daf0bb2930d4c469a2f18b3c92c8efee Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 15 Jan 2025 09:18:12 +1100 Subject: [PATCH] MDEV-35850 make HOSTNAME a cmake configure variable As seen with openwrt and some other distros, the determination of hostname can sometime need alternate commmands. This provides a cmake option HOSTNAME for non-windows machines for the mariadb-install-db and mariadbd-safe scripts and the support-files init scripts.. --- CMakeLists.txt | 1 + scripts/CMakeLists.txt | 1 - support-files/CMakeLists.txt | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac556bd3ff4c3..456017ae3d7fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -367,6 +367,7 @@ IF(WIN32) ELSE() SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX}) SET(SHAREDIR ${INSTALL_MYSQLSHAREDIRABS}) + SET(HOSTNAME "uname -n" CACHE STRING "Command for determining hostname") ENDIF() SET(DEFAULT_BASEDIR "${DEFAULT_MYSQL_HOME}") diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 9e50ae833b178..5c463e5210762 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -177,7 +177,6 @@ ELSE() SET(CHECK_PID "kill -s SIGCONT $PID > /dev/null 2> /dev/null") ENDIF() -SET(HOSTNAME "uname -n") SET(MYSQLD_USER "mysql") SET(MYSQLD_GROUP "mysql") ENDIF(UNIX) diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index ee1d420e12672..a44ed21bdbee2 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -31,7 +31,6 @@ ELSE() SET(MYSQLD_USER "mysql") SET(MYSQLD_GROUP "mysql") SET(ini_file_extension "cnf") - SET(HOSTNAME "uname -n") # Define directly here, as cmake/install_layout.cmake has no LOGDIR to be inherited SET(su_user "su mysql mysql")