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

Ubuntu doesn't use ia32-libs from 14.04 #49

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

Ubuntu doesn't use ia32-libs from 14.04 #49

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a88e20f
Ubuntu doesn't use ia32-libs from 14.04
cbalfour Jul 26, 2016
1a25bdd
Fixed spacing and quoting issues highlighted by tests
cbalfour Jul 27, 2016
6d5fede
Split unpack command over multiple lines to avoid lint warnings
cbalfour Jul 27, 2016
89cc528
Manually convert float to int
cbalfour Jul 27, 2016
c29adee
Replaced double quotes with single quotes
cbalfour Jul 27, 2016
a7e2077
Convert string to integer
cbalfour Jul 27, 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
29 changes: 17 additions & 12 deletions manifests/sdk.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@

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 +58,18 @@

# 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') {
$lsbdistrelease_major = inline_template('<%= @lsbdistrelease.to_i %>') + 0
if $::lsbdistcodename == 'jessie' or $lsbdistrelease_major >= 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 => [],
})
}
}
}