extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-01-05 05:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: make arm .deb packages be armel architecture

Browse Source 
This is as recommended by debian.

Fixes #5107
This commit is contained in:
Nick Craig-Wood 2021-03-15 16:55:56 +00:00
parent 3cf6ea848b
commit a5a2e02ea8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/cross-compile.go
View File

@ -161,7 +161,15 @@ func buildZip(dir string) string {
// Build .deb and .rpm packages // Build .deb and .rpm packages
// //
// It returns a list of artifacts it has made // It returns a list of artifacts it has made
func buildDebAndRpm(dir, version, goarch string) []string { func buildDebAndRpm(dir, version, goarchBuild string) []string {
goarch := stripVersion(goarchBuild)
// Base ARM build we will mark as "arm5" so nfpm puts the
// architecture in as armel not armhf
if goarchBuild == "arm" {
goarch = "arm5"
}
// Make internal version number acceptable to .deb and .rpm // Make internal version number acceptable to .deb and .rpm
pkgVersion := version[1:] pkgVersion := version[1:]
pkgVersion = strings.Replace(pkgVersion, "β", "-beta", -1) pkgVersion = strings.Replace(pkgVersion, "β", "-beta", -1)
@ -376,7 +384,7 @@ func compileArch(version, goos, goarch, dir string) bool {
artifacts := []string{buildZip(dir)} artifacts := []string{buildZip(dir)}
// build a .deb and .rpm if appropriate // build a .deb and .rpm if appropriate
if goos == "linux" { if goos == "linux" {
artifacts = append(artifacts, buildDebAndRpm(dir, version, stripVersion(goarch))...) artifacts = append(artifacts, buildDebAndRpm(dir, version, goarch)...)
} }
if *copyAs != "" { if *copyAs != "" {
for _, artifact := range artifacts { for _, artifact := range artifacts {