summary refs log tree commit diff
path: root/docker/build_debian.sh
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-01-02 07:17:39 +0000
committerGitHub <noreply@github.com>2019-01-02 07:17:39 +0000
commit7134832c017fab1e4e6b90df9ad39dd618656427 (patch)
treeb1593c4d2a9c75ac373a1523b4d8ee57503c79dc /docker/build_debian.sh
parentRemove v1 only REST APIs now we don't ship matrix console (#4334) (diff)
downloadsynapse-7134832c017fab1e4e6b90df9ad39dd618656427.tar.xz
Install the optional dependencies into the debian package (#4325)
since #4298, the optional dependencies are no longer installed with a simple
`pip install .`, which meant that they were not being included in the debian
package.

The easy fix to that is dh_virtualenv --extras, but that needs dh_virtualenv
1.1...
Diffstat (limited to 'docker/build_debian.sh')
-rw-r--r--docker/build_debian.sh14
1 files changed, 0 insertions, 14 deletions
diff --git a/docker/build_debian.sh b/docker/build_debian.sh
index cea5067fe9..6ed2b39898 100644
--- a/docker/build_debian.sh
+++ b/docker/build_debian.sh
@@ -6,20 +6,6 @@ set -ex
 
 DIST=`lsb_release -c -s`
 
-# We need to build a newer dh_virtualenv on older OSes like Xenial.
-if [ "$DIST" = 'xenial' ]; then
-    mkdir -p /tmp/dhvenv
-    cd /tmp/dhvenv
-    wget https://github.com/spotify/dh-virtualenv/archive/1.1.tar.gz
-    tar xvf 1.1.tar.gz
-    cd dh-virtualenv-1.1/
-    env DEBIAN_FRONTEND=noninteractive mk-build-deps -ri -t "apt-get -yqq --no-install-recommends -o Dpkg::Options::=--force-unsafe-io"
-    dpkg-buildpackage -us -uc -b
-    cd /tmp/dhvenv
-    apt-get install -yqq ./dh-virtualenv_1.1-1_all.deb
-fi
-
-
 # we get a read-only copy of the source: make a writeable copy
 cp -aT /synapse/source /synapse/build
 cd /synapse/build