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

main: tweak how ibcli determines if bootstraping is needed

Browse source 
This simplifies the way that ibcli determines if the manifest
needs a bootstrap stage or not. The logic is simple:
- when doing `image-builder manifest` we never include one
- when doing `image-builder build --arch` we add one if the
  target arch and host arch differ

Instead of passing a callback this is now just a simple bool
option. Thanks to Achilleas for suggesting this.

Co-Authored-by: Achilleas Koutsou <achilleas@koutsou.net>
This commit is contained in:
Michael Vogt 2025-03-25 12:58:30 +01:00
parent d41bd9aa5b
commit fe713a0995
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cmd/image-builder/main.go
View file

@ -81,7 +81,14 @@ func ostreeImageOptions(cmd *cobra.Command) (*ostree.ImageOptions, error) {
}, nil
}
func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []string, w io.Writer, needBootstrap func(string) bool) (*imagefilter.Result, error) {
type cmdManifestWrapperOptions struct {
useBootstrapIfNeeded bool
}
func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []string, w io.Writer, wrapperOpts *cmdManifestWrapperOptions) (*imagefilter.Result, error) {
if wrapperOpts == nil {
wrapperOpts = &cmdManifestWrapperOptions{}
}
dataDir, err := cmd.Flags().GetString("data-dir")
if err != nil {
return nil, err
@ -170,9 +177,7 @@ func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []st
ForceRepos: forceRepos,
}
if needBootstrap != nil {
opts.UseBootstrapContainer = needBootstrap(img.Arch.Name())
}
opts.UseBootstrapContainer = wrapperOpts.useBootstrapIfNeeded && (img.Arch.Name() != arch.Current().String())
if opts.UseBootstrapContainer {
fmt.Fprintf(os.Stderr, "WARNING: using experimental cross-architecture building to build %q\n", img.Arch.Name())
}
@ -227,6 +232,7 @@ func cmdBuild(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
// XXX: check env here, i.e. if user is root and osbuild is installed
pbar, err := progressFromCmd(cmd)
if err != nil {
@ -242,10 +248,10 @@ func cmdBuild(cmd *cobra.Command, args []string) error {
}()
var mf bytes.Buffer
// XXX: check env here, i.e. if user is root and osbuild is installed
res, err := cmdManifestWrapper(pbar, cmd, args, &mf, func(archStr string) bool {
return archStr != arch.Current().String()
})
opts := &cmdManifestWrapperOptions{
useBootstrapIfNeeded: true,
}
res, err := cmdManifestWrapper(pbar, cmd, args, &mf, opts)
if err != nil {
return err
}