Re: [Maria-developers] [Commits] 4685c90: mariadb@.service.in should be configured for all systemd platforms.
Hi Nirbhay, taking into account that CPackRPM won't be able to install it, what's the purpose of having this configured for all systemd platforms? Regards, Sergey On Tue, Nov 03, 2015 at 05:38:12PM -0500, Nirbhay Choubey wrote:
revision-id: 4685c903bc822596bcf12cbfdb5bcc4460ed0105 parent(s): 95289e5b665d6a3e37f938d0db978d0d0166e493 committer: Nirbhay Choubey branch nick: 10.1 timestamp: 2015-11-03 17:38:11 -0500 message:
mariadb@.service.in should be configured for all systemd platforms.
--- support-files/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 2ab4350..2929db1 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -79,9 +79,9 @@ IF(UNIX) IF(HAVE_SYSTEMD) CONFIGURE_FILE(mariadb.service.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service @ONLY) + CONFIGURE_FILE(mariadb@.service.in + ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service @ONLY) IF(NOT RPM) - CONFIGURE_FILE(mariadb@.service.in - ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service @ONLY) INSTALL(FILES use_galera_new_cluster.conf ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service _______________________________________________ commits mailing list commits@mariadb.org https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits
Hi Svoj! On Wed, Nov 4, 2015 at 1:54 AM, Sergey Vojtovich <svoj@mariadb.org> wrote:
Hi Nirbhay,
taking into account that CPackRPM won't be able to install it,
I think it does not apply to all rpm platforms, but ones with cmake affected by http://public.kitware.com/Bug/view.php?id=14782. what's the purpose of having this configured for all systemd platforms?
It should be ok for other platforms. Best, Nirbhay
Regards, Sergey
On Tue, Nov 03, 2015 at 05:38:12PM -0500, Nirbhay Choubey wrote:
revision-id: 4685c903bc822596bcf12cbfdb5bcc4460ed0105 parent(s): 95289e5b665d6a3e37f938d0db978d0d0166e493 committer: Nirbhay Choubey branch nick: 10.1 timestamp: 2015-11-03 17:38:11 -0500 message:
mariadb@.service.in should be configured for all systemd platforms.
--- support-files/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 2ab4350..2929db1 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -79,9 +79,9 @@ IF(UNIX) IF(HAVE_SYSTEMD) CONFIGURE_FILE(mariadb.service.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service @ONLY) + CONFIGURE_FILE(mariadb@.service.in + ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service @ONLY) IF(NOT RPM) - CONFIGURE_FILE(mariadb@.service.in - ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service @ONLY) INSTALL(FILES use_galera_new_cluster.conf ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service _______________________________________________ commits mailing list commits@mariadb.org https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits
commits mailing list commits@mariadb.org https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits
Hi Nirbhay, On Wed, Nov 04, 2015 at 09:52:15PM -0500, Nirbhay Choubey wrote:
Hi Svoj!
On Wed, Nov 4, 2015 at 1:54 AM, Sergey Vojtovich <svoj@mariadb.org> wrote:
Hi Nirbhay,
taking into account that CPackRPM won't be able to install it,
I think it does not apply to all rpm platforms, but ones with cmake affected by http://public.kitware.com/Bug/view.php?id=14782. It applied to all rpm platforms before we get this condition a few lines below: IF(NOT CMAKE_VERSION VERSION_LESS 3.3.0 OR NOT RPM)
I'd rather adjust the first "IF(NOT RPM)" accordingly, because it is a good idea to have use_galera_new_cluster.conf installed to INSTALL_SUPPORTFILESDIR. Regards, Sergey
participants (2)
-
Nirbhay Choubey
-
Sergey Vojtovich