From 73e5f828f4ab9e110619a4053c780124cd44defe Mon Sep 17 00:00:00 2001 From: Vitaliy Lyudvichenko Date: Mon, 14 Nov 2016 22:14:11 +0300 Subject: [PATCH] Fixed debian build install. --- dbms/src/Server/CMakeLists.txt | 2 +- ...metrika-yandex.install => clickhouse-benchmark.install} | 0 ...cal-metrika-yandex.install => clickhouse-local.install} | 0 ...l-metrika-yandex.postinst => clickhouse-local.postinst} | 0 debian/clickhouse-server-base.install | 1 + release_lib.sh | 7 +++++-- 6 files changed, 7 insertions(+), 3 deletions(-) rename debian/{clickhouse-benchmark-metrika-yandex.install => clickhouse-benchmark.install} (100%) rename debian/{clickhouse-local-metrika-yandex.install => clickhouse-local.install} (100%) rename debian/{clickhouse-local-metrika-yandex.postinst => clickhouse-local.postinst} (100%) diff --git a/dbms/src/Server/CMakeLists.txt b/dbms/src/Server/CMakeLists.txt index 8652824179..83eb1d7bd5 100644 --- a/dbms/src/Server/CMakeLists.txt +++ b/dbms/src/Server/CMakeLists.txt @@ -20,7 +20,7 @@ INSTALL(TARGETS clickhouse RUNTIME DESTINATION bin COMPONENT clickhouse) # make symbolic links to concrete clickhouse applications macro(install_symlink_to_clickhouse app) INSTALL(CODE "execute_process(COMMAND ln -sf clickhouse ${app} WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\" )" COMPONENT ${app}) -endmacro(make_symlink_to_clickhouse) +endmacro(install_symlink_to_clickhouse) install_symlink_to_clickhouse(clickhouse-server) install_symlink_to_clickhouse(clickhouse-client) diff --git a/debian/clickhouse-benchmark-metrika-yandex.install b/debian/clickhouse-benchmark.install similarity index 100% rename from debian/clickhouse-benchmark-metrika-yandex.install rename to debian/clickhouse-benchmark.install diff --git a/debian/clickhouse-local-metrika-yandex.install b/debian/clickhouse-local.install similarity index 100% rename from debian/clickhouse-local-metrika-yandex.install rename to debian/clickhouse-local.install diff --git a/debian/clickhouse-local-metrika-yandex.postinst b/debian/clickhouse-local.postinst similarity index 100% rename from debian/clickhouse-local-metrika-yandex.postinst rename to debian/clickhouse-local.postinst diff --git a/debian/clickhouse-server-base.install b/debian/clickhouse-server-base.install index e6d5bbb792..71f17f3a8a 100644 --- a/debian/clickhouse-server-base.install +++ b/debian/clickhouse-server-base.install @@ -1,3 +1,4 @@ +/usr/bin/clickhouse /usr/bin/clickhouse-server /etc/cron.d/clickhouse-server /etc/security/limits.d/metrika.conf diff --git a/release_lib.sh b/release_lib.sh index 7cf15aa733..cc4929dd9f 100644 --- a/release_lib.sh +++ b/release_lib.sh @@ -39,10 +39,13 @@ function make_control { add_daemon_impl clickhouse-server-common "clickhouse-server-base(=1.1.$REVISION)" 'Common configuration files for clickhouse-server-base package' ;; 'clickhouse-client' ) - add_daemon_impl clickhouse-client + add_daemon_impl clickhouse-client "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse client" ;; 'clickhouse-benchmark' ) - add_daemon_impl clickhouse-benchmark + add_daemon_impl clickhouse-benchmark "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse benchmark tool" + ;; + 'clickhouse-local' ) + add_daemon_impl clickhouse-local "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse local server application" ;; * ) add_daemon_impl "${DAEMON_PKG}-metrika-yandex" -- GitLab