Commit c506e6b9 authored by Marin Jankovski's avatar Marin Jankovski

Remove platform check for the arm architecture.

parent be663069
......@@ -403,24 +403,7 @@ module Omnibus
when 'i686'
'i386'
when /armv\dl/
if Ohai['platform'] == 'raspbian' || Ohai['platform'] == 'ubuntu'
'armhf'
else
Ohai['kernel']['machine']
end
when 'armv7l'
# Omnibus Gitlab is being built for Raspberry Pi2 on Scaleway servers
# on Debian armv7l platform.
# More info on issue with building Raspberry Pi packages can be found at
# https://github.com/chef/omnibus/issues/352
# with similar fix in PR https://github.com/chef/omnibus/pull/474
# Since in our very specific case we are using Debian to build the package
# we need to check if platform is debian.
if Ohai['platform'] == 'raspbian' || Ohai['platform'] == 'debian'
'armhf'
else
'armv7l'
end
'armhf'
when 'aarch64'
# Debian prefers amd64 on ARMv8/AArch64 (64bit ARM) platforms
# see https://wiki.debian.org/Arm64Port
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment