Skip to content
Snippets Groups Projects
Commit ffc40191 authored by Maxim Cournoyer's avatar Maxim Cournoyer Committed by Sébastien Blin
Browse files

build: Add support for Ubuntu 18.04.


Remove deprecated distros and update Debian dependencies in
make-ring.py and in the new Ubuntu 18.04 Dockerfile.

Change-Id: Ia30948f8406a10ba269f3245c2428d42b8ac7d71
Reviewed-by: default avatarSebastien Blin <sebastien.blin@savoirfairelinux.com>
parent 4bcbd61b
No related branches found
Tags
No related merge requests found
...@@ -72,30 +72,14 @@ $(RELEASE_TARBALL_FILENAME): ...@@ -72,30 +72,14 @@ $(RELEASE_TARBALL_FILENAME):
####################### #######################
.PHONY: package-all .PHONY: package-all
package-all: package-debian_8 \ package-all: package-debian_9 \
package-debian_8_i386 \
package-debian_9 \
package-debian_9_i386 \ package-debian_9_i386 \
package-ubuntu_14.04 \
package-ubuntu_14.04_i386 \
package-ubuntu_15.10 \
package-ubuntu_15.10_i386 \
package-ubuntu_16.04 \ package-ubuntu_16.04 \
package-ubuntu_16.04_i386 \ package-ubuntu_16.04_i386 \
package-ubuntu_16.10 \
package-ubuntu_16.10_i386 \
package-ubuntu_17.04 \
package-ubuntu_17.04_i386 \
package-ubuntu_17.10 \ package-ubuntu_17.10 \
package-ubuntu_17.10_i386 \ package-ubuntu_17.10_i386 \
package-fedora_22 \ package-ubuntu_18.04 \
package-fedora_22_i386 \ package-ubuntu_18.04_i386 \
package-fedora_23 \
package-fedora_23_i386 \
package-fedora_24 \
package-fedora_24_i386 \
package-fedora_25 \
package-fedora_25_i386 \
package-fedora_26 \ package-fedora_26 \
package-fedora_26_i386 \ package-fedora_26_i386 \
package-fedora_27 \ package-fedora_27 \
......
client-android @ 59c28d04
Subproject commit ca337974e3383a798333a23a303ead9120c33f14 Subproject commit 59c28d04ca079bf7bb7b9b39b273248901301f2f
client-gnome @ a3ae9fd0
Subproject commit 02b283d7ddac093d7a729d5602815587135a23e8 Subproject commit a3ae9fd07f296b282abdbaf5338750af583675a8
daemon @ 36c6d857
Subproject commit a386003fe234b17bb5f309635252a8baa3cb5e4e Subproject commit 36c6d857289199c6ace3d6e1f6995e25cdcb4b8d
FROM ubuntu:15.10 FROM ubuntu:18.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y vim devscripts equivs apt-get install -y devscripts equivs
# Speed up mk-build-deps # Speed up mk-build-deps
RUN apt-get clean RUN apt-get clean
...@@ -20,6 +20,7 @@ RUN apt-get update && \ ...@@ -20,6 +20,7 @@ RUN apt-get update && \
libdbus-c++-dev \ libdbus-c++-dev \
libupnp-dev \ libupnp-dev \
libgnutls28-dev \ libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \ libebook1.2-dev \
libcanberra-gtk3-dev \ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \ libclutter-gtk-1.0-dev \
...@@ -55,8 +56,9 @@ RUN apt-get update && \ ...@@ -55,8 +56,9 @@ RUN apt-get update && \
libudev-dev \ libudev-dev \
libgsm1-dev \ libgsm1-dev \
libjsoncpp-dev \ libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \ libnatpmp-dev \
libappindicator3-dev \ libayatana-appindicator3-dev \
libqrencode-dev \ libqrencode-dev \
libnm-dev \ libnm-dev \
libwebkit2gtk-4.0-dev \ libwebkit2gtk-4.0-dev \
......
FROM i386/ubuntu:15.10 FROM i386/ubuntu:18.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y vim devscripts equivs apt-get install -y devscripts equivs
# Speed up mk-build-deps # Speed up mk-build-deps
RUN apt-get clean RUN apt-get clean
...@@ -20,6 +20,7 @@ RUN apt-get update && \ ...@@ -20,6 +20,7 @@ RUN apt-get update && \
libdbus-c++-dev \ libdbus-c++-dev \
libupnp-dev \ libupnp-dev \
libgnutls28-dev \ libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \ libebook1.2-dev \
libcanberra-gtk3-dev \ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \ libclutter-gtk-1.0-dev \
...@@ -55,8 +56,9 @@ RUN apt-get update && \ ...@@ -55,8 +56,9 @@ RUN apt-get update && \
libudev-dev \ libudev-dev \
libgsm1-dev \ libgsm1-dev \
libjsoncpp-dev \ libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \ libnatpmp-dev \
libappindicator3-dev \ libayatana-appindicator3-dev \
libqrencode-dev \ libqrencode-dev \
libnm-dev \ libnm-dev \
libwebkit2gtk-4.0-dev \ libwebkit2gtk-4.0-dev \
......
lrc @ 82f8718f
Subproject commit c69ae83d46411497cb3e20281934318c546af3ab Subproject commit 82f8718fd21a7d310ac170f69a7683db74ca9f64
...@@ -117,7 +117,7 @@ DNF_DEPENDENCIES = [ ...@@ -117,7 +117,7 @@ DNF_DEPENDENCIES = [
APT_DEPENDENCIES = [ APT_DEPENDENCIES = [
'autoconf', 'autoconf-archive', 'autopoint', 'cmake', 'dbus', 'doxygen', 'g++', 'gettext', 'autoconf', 'autoconf-archive', 'autopoint', 'cmake', 'dbus', 'doxygen', 'g++', 'gettext',
'gnome-icon-theme-symbolic', 'libasound2-dev', 'libavcodec-dev', 'gnome-icon-theme-symbolic', 'libasound2-dev', 'libavcodec-dev',
'libavcodec-extra', 'libavdevice-dev', 'libavformat-dev', 'libboost-dev', 'libavdevice-dev', 'libavformat-dev', 'libboost-dev',
'libclutter-gtk-1.0-dev', 'libcppunit-dev', 'libdbus-1-dev', 'libclutter-gtk-1.0-dev', 'libcppunit-dev', 'libdbus-1-dev',
'libdbus-c++-dev', 'libebook1.2-dev', 'libexpat1-dev', 'libgnutls28-dev', 'libdbus-c++-dev', 'libebook1.2-dev', 'libexpat1-dev', 'libgnutls28-dev',
'libgsm1-dev', 'libgtk-3-dev', 'libjack-dev', 'libnotify-dev', 'libgsm1-dev', 'libgtk-3-dev', 'libjack-dev', 'libnotify-dev',
......
...@@ -92,16 +92,6 @@ def run_generate(parsed_args): ...@@ -92,16 +92,6 @@ def run_generate(parsed_args):
def run_generate_all(parsed_args): def run_generate_all(parsed_args):
targets = [ targets = [
# Debian # Debian
{
"distribution": "debian_8",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
},
{
"distribution": "debian_8_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
},
{ {
"distribution": "debian_9", "distribution": "debian_9",
"debian_packaging_override": "", "debian_packaging_override": "",
...@@ -113,26 +103,6 @@ def run_generate_all(parsed_args): ...@@ -113,26 +103,6 @@ def run_generate_all(parsed_args):
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
}, },
# Ubuntu # Ubuntu
{
"distribution": "ubuntu_14.04",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
},
{
"distribution": "ubuntu_14.04_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
},
{
"distribution": "ubuntu_15.10",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
},
{
"distribution": "ubuntu_15.10_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
},
{ {
"distribution": "ubuntu_16.04", "distribution": "ubuntu_16.04",
"debian_packaging_override": "", "debian_packaging_override": "",
...@@ -144,76 +114,26 @@ def run_generate_all(parsed_args): ...@@ -144,76 +114,26 @@ def run_generate_all(parsed_args):
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
}, },
{ {
"distribution": "ubuntu_16.10", "distribution": "ubuntu_17.10",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
},
{
"distribution": "ubuntu_16.10_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
},
{
"distribution": "ubuntu_17.04",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
}, },
{ {
"distribution": "ubuntu_17.04_i386", "distribution": "ubuntu_17.10_i386",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
}, },
{ {
"distribution": "ubuntu_17.10", "distribution": "ubuntu_18.04",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
}, },
{ {
"distribution": "ubuntu_17.10_i386", "distribution": "ubuntu_18.04_i386",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
}, },
# Fedora # Fedora
{
"distribution": "fedora_22",
"debian_packaging_override": "",
"output_file": ".packages-built",
},
{
"distribution": "fedora_22_i386",
"debian_packaging_override": "",
"output_file": ".packages-built",
},
{
"distribution": "fedora_23",
"debian_packaging_override": "",
"output_file": ".packages-built",
},
{
"distribution": "fedora_23_i386",
"debian_packaging_override": "",
"output_file": ".packages-built",
},
{
"distribution": "fedora_24",
"debian_packaging_override": "",
"output_file": ".packages-built",
},
{
"distribution": "fedora_24_i386",
"debian_packaging_override": "",
"output_file": ".packages-built",
},
{
"distribution": "fedora_25",
"debian_packaging_override": "",
"output_file": ".packages-built",
},
{
"distribution": "fedora_25_i386",
"debian_packaging_override": "",
"output_file": ".packages-built",
},
{ {
"distribution": "fedora_26", "distribution": "fedora_26",
"debian_packaging_override": "", "debian_packaging_override": "",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment