Remove: Simple boot modes

Author: Hayao0819

.gitignore

@@ -1 +1,3 @@
 /work
+/out
+.DS_Store

alteriso5/cmd/build/build.go

@@ -3,7 +3,10 @@ package build
 import (
 	"fmt"
 	"os"
+	"path"
 
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/config"
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work"
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/check"
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	"github.com/spf13/cobra"
@@ -15,20 +18,42 @@ func Cmd() *cobra.Command {
 		Short: "Build an ISO image",
 		RunE: func(cmd *cobra.Command, args []string) error {
 
+			// Handle signals
 			utils.OnSignal(func(s os.Signal) {
 				fmt.Println("Received signal:", s)
 				os.Exit(1)
 			}, os.Interrupt)
 
+			// Check dependencies
 			if err := utils.CallCmd(cmd, *check.Cmd()); err != nil {
 				return err
 			}
 
-			if err := build(); err != nil {
+			// Get current working directory
+			current, err := os.Getwd()
+			if err != nil {
 				return err
 			}
+			workDir := path.Join(current, "work")
+			outDir := path.Join(current, "out")
+
+			// Prepare work environment
+			work, err := work.New(workDir)
+			if err != nil {
+				return err
+			}
+
+			// Dummy profile
+			profile := config.Profile{
+				Base:       path.Join(current, "profile"),
+				InstallDir: "alter",
+				BootModes:  []string{"SysLinux"},
+			}
+
+			// TODO: Add more targets
+			target := config.NewTarget("x86_64", outDir)
+			return work.Build(profile, target, cmd)
 
-			return nil
 		},
 	}
 

alteriso5/cmd/build/cmd.go

@@ -5,7 +5,7 @@ import (
 )
 
 // SysLinux MBR El Torito
-func (o *xorriso) setArgsForSysLinuxElTorito() {
+func (o *xorriso) SetArgsForSysLinuxElTorito() {
 	arg := xorrisoArg{
 		name: "SysLinuxEltorito",
 	}
@@ -17,7 +17,7 @@ func (o *xorriso) setArgsForSysLinuxElTorito() {
 	o.addArg(&arg)
 }
 
-func (o *xorriso) setArgsForSysLinuxMBRBios() {
+func (o *xorriso) SetArgsForSysLinuxMBRBios() {
 
 	arg := xorrisoArg{
 		name: "SysLinuxMBRBios",

alteriso5/cmd/build/work/boot/func.go

@@ -3,6 +3,7 @@ package boot
 import (
 	"os"
 	"os/exec"
+	"path"
 )
 
 var Xorriso = xorriso{}
@@ -43,14 +44,17 @@ func (o *xorriso) addArg(arg *xorrisoArg) {
 }
 
 func (o *xorriso) defaultArgs() *xorrisoArg {
+
+	out := path.Join(o.out, "alterlinux.iso")
+
 	d := []string{
 		"-as", "mkisofs",
 		"-iso-level", "3",
 		"-full-iso9660-filenames",
 		"-joliet",
 		"-joliet-long",
 		"-rational-rock",
-		"--output", o.out,
+		"--output", out,
 		o.fsDir,
 	}
 	return &xorrisoArg{

alteriso5/cmd/build/work/boot/mode.go

@@ -1,18 +1,22 @@
 package work
 
-import "github.com/FascodeNet/alterlinux/alteriso5/cmd/build/config"
+import (
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/config"
+	"github.com/spf13/cobra"
+)
 
-func (work Work) Build(p config.Profile, t config.Target) error {
+func (work Work) Build(p config.Profile, t config.Target, c *cobra.Command) error {
 
 	work.profile = &p
 	work.target = &t
+	work.Cmd = c
 
 	tasks := []*BuildTask{
 		makeBaseDirs,
 		makeChroot,
 		makeBootModes,
 		makeAirootfs,
-		makeBoot,
+		makeOutFiles,
 	}
 
 	for _, t := range tasks {

alteriso5/cmd/build/work/boot/syslinux.go

@@ -37,21 +37,30 @@ var makeChroot *BuildTask = NewBuildTask("makeChroot", func(work *Work) error {
 })
 
 var makeBootModes *BuildTask = NewBuildTask("makeBootModes", func(w *Work) error {
-	slog.Debug("Setting up SYSLINUX for BIOS booting from a disk...")
 
-	isoSyslinuxDir := path.Join(w.Base, "iso", "boot", "syslinux")
+	makeSysLinux := NewBuildTask("makeSysLinux", func(w *Work) error {
 
-	if err := utils.MkdirsAll(isoSyslinuxDir); err != nil {
-		return err
-	}
+		slog.Debug("Setting up SYSLINUX for BIOS booting from a disk...")
 
-	profileSysLinuxDir := path.Join(w.profile.Base, "syslinux")
+		isoSyslinuxDir := path.Join(w.Base, "iso", "boot", "syslinux")
 
-	if err := cp.Copy(profileSysLinuxDir, isoSyslinuxDir); err != nil {
-		return err
-	}
+		if err := utils.MkdirsAll(isoSyslinuxDir); err != nil {
+			return err
+		}
 
-	return nil
+		profileSysLinuxDir := path.Join(w.profile.Base, "syslinux")
+
+		if err := cp.Copy(profileSysLinuxDir, isoSyslinuxDir); err != nil {
+			return err
+		}
+
+		boot.Xorriso.SetArgsForSysLinuxElTorito()
+		boot.Xorriso.SetArgsForSysLinuxElTorito()
+
+		return nil
+	})
+
+	return makeSysLinux.Run(w)
 })
 
 var makeAirootfs *BuildTask = NewBuildTask("makeAirootfs", func(w *Work) error {
@@ -68,13 +77,6 @@ var makeAirootfs *BuildTask = NewBuildTask("makeAirootfs", func(w *Work) error {
 	return sqfs.Build()
 })
 
-var makeBoot *BuildTask = NewBuildTask("makeBoot", func(w *Work) error {
-
-	boot.SysLinux.SetInstall(func() error {
-		return nil
-	})
-
-	modes := boot.GetModesByName(w.profile.BootModes...)
-	return boot.Setup(&modes)
-
+var makeOutFiles *BuildTask = NewBuildTask("makeOutFiles", func(w *Work) error {
+	return boot.Xorriso.Build(w.Base, w.target.Out)
 })