internal/rosa: expose supported architectures
Test / Create distribution (push) Successful in 53s
Test / Sandbox (push) Successful in 2m57s
Test / ShareFS (push) Successful in 3m56s
Test / Hakurei (push) Successful in 4m3s
Test / Sandbox (race detector) (push) Successful in 5m33s
Test / Hakurei (race detector) (push) Successful in 6m41s
Test / Flake checks (push) Successful in 1m12s
Test / Create distribution (push) Successful in 53s
Test / Sandbox (push) Successful in 2m57s
Test / ShareFS (push) Successful in 3m56s
Test / Hakurei (push) Successful in 4m3s
Test / Sandbox (race detector) (push) Successful in 5m33s
Test / Hakurei (race detector) (push) Successful in 6m41s
Test / Flake checks (push) Successful in 1m12s
This information is useful to external tooling and makes a lot more sense in this package than cmd/mbf. This change also fixes non-native artifact resolution during clean. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
+3
-19
@@ -8,7 +8,6 @@ import (
|
||||
"testing"
|
||||
|
||||
"hakurei.app/check"
|
||||
"hakurei.app/container"
|
||||
"hakurei.app/internal/pkg"
|
||||
"hakurei.app/internal/rosa"
|
||||
"hakurei.app/message"
|
||||
@@ -111,24 +110,9 @@ func (cache *cache) open() (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
pkg.RegisterArch("riscv64", container.BinfmtEntry{
|
||||
Offset: 0,
|
||||
Magic: "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00",
|
||||
Mask: "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff",
|
||||
Interpreter: pathname.Append(
|
||||
"system/bin",
|
||||
"qemu-riscv64",
|
||||
),
|
||||
})
|
||||
pkg.RegisterArch("arm64", container.BinfmtEntry{
|
||||
Offset: 0,
|
||||
Magic: "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00",
|
||||
Mask: "\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff",
|
||||
Interpreter: pathname.Append(
|
||||
"system/bin",
|
||||
"qemu-aarch64",
|
||||
),
|
||||
})
|
||||
for arch, entry := range rosa.Arches(pathname) {
|
||||
pkg.RegisterArch(arch, entry)
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
|
||||
+10
-4
@@ -883,13 +883,19 @@ func main() {
|
||||
func([]string) error {
|
||||
return cm.Do(func(cache *pkg.Cache) error {
|
||||
t := rosa.Native().Clone().Std()
|
||||
a := t.Append(nil, t.CollectAll()...)
|
||||
for arch := range pkg.Arch() {
|
||||
handles := t.CollectAll()
|
||||
|
||||
flags := t.Flags()
|
||||
a := t.Append(nil, handles...)
|
||||
for arch := range rosa.Arches(nil) {
|
||||
if arch == runtime.GOARCH {
|
||||
continue
|
||||
}
|
||||
t.DropCaches(arch, t.Flags())
|
||||
a = t.Append(a, t.CollectAll()...)
|
||||
|
||||
t.DropCaches(arch, rosa.OptLLVMNoLTO|rosa.OptSkipCheck)
|
||||
a = t.Append(a, handles...)
|
||||
t.DropCaches(arch, flags)
|
||||
a = t.Append(a, handles...)
|
||||
}
|
||||
|
||||
ids, checksums, err := cache.Clean(
|
||||
|
||||
Reference in New Issue
Block a user