mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-03 13:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

debian: correctly relocate python scripts

Browse Source 
Relocation of python scripts mentions scylla-server in paths explicitly.
It should use {{product}} instead. The current build is failing when
{{product}} is different than scylla-server

Signed-off-by: Glauber Costa <glauber@scylladb.com>
Message-Id: <20190613012518.28784-1-glauber@scylladb.com>
This commit is contained in:
Glauber Costa
2019-06-12 21:25:18 -04:00
committed by Avi Kivity
parent b1226fb15a
commit 8a3fe3ac9b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dist/debian/rules.mustache vendored
View File

@@ -16,12 +16,12 @@ override_dh_auto_install:
ln -sf /opt/scylladb/bin/iotune $(CURDIR)/debian/{{product}}-server/usr/bin/iotune
ln -sf /usr/lib/scylla/scyllatop/scyllatop.py $(CURDIR)/debian/{{product}}-server/usr/bin/scyllatop
find ./dist/common/scripts -type f -exec ./relocate_python_scripts.py \
--installroot $(CURDIR)/debian/scylla-server/usr/lib/scylla/ --with-python3 "$(CURDIR)/debian/scylla-server/opt/scylladb/python3/bin/python3" {} +
--installroot $(CURDIR)/debian/{{product}}-server/usr/lib/scylla/ --with-python3 "$(CURDIR)/debian/{{product}}-server/opt/scylladb/python3/bin/python3" {} +
./relocate_python_scripts.py \
--installroot $(CURDIR)/debian/scylla-server/usr/lib/scylla/ --with-python3 "$(CURDIR)/debian/scylla-server/opt/scylladb/python3/bin/python3" \
--installroot $(CURDIR)/debian/{{product}}-server/usr/lib/scylla/ --with-python3 "$(CURDIR)/debian/{{product}}-server/opt/scylladb/python3/bin/python3" \
seastar/scripts/perftune.py seastar/scripts/seastar-addr2line seastar/scripts/perftune.py
./relocate_python_scripts.py \
--installroot $(CURDIR)/debian/scylla-server/usr/lib/scylla/scyllatop/ --with-python3 "$(CURDIR)/debian/scylla-server/opt/scylladb/python3/bin/python3" \
--installroot $(CURDIR)/debian/{{product}}-server/usr/lib/scylla/scyllatop/ --with-python3 "$(CURDIR)/debian/{{product}}-server/opt/scylladb/python3/bin/python3" \
tools/scyllatop/scyllatop.py
override_dh_installinit: