summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2018-01-05 14:10:46 +0100
committerStefan Schmidt <stefan@osg.samsung.com>2018-01-09 08:32:13 +0100
commitfdf0812883b4b9da1ea6e04e26c5fa469bd8920a (patch)
treec603c5e602aaaa863d2e9482015aa6d826bb4c1a
parentd1823c6152ce4cfb4d143aa7b0620379ec333dc9 (diff)
ci: actually install systemd in the Ubuntu 17.10 Dockerfile
This allows us to build efl with systemd support on it and enables the newer Ubunutu version by default.
-rw-r--r--.ci/Dockerfile-Ubuntu17102
-rw-r--r--.travis.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.ci/Dockerfile-Ubuntu1710 b/.ci/Dockerfile-Ubuntu1710
index 23a134b598..2cdf1093ff 100644
--- a/.ci/Dockerfile-Ubuntu1710
+++ b/.ci/Dockerfile-Ubuntu1710
@@ -2,7 +2,7 @@ FROM ubuntu:17.10
2 2
3# Install 3# Install
4RUN apt-get update -y 4RUN apt-get update -y
5RUN apt-get install -y build-essential autoconf automake autopoint doxygen check luajit libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libluajit-5.1-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libvlc-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxine2-dev libxss-dev linux-tools-common libcurl4-openssl-dev 5RUN apt-get install -y build-essential autoconf automake autopoint doxygen check luajit libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libluajit-5.1-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libvlc-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxine2-dev libxss-dev linux-tools-common libcurl4-openssl-dev systemd
6 6
7# Build 7# Build
8RUN mkdir -p /src/ 8RUN mkdir -p /src/
diff --git a/.travis.yml b/.travis.yml
index 2f60f7ee8f..98f937f4cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_install:
13 13
14matrix: 14matrix:
15 include: 15 include:
16 - env: DISTRO=Ubuntu1704 16 - env: DISTRO=Ubuntu1710
17 - env: DISTRO=Fedora27 17 - env: DISTRO=Fedora27
18 - env: DISTRO=Debian91 18 - env: DISTRO=Debian91
19 - env: DISTRO=Archlinux 19 - env: DISTRO=Archlinux