Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ tasks:
- rm -f internal/infra/vm/runtimebin/propolis-runner
- rm -f internal/infra/vm/runtimebin/libkrun.so.1 internal/infra/vm/runtimebin/libkrun.1.dylib
- rm -f internal/infra/vm/runtimebin/libkrunfw.so.5 internal/infra/vm/runtimebin/libkrunfw.5.dylib
- rm -f internal/infra/vm/runtimebin/libepoxy.0.dylib internal/infra/vm/runtimebin/libvirglrenderer.1.dylib internal/infra/vm/runtimebin/libMoltenVK.dylib
- rm -f internal/infra/vm/runtimebin/VERSION internal/infra/vm/runtimebin/LICENSE-GPL
- rm -f internal/infra/vm/runtimebin/sha256sums.txt

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/sergi/go-diff v1.4.0
github.com/spf13/cobra v1.10.2
github.com/stacklok/propolis v0.0.18
github.com/stacklok/propolis v0.0.19
github.com/stacklok/toolhive v0.11.2
github.com/stacklok/toolhive-core v0.0.11
github.com/stretchr/testify v1.11.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -628,8 +628,8 @@ github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
github.com/stacklok/propolis v0.0.18 h1:WzAqNAg2sSd7q6bJZUfEMilkzy8q/R7Ii7VtlM29dAE=
github.com/stacklok/propolis v0.0.18/go.mod h1:C727m7ggN78TJ0vok+68e+YKnZMlm1L4GlY63P4IReA=
github.com/stacklok/propolis v0.0.19 h1:mUiS+xLNP3kqaRZsPK08+QqwLoTTcFqXCAs1xrTPndA=
github.com/stacklok/propolis v0.0.19/go.mod h1:C727m7ggN78TJ0vok+68e+YKnZMlm1L4GlY63P4IReA=
github.com/stacklok/toolhive v0.11.2 h1:6HxvqhBlpgyL8sG351wWFIWzPx11H4krTYr2Xu6ojqM=
github.com/stacklok/toolhive v0.11.2/go.mod h1:LU04sTTWLQMLYnNohJEAiOgl0Ipn7l38aome/rKfmh4=
github.com/stacklok/toolhive-core v0.0.11 h1:tFLwSHE/AUikLYu6x7N9iTfMUR9eJS9JAVzvoPU+yrI=
Expand Down
23 changes: 22 additions & 1 deletion internal/infra/vm/runtimebin/embed_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,33 @@

package runtimebin

import _ "embed"
import (
_ "embed"

"github.com/stacklok/propolis/extract"
)

//go:embed propolis-runner
var runner []byte

//go:embed libkrun.1.dylib
var libkrun []byte

//go:embed libepoxy.0.dylib
var libepoxy []byte

//go:embed libvirglrenderer.1.dylib
var libvirglrenderer []byte

//go:embed libMoltenVK.dylib
var libMoltenVK []byte

const available = true

func extraLibs() []extract.File {
return []extract.File{
{Name: "libepoxy.0.dylib", Content: libepoxy, Mode: 0o755},
{Name: "libvirglrenderer.1.dylib", Content: libvirglrenderer, Mode: 0o755},
{Name: "libMoltenVK.dylib", Content: libMoltenVK, Mode: 0o755},
}
}
10 changes: 9 additions & 1 deletion internal/infra/vm/runtimebin/embed_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@

package runtimebin

import _ "embed"
import (
_ "embed"

"github.com/stacklok/propolis/extract"
)

//go:embed propolis-runner
var runner []byte
Expand All @@ -14,3 +18,7 @@ var runner []byte
var libkrun []byte

const available = true

func extraLibs() []extract.File {
return nil
}
6 changes: 6 additions & 0 deletions internal/infra/vm/runtimebin/embed_stub.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@

package runtimebin

import "github.com/stacklok/propolis/extract"

var (
runner []byte
libkrun []byte
)

const available = false

func extraLibs() []extract.File {
return nil
}
2 changes: 1 addition & 1 deletion internal/infra/vm/runtimebin/runtimebin.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ func RuntimeSource() extract.Source {
if !available {
return nil
}
return extract.RuntimeBundle(Version, runner, libkrun)
return extract.RuntimeBundle(Version, runner, libkrun, extraLibs()...)
}
Loading