Add: make efibootimg

Author: Hayao0819

alteriso5/cmd/build/cmd.go

@@ -8,6 +8,7 @@ import (
 	"github.com/FascodeNet/alterlinux/alteriso5/config"
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	"github.com/FascodeNet/alterlinux/alteriso5/work"
+	"github.com/Hayao0819/nahi/cobrautils"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +26,7 @@ func Cmd() *cobra.Command {
 			}, os.Interrupt)
 
 			// Check dependencies
-			if err := utils.CallCmd(cmd, *check.Cmd()); err != nil {
+			if err := cobrautils.CallCmd(cmd, *check.Cmd()); err != nil {
 				return err
 			}
 

alteriso5/utils/cobra.go

@@ -2,13 +2,7 @@ package utils
 
 import "github.com/spf13/cobra"
 
-func CallCmd(me *cobra.Command, target cobra.Command, args ...string) error {
-	target.SetOut(me.OutOrStdout())
-	target.SetErr(me.OutOrStderr())
-	target.SetIn(me.InOrStdin())
-	target.SetArgs(args)
-	return target.Execute()
-}
+
 
 func WithParentPersistentPreRunE(f func(cmd *cobra.Command, args []string) error) func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, args []string) error {

alteriso5/utils/dir.go

@@ -0,0 +1,14 @@
+package utils
+
+import (
+	"os"
+	"os/exec"
+)
+
+func CommandWithStdio(cmd string, args ...string) *exec.Cmd {
+	c := exec.Command(cmd, args...)
+	c.Stdout = os.Stdout
+	c.Stderr = os.Stderr
+	c.Stdin = os.Stdin
+	return c
+}

alteriso5/utils/exec.go

@@ -1,6 +1,34 @@
 package boot
 
+import (
+	"fmt"
+	"log/slog"
+
+	"github.com/FascodeNet/alterlinux/alteriso5/utils"
+)
+
+func byteToKib(b int64) int64 {
+	return b / 1024
+}
+
+func mibToKiB(m int64) int64 {
+	return m * 1024
+}
+
 // TODO: Implement MakeEfiBootImg
 func MakeEfiBootImg(dest string, size int64) error {
+	sizeMib := mibToKiB((byteToKib(size) + 1024) / 1024)
+	slog.Debug("Creating EFI boot image...", "dest", dest, "size", sizeMib)
+
+	mkfs := utils.CommandWithStdio("mkfs.fat", "-C", "-n", "ALTERISO_EFI", dest, fmt.Sprint(sizeMib))
+	if err := mkfs.Run(); err != nil {
+		return err
+	}
+
+	mmd := utils.CommandWithStdio("mmd", "-i", dest, "::/EFI", "::/EFI/BOOT")
+	if err := mmd.Run(); err != nil {
+		return err
+	}
+
 	return nil
 }

alteriso5/work/boot/efibootimg.go

@@ -0,0 +1 @@
+package work

alteriso5/work/task-bootmode-uefi-grub.go

@@ -11,7 +11,7 @@ import (
 )
 
 // Prepare configuration files for systemd-boot
-var makeCommonSystemdBootConfig *BuildTask = NewBuildTask("makeCommonSystemdBootConfig", func(w Work) error {
+var makeCommonSystemdBoot *BuildTask = NewBuildTask("makeCommonSystemdBoot", func(w Work) error {
 	var total int64 = 0
 	// TODO: Get ucode list
 
@@ -86,8 +86,18 @@ var makeCommonSystemdBootConfig *BuildTask = NewBuildTask("makeCommonSystemdBoot
 	return boot.MakeEfiBootImg(path.Join(w.Base, "efiboot.img"), total)
 })
 
-var makeCommonSystemdBoot *BuildTask = NewBuildTask("makeCommonSystemdBoot", func(w Work) error {
+var makeCommonSystemdBootConfig *BuildTask = NewBuildTask("makeCommonSystemdBootConfig", func(w Work) error {
+	workLoaderDir := path.Join(w.Base, w.target.Arch, "loader")
+	if err := os.MkdirAll(path.Join(workLoaderDir, "entries"), 0755); err != nil {
+		return err
+	}
+
+	// cpTasks := utils.CopyTask{
+
+	// }
+
 	return nil
+
 })
 
 var makeUefiX64SystemdBootEsp *BuildTask = NewBuildTask("makeUefiX64SystemdBootEsp", func(w Work) error {

alteriso5/work/task-bootmode-uefi.go …riso5/work/task-bootmode-uefi-systemd.goalteriso5/work/task-bootmode-uefi.go renamed to alteriso5/work/task-bootmode-uefi-systemd.go alteriso5/work/task-bootmode-uefi.go renamed to alteriso5/work/task-bootmode-uefi-systemd.go

@@ -4,7 +4,7 @@ import (
 	"log/slog"
 	"path"
 
-	"github.com/FascodeNet/alterlinux/alteriso5/utils"
+	"github.com/Hayao0819/nahi/osutils"
 	cp "github.com/otiai10/copy"
 )
 
@@ -16,7 +16,7 @@ var makeBaseDirs *BuildTask = NewBuildTask("makeBaseDirs",
 			work.target.Out,
 		}
 
-		if err := utils.MkdirsAll(dirs...); err != nil {
+		if err := osutils.MkdirsAll(dirs...); err != nil {
 			return err
 		}
 		return nil