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

Add case for Ubuntu 16.04: it also requires 32-bit lib support #51

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add case for Ubuntu 16.04: it also requires 32-bit lib support #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions manifests/sdk.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,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') {
if $::lsbdistcodename == 'jessie' or $::lsbdistrelease == 14.04 {
ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
} else {
ensure_packages($::osfamily ? {
case $::lsbdistrelease {
'14.04','16.04': {
ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
}
default: {
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 => [],
})
}
})
}
}
}
}
}
3 changes: 2 additions & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
"operatingsystemrelease": [
"10.04",
"12.04",
"14.04"
"14.04",
"16.04"
]
},
{
Expand Down