aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdist/post_install.sh6
-rw-r--r--storageserver/src/apps/storaged/.gitignore2
-rw-r--r--storageserver/src/apps/storaged/CMakeLists.txt2
-rw-r--r--vespabase/CMakeLists.txt4
4 files changed, 10 insertions, 4 deletions
diff --git a/dist/post_install.sh b/dist/post_install.sh
index 6c70863806c..4806ee8121d 100755
--- a/dist/post_install.sh
+++ b/dist/post_install.sh
@@ -76,3 +76,9 @@ ln -s vespa-verify-ranksetup-bin $INSTALLPATH/bin/verify_ranksetup-bin
ln -s vespa-proton $INSTALLPATH/sbin/proton
ln -s vespa-fdispatch $INSTALLPATH/sbin/fdispatch
ln -s vespa-verify-ranksetup $INSTALLPATH/bin/verify_ranksetup
+
+# Temporary when renaming binaries in storageserver
+ln -s vespa-storaged-bin $INSTALLPATH/sbin/storaged-bin
+ln -s vespa-distributord-bin $INSTALLPATH/sbin/distributord-bin
+ln -s vespa-storaged $INSTALLPATH/sbin/storaged
+ln -s vespa-distributord $INSTALLPATH/sbin/distributord
diff --git a/storageserver/src/apps/storaged/.gitignore b/storageserver/src/apps/storaged/.gitignore
index 67fbcdcf4db..282d97fe962 100644
--- a/storageserver/src/apps/storaged/.gitignore
+++ b/storageserver/src/apps/storaged/.gitignore
@@ -1,3 +1,3 @@
/Makefile
/storaged
-storaged-bin
+vespa-storaged-bin
diff --git a/storageserver/src/apps/storaged/CMakeLists.txt b/storageserver/src/apps/storaged/CMakeLists.txt
index 8a488b69d77..039058caaff 100644
--- a/storageserver/src/apps/storaged/CMakeLists.txt
+++ b/storageserver/src/apps/storaged/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(storageserver_storaged_app
SOURCES
storage.cpp
forcelink.cpp
- OUTPUT_NAME storaged-bin
+ OUTPUT_NAME vespa-storaged-bin
INSTALL sbin
DEPENDS
storageserver_storageapp
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt
index 583bbf8c8b8..bd62eeadc39 100644
--- a/vespabase/CMakeLists.txt
+++ b/vespabase/CMakeLists.txt
@@ -17,11 +17,11 @@ vespa_install_script(src/start-cbinaries.sh vesparoute bin)
vespa_install_script(src/start-cbinaries.sh vespa-transactionlog-inspect bin)
vespa_install_script(src/start-cbinaries.sh vespavisit bin)
vespa_install_script(src/start-cbinaries.sh vespavisittarget bin)
-vespa_install_script(src/start-cbinaries.sh distributord sbin)
+vespa_install_script(src/start-cbinaries.sh vespa-distributord sbin)
vespa_install_script(src/start-cbinaries.sh vespa-fdispatch sbin)
vespa_install_script(src/start-cbinaries.sh filedistributor sbin)
vespa_install_script(src/start-cbinaries.sh vespa-proton sbin)
-vespa_install_script(src/start-cbinaries.sh storaged sbin)
+vespa_install_script(src/start-cbinaries.sh vespa-storaged sbin)
vespa_install_script(src/start-tool.sh vespa-start-tool.sh bin)