Skip to content

Commit

Permalink
Added support for building for Ubuntu 18.04 targets
Browse files Browse the repository at this point in the history
Ubuntu 18.04 (Bionic) uses libcurl4 instead fo libcurl3 so we
special-case the dependencies to ensure that for this version, we use
the former.
  • Loading branch information
sgnn7 committed Apr 30, 2018
1 parent 65e75ca commit 729079c
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions build_mesos
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ function init_scripts {
mkdir -p usr/lib/systemd/system mkdir -p usr/lib/systemd/system
cp "$this"/systemd/master.systemd usr/lib/systemd/system/mesos-master.service cp "$this"/systemd/master.systemd usr/lib/systemd/system/mesos-master.service
cp "$this"/systemd/slave.systemd usr/lib/systemd/system/mesos-slave.service ;; cp "$this"/systemd/slave.systemd usr/lib/systemd/system/mesos-slave.service ;;
debian/8*|debian/9*|ubuntu/15*|ubuntu/16*|ubuntu/17*) debian/8*|debian/9*|ubuntu/15*|ubuntu/16*|ubuntu/17*|ubuntu/18*)
mkdir -p lib/systemd/system mkdir -p lib/systemd/system
cp "$this"/systemd/master.systemd lib/systemd/system/mesos-master.service cp "$this"/systemd/master.systemd lib/systemd/system/mesos-master.service
cp "$this"/systemd/slave.systemd lib/systemd/system/mesos-slave.service ;; cp "$this"/systemd/slave.systemd lib/systemd/system/mesos-slave.service ;;
Expand Down Expand Up @@ -342,12 +342,18 @@ function find_gem_bin {
} }


function deb_ { function deb_ {
local libcurl_package
case "$linux" in
ubuntu/18*) libcurl_package="libcurl4" ;;
*) libcurl_package="libcurl3" ;;
esac

local opts=( -t deb local opts=( -t deb
--deb-recommends zookeeper --deb-recommends zookeeper
--deb-recommends zookeeperd --deb-recommends zookeeperd
--deb-recommends zookeeper-bin --deb-recommends zookeeper-bin
-d 'java-runtime-headless | java2-runtime-headless | default-jre' -d 'java-runtime-headless | java2-runtime-headless | default-jre'
-d libcurl3 -d $libcurl_package
-d libevent-dev -d libevent-dev
-d libsvn1 -d libsvn1
-d libsasl2-modules -d libsasl2-modules
Expand Down

0 comments on commit 729079c

Please sign in to comment.