Skip to content

Commit 42773f4

Browse files
committed
fix(adoptium): edge case when 32bit system on 64bit arm
1 parent a82e569 commit 42773f4

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

‎manifests/adoptium.pp‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,19 @@
9696
default => $facts['os']['architecture']
9797
}
9898

99-
case $os_architecture {
100-
'i386' : { $arch = 'x86-32' }
101-
'x86_64' : { $arch = 'x64' }
102-
'amd64' : { $arch = 'x64' }
103-
'aarch64' : { $arch = 'aarch64' }
104-
'arm64' : { $arch = 'aarch64' }
105-
'armv7l' : { $arch = 'arm' }
106-
default : {
107-
fail ("unsupported platform ${$os_architecture}")
99+
if $facts['platform'] =~ /arm/ {
100+
$arch = 'arm'
101+
} else {
102+
case $os_architecture {
103+
'i386' : { $arch = 'x86-32' }
104+
'x86_64' : { $arch = 'x64' }
105+
'amd64' : { $arch = 'x64' }
106+
'aarch64' : { $arch = 'aarch64' }
107+
'arm64' : { $arch = 'aarch64' }
108+
'armv7l' : { $arch = 'arm' }
109+
default : {
110+
fail("unsupported platform ${os_architecture}")
111+
}
108112
}
109113
}
110114

0 commit comments

Comments
 (0)