Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix debian packages for sid being called buster. #5775

Merged
merged 2 commits into from
Jul 29, 2019
Merged

Fix debian packages for sid being called buster. #5775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4fe79f
Fix debian packages for sid being called buster.
erikjohnston Jul 26, 2019
a8e69df
Newsfile
erikjohnston Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5775.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix debian packaging scripts to correctly build sid packages.
5 changes: 5 additions & 0 deletions docker/Dockerfile-dhvirtualenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ RUN cd dh-virtualenv-1.1 && dpkg-buildpackage -us -uc -b
###
FROM ${distro}

# Get the distro we want to pull from as a dynamic build variable
# (We need to define it in each build stage)
ARG distro=""
ENV distro ${distro}

# Install the build dependencies
#
# NB: keep this list in sync with the list of build-deps in debian/control
Expand Down
3 changes: 2 additions & 1 deletion docker/build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

set -ex

DIST=`lsb_release -c -s`
# Get the codename from distro env
DIST=`cut -d ':' -f2 <<< $distro`

# we get a read-only copy of the source: make a writeable copy
cp -aT /synapse/source /synapse/build
Expand Down