Skip to content
This repository was archived by the owner on Feb 13, 2024. It is now read-only.

Support for Ubuntu Trusty, Debian Jessie, Ubuntu Xenial #50

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support for Ubuntu Trusty, Debian Jessie, Ubuntu Xenial #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da76da7
Support for Ubuntu Trusty, Debian Jessie, Ubuntu Xenial
TheMykola Oct 6, 2016
ad4c540
Splitting long lines
TheMykola Oct 6, 2016
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
28 changes: 15 additions & 13 deletions manifests/sdk.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@

case $::kernel {
'Linux': {
$unpack_command = "/bin/tar -xvf ${android::paths::archive} --no-same-owner --no-same-permissions && chmod -R a+rx ${android::paths::sdk_home}"
$unpack_command = "/bin/tar -xvf ${android::paths::archive} \
--no-same-owner --no-same-permissions && chmod -R a+rx ${android::paths::sdk_home}"
}
'Darwin': {
$unpack_command = "/usr/bin/unzip ${android::paths::archive} && chmod -R a+rx ${android::paths::sdk_home}"
$unpack_command = "/usr/bin/unzip ${android::paths::archive} \
&& chmod -R a+rx ${android::paths::sdk_home}"
}
default: {
fail("Unsupported Kernel: ${::kernel} operatingsystem: ${::operatingsystem}")
Expand Down Expand Up @@ -55,16 +57,16 @@

# For 64bit systems, we need to install some 32bit libraries for the SDK
# to work.
if ($::kernel == 'Linux') and ($::architecture == 'x86_64' or $::architecture == 'amd64') and $::lsbdistrelease != '14.04' {
ensure_packages($::osfamily ? {
# list 64-bit version and use latest for installation too so that the same version is applied to both
'RedHat' => ['glibc.i686','zlib.i686','libstdc++.i686','zlib','libstdc++'],
'Debian' => ['ia32-libs'],
default => [],
})
}

if $::lsbdistrelease == '14.04' {
ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
if ($::kernel == 'Linux') and ($::architecture == 'x86_64' or $::architecture == 'amd64') {
if $::lsbdistcodename == 'jessie' or $::lsbmajdistrelease >= 14 {
ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
} else {
ensure_packages($::osfamily ? {
# list 64-bit version and use latest for installation too so that the same version is applied to both
'RedHat' => ['glibc.i686','zlib.i686','libstdc++.i686','zlib','libstdc++'],
'Debian' => ['ia32-libs'],
default => [],
})
}
}
}