particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

koji: use the host arch as the buildroot and image arch in CGImport metadata

Browse source 
As suggested by brew maintainers Tomáš Kopeček and Lubomír Sedlář.
This commit is contained in:
Ondřej Budai 2020-10-22 13:07:50 +02:00 • committed by Tom Gundersen
parent c64d46416e
commit a0832d22e0
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/osbuild-worker/main.go
View file

@ -257,7 +257,7 @@ func RunJob(job worker.Job, store string, kojiServers map[string]koji.GSSAPICred
ID: 1,
Host: koji.Host{
Os: hostOS,
Arch: "noarch",
Arch: common.CurrentArch(),
},
ContentGenerator: koji.ContentGenerator{
Name: "osbuild",
@ -265,7 +265,7 @@ func RunJob(job worker.Job, store string, kojiServers map[string]koji.GSSAPICred
},
Container: koji.Container{
Type: "nspawn",
Arch: "noarch",
Arch: common.CurrentArch(),
},
Tools: []koji.Tool{},
RPMs: osbuildStagesToRPMs(result.Build.Stages),
@ -276,7 +276,7 @@ func RunJob(job worker.Job, store string, kojiServers map[string]koji.GSSAPICred
BuildRootID: 1,
Filename: options.Filename,
FileSize: uint64(filesize),
Arch: "noarch",
Arch: common.CurrentArch(),
ChecksumType: "md5",
MD5: hash,
Type: "image",