Skip to content

Commit

Permalink
Add Ubuntu 17.10 and remove 16.10 (EOL) for install-build-deps.sh
Browse files Browse the repository at this point in the history
Bug: 
Change-Id: If2a9409b0f1db115e67cb63d7adea4634ab574e9
Reviewed-on: https://chromium-review.googlesource.com/736729
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512425}
  • Loading branch information
marcinwiacek authored and Commit Bot committed Oct 30, 2017
1 parent be56a2a commit 38933dd
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions build/install-build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@ fi

distro_codename=$(lsb_release --codename --short)
distro_id=$(lsb_release --id --short)
supported_codenames="(trusty|xenial|yakkety|zesty)"
supported_codenames="(trusty|xenial|zesty|artful)"
supported_ids="(Debian)"
if [ 0 -eq "${do_unsupported-0}" ] && [ 0 -eq "${do_quick_check-0}" ] ; then
if [[ ! $distro_codename =~ $supported_codenames &&
! $distro_id =~ $supported_ids ]]; then
echo -e "ERROR: The only supported distros are\n" \
"\tUbuntu 14.04 (trusty)\n" \
"\tUbuntu 16.04 (xenial)\n" \
"\tUbuntu 16.10 (yakkety)\n" \
"\tUbuntu 17.04 (zesty)\n" \
"\tUbuntu 17.10 (artful)\n" \
"\tDebian 8 (jessie) or later" >&2
exit 1
fi
Expand Down Expand Up @@ -292,6 +292,7 @@ dbg_list="\
libxdamage1-dbg
libxdmcp6-dbg
libxext6-dbg
libxfixes3-dbg
libxi6-dbg
libxinerama1-dbg
libxrandr2-dbg
Expand All @@ -300,10 +301,6 @@ dbg_list="\
zlib1g-dbg
"

if [[ ! $distro_codename =~ "yakkety" ]]; then
dbg_list="${dbg_list} libxfixes3-dbg"
fi

# Find the proper version of libstdc++6-4.x-dbg.
if [ "x$distro_codename" = "xtrusty" ]; then
dbg_list="${dbg_list} libstdc++6-4.8-dbg"
Expand Down Expand Up @@ -364,7 +361,7 @@ case $distro_codename in
arm_list+=" g++-4.8-multilib-arm-linux-gnueabihf
gcc-4.8-multilib-arm-linux-gnueabihf"
;;
xenial|yakkety|zesty)
xenial|zesty|artful)
arm_list+=" g++-5-multilib-arm-linux-gnueabihf
gcc-5-multilib-arm-linux-gnueabihf
gcc-arm-linux-gnueabihf"
Expand Down Expand Up @@ -479,7 +476,9 @@ if package_exists fonts-indic; then
else
dev_list="${dev_list} ttf-indic-fonts"
fi
if package_exists php7.0-cgi; then
if package_exists php7.1-cgi; then
dev_list="${dev_list} php7.1-cgi libapache2-mod-php7.1"
elif package_exists php7.0-cgi; then
dev_list="${dev_list} php7.0-cgi libapache2-mod-php7.0"
else
dev_list="${dev_list} php5-cgi libapache2-mod-php5"
Expand Down

0 comments on commit 38933dd

Please sign in to comment.