Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pacman.rb: fix aarch64 & arm7hf #2017

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions lib/fpm/package/pacman.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,15 @@ def initialize(*args)
def architecture
case @architecture
when nil
return %x{uname -m}.chomp # default to current arch
when "amd64" # debian and pacman disagree on architecture names
return "x86_64"
return %x{uname -m}.chomp # default to current arch
when "amd64" # Debian uses amd64
return "x86_64" # Arch Linux uses x86_64
when "arm64" # Debian uses arm64
return "aarch64" # Arch Linux ARM uses aarch64
when "armhf" # Debian uses armhf
return "arm7hf" # Arch Linux ARM uses arm7hf
when "native"
return %x{uname -m}.chomp # 'native' is current arch
return %x{uname -m}.chomp # 'native' is the current arch
when "all", "any", "noarch"
return "any"
else
Expand Down