Simplify fork: remove osbuild complexity, add native Debian tools, integrate GRUB bootloader installation
Some checks failed
particle-os CI / Test particle-os (push) Failing after 1s
particle-os CI / Integration Test (push) Has been skipped
particle-os CI / Security & Quality (push) Failing after 1s
Test particle-os Basic Functionality / test-basic (push) Failing after 1s
Tests / test (1.21.x) (push) Failing after 1s
Tests / test (1.22.x) (push) Failing after 1s
particle-os CI / Build and Release (push) Has been skipped
Some checks failed
particle-os CI / Test particle-os (push) Failing after 1s
particle-os CI / Integration Test (push) Has been skipped
particle-os CI / Security & Quality (push) Failing after 1s
Test particle-os Basic Functionality / test-basic (push) Failing after 1s
Tests / test (1.21.x) (push) Failing after 1s
Tests / test (1.22.x) (push) Failing after 1s
particle-os CI / Build and Release (push) Has been skipped
This commit is contained in:
parent
ab30e683d1
commit
9a810d3d27
7 changed files with 402 additions and 49 deletions
|
|
@ -30,7 +30,7 @@ import (
|
|||
|
||||
"github.com/particle-os/debian-bootc-image-builder/bib/internal/imagetypes"
|
||||
"github.com/particle-os/debian-bootc-image-builder/bib/internal/solver"
|
||||
"github.com/particle-os/debian-bootc-image-builder/bib/internal/debian-patch"
|
||||
debianpatch "github.com/particle-os/debian-bootc-image-builder/bib/internal/debian-patch"
|
||||
podman_container "github.com/osbuild/images/pkg/bib/container"
|
||||
"github.com/osbuild/images/pkg/bib/osinfo"
|
||||
|
||||
|
|
@ -439,23 +439,13 @@ func cmdBuild(cmd *cobra.Command, args []string) error {
|
|||
outputDir, _ := cmd.Flags().GetString("output")
|
||||
targetArch, _ := cmd.Flags().GetString("target-arch")
|
||||
progressType, _ := cmd.Flags().GetString("progress")
|
||||
useDebos, _ := cmd.Flags().GetBool("use-debos")
|
||||
useOsbuild, _ := cmd.Flags().GetBool("use-osbuild")
|
||||
// TODO: Implement debos and osbuild backend selection
|
||||
// useDebos, _ := cmd.Flags().GetBool("use-debos")
|
||||
// useOsbuild, _ := cmd.Flags().GetBool("use-osbuild")
|
||||
|
||||
// Determine which backend to use
|
||||
// Default to debos for Debian-based images, osbuild for others
|
||||
// Can be overridden with explicit flags
|
||||
backendChoice := "auto"
|
||||
if useDebos {
|
||||
backendChoice = "debos"
|
||||
} else if useOsbuild {
|
||||
backendChoice = "osbuild"
|
||||
}
|
||||
|
||||
// If debos is explicitly requested or auto-detected, use debos backend
|
||||
if backendChoice == "debos" || (backendChoice == "auto" && isDebianBasedImage(args[0])) {
|
||||
return cmdBuildDebos(cmd, args)
|
||||
}
|
||||
// For now, always use osbuild backend since debos is not implemented
|
||||
// TODO: Implement debos backend support
|
||||
|
||||
logrus.Debug("Validating environment")
|
||||
if err := setup.Validate(targetArch); err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue