Skip to content

Commit

Permalink
Merge pull request #76 from seth-priya/master
Browse files Browse the repository at this point in the history
Changes to support ppc64le

(cherry picked from commit f70f75f)
  • Loading branch information
simaishi committed Jul 21, 2020
1 parent a7ed302 commit d443e49
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ RUN npm install yarn -g

RUN echo "gem: --no-ri --no-rdoc --no-document" > /root/.gemrc

RUN if [ ${ARCH} = "ppc64le" ] ; then dnf -y install python2 ; fi

COPY . /build_scripts

ENTRYPOINT ["/build_scripts/container-assets/user-entrypoint.sh"]
3 changes: 3 additions & 0 deletions lib/manageiq/rpm_build/generate_core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ def build_service_ui
symlink_plugin_paths("manageiq-ui-service", ui_service_dir)

Dir.chdir(ui_service_dir) do
if RUBY_PLATFORM.match?(/powerpc64le/)
shell_cmd("npm config --global set python /usr/bin/python2.7")
end
shell_cmd("yarn install")
shell_cmd("yarn run available-languages")
shell_cmd("yarn run build")
Expand Down
6 changes: 6 additions & 0 deletions lib/manageiq/rpm_build/generate_gemset.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ def populate_gem_home

shell_cmd("gem env")
shell_cmd("gem install mime-types -v 2.6.1")

if RUBY_PLATFORM.match?(/powerpc64le/)
shell_cmd("gem install sassc -- --disable-march-tune-native")
shell_cmd("gem install unf_ext -v '0.0.7.2' -- --with-cxxflags='-fsigned-char'")
end

shell_cmd("bundle config set --local with qpid_proton systemd")
shell_cmd("bundle config set --local without 'test:development:metric_fu'")
shell_cmd("bundle _#{bundler_version}_ install --jobs #{cpus} --retry 3")
Expand Down
3 changes: 3 additions & 0 deletions rpm_spec/subpackages/manageiq-gemset
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ Requires: openscap-scanner
Requires: openssl
Requires: nodejs
Requires: sqlite

%ifnarch ppc64le
Requires: wmi
%endif

# For Miq IPMI (gems-pending)
Requires: OpenIPMI
Expand Down

0 comments on commit d443e49

Please sign in to comment.