Skip to content

Commit

Permalink
fix: mips architecture
Browse files Browse the repository at this point in the history
  • Loading branch information
caarlos0 committed May 18, 2023
1 parent dce0853 commit c20618c
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 9 deletions.
7 changes: 7 additions & 0 deletions apk/apk.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ func ensureValidArch(info *nfpm.Info) *nfpm.Info {
info.Arch = info.APK.Arch
} else if arch, ok := archToAlpine[info.Arch]; ok {
info.Arch = arch
} else {
for k, v := range archToAlpine {
if strings.HasPrefix(info.Arch, k) {
info.Arch = v
break
}
}
}

return info
Expand Down
7 changes: 7 additions & 0 deletions arch/arch.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ func ensureValidArch(info *nfpm.Info) *nfpm.Info {
info.Arch = info.ArchLinux.Arch
} else if arch, ok := archToArchLinux[info.Arch]; ok {
info.Arch = arch
} else {
for k, v := range archToArchLinux {
if strings.HasPrefix(info.Arch, k) {
info.Arch = v
break
}
}
}

return info
Expand Down
7 changes: 7 additions & 0 deletions deb/deb.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ func ensureValidArch(info *nfpm.Info) *nfpm.Info {
info.Arch = info.Deb.Arch
} else if arch, ok := archToDebian[info.Arch]; ok {
info.Arch = arch
} else {
for k, v := range archToDebian {
if strings.HasPrefix(info.Arch, k) {
info.Arch = v
break
}
}
}

return info
Expand Down
26 changes: 17 additions & 9 deletions rpm/rpm.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,16 @@ type RPM struct{}
// https://docs.fedoraproject.org/ro/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch01s03.html
// nolint: gochecknoglobals
var archToRPM = map[string]string{
"all": "noarch",
"amd64": "x86_64",
"386": "i386",
"arm64": "aarch64",
"arm5": "armv5tel",
"arm6": "armv6hl",
"arm7": "armv7hl",
"mips": "mips",
"mipsle": "mipsel",
"all": "noarch",
"amd64": "x86_64",
"386": "i386",
"arm64": "aarch64",
"arm5": "armv5tel",
"arm6": "armv6hl",
"arm7": "armv7hl",
"mips": "mips",
"mipsle": "mipsel",
"mipsle64": "mips64el",
// TODO: other arches

This comment has been minimized.

Copy link
@ovidiuvio

ovidiuvio May 18, 2023

we probably need mips64 here as well

This comment has been minimized.

Copy link
@caarlos0

caarlos0 May 18, 2023

Author Member

yes, do you know what is the correspondent arch name in rpm?

}

Expand All @@ -74,6 +75,13 @@ func ensureValidArch(info *nfpm.Info) *nfpm.Info {
info.Arch = info.RPM.Arch
} else if arch, ok := archToRPM[info.Arch]; ok {
info.Arch = arch
} else {
for k, v := range archToRPM {
if strings.HasPrefix(info.Arch, k) {
info.Arch = v
break
}
}
}

return info
Expand Down

0 comments on commit c20618c

Please sign in to comment.