Add: Copy syslinux binary files

Author: Hayao0819

alteriso5/cmd/build/work/buildtask.go

@@ -0,0 +1,21 @@
+package work
+
+type BuildTask struct {
+	name string
+	task func(work *Work) error
+}
+
+func NewBuildTask(name string, task func(*Work) error) *BuildTask {
+	return &BuildTask{
+		name: name,
+		task: task,
+	}
+}
+
+func (t *BuildTask) Name() string {
+	return t.name
+}
+
+func (t *BuildTask) Run(w *Work) error {
+	return t.task(w)
+}

alteriso5/cmd/build/work/tasks.go

@@ -8,7 +8,6 @@ import (
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/boot"
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/chroot"
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
-	cp "github.com/otiai10/copy"
 )
 
 var makeBaseDirs *BuildTask = NewBuildTask("makeBaseDirs",
@@ -41,16 +40,37 @@ var makeBootModes *BuildTask = NewBuildTask("makeBootModes", func(w *Work) error
 	makeSysLinux := NewBuildTask("makeSysLinux", func(w *Work) error {
 
 		slog.Debug("Setting up SYSLINUX for BIOS booting from a disk...")
+		dirs := w.GetDirs()
 
-		isoSyslinuxDir := path.Join(w.Base, "iso", "boot", "syslinux")
+		isoSyslinuxDir := path.Join(dirs.Iso, "boot", "syslinux")
 
-		if err := utils.MkdirsAll(isoSyslinuxDir); err != nil {
+		if err := utils.MkdirsAll(isoSyslinuxDir, dirs.SyslinuxConfig); err != nil {
 			return err
 		}
 
-		profileSysLinuxDir := path.Join(w.profile.Base, "syslinux")
 
-		if err := cp.Copy(profileSysLinuxDir, isoSyslinuxDir); err != nil {
+		biosFilesDir := path.Join(dirs.Pacstrap, "usr", "lib", "syslinux", "bios")
+		cpFiles := []utils.CopyTask{
+			{
+				Source: biosFilesDir,
+				Dest:   isoSyslinuxDir,
+				Skip:   utils.OnlySpecificExtention(".c32"),
+			},
+			{
+				Source: dirs.SyslinuxConfig,
+				Dest:   isoSyslinuxDir,
+			},
+			{
+				Source: path.Join(biosFilesDir, "lpxelinux.0"),
+				Dest:  path.Join(isoSyslinuxDir, "lpxelinux.0"),
+			},
+			{
+				Source: path.Join(biosFilesDir, "memdisk"),
+				Dest:  path.Join(isoSyslinuxDir, "memdisk"),
+			},
+		}
+
+		if err := utils.CopyAll(cpFiles...); err != nil {
 			return err
 		}
 

alteriso5/cmd/build/work/work.go

@@ -1,35 +1,33 @@
 package work
 
 import (
+	"path"
+
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/config"
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/chroot"
 	"github.com/spf13/cobra"
 )
 
-type BuildTask struct {
-	name string
-	task func(work *Work) error
-}
-
-func NewBuildTask(name string, task func(*Work) error) *BuildTask {
-	return &BuildTask{
-		name: name,
-		task: task,
-	}
-}
-
-func (t *BuildTask) Name() string {
-	return t.name
-}
-
-func (t *BuildTask) Run(w *Work) error {
-	return t.task(w)
-}
-
 type Work struct {
 	Base    string
 	Chroots []*chroot.Env
 	profile *config.Profile
 	target  *config.Target
 	Cmd     *cobra.Command
 }
+
+type dirs struct {
+	Work           string
+	Pacstrap       string
+	Iso            string
+	SyslinuxConfig string
+}
+
+func (w *Work) GetDirs() *dirs {
+	return &dirs{
+		Work:           w.Base,
+		Pacstrap:       path.Join(w.Base, w.target.Arch, "airootfs"),
+		Iso:            path.Join(w.Base, "iso"),
+		SyslinuxConfig: path.Join(w.profile.Base, "syslinux"),
+	}
+}

alteriso5/utils/copy.go

@@ -0,0 +1,48 @@
+package utils
+
+import (
+	"io/fs"
+	"os"
+	"path/filepath"
+
+	cp "github.com/otiai10/copy"
+)
+
+type CopyTask struct {
+	Source string
+	Dest   string
+	Perm   fs.FileMode
+	Skip   func(srcinfo os.FileInfo, src, dest string) (bool, error) // Skipするファイルならtrueを返す
+}
+
+func (c *CopyTask) Copy() error {
+
+	opt := cp.Options{}
+
+	if c.Perm != 0 {
+		opt.PermissionControl = cp.AddPermission(c.Perm)
+	}
+
+	return cp.Copy(c.Source, c.Dest, opt)
+}
+
+func OnlySpecificExtention(ext string) func(srcinfo os.FileInfo, src, dest string) (bool, error) {
+	return func(srcinfo os.FileInfo, src, dest string) (bool, error) {
+		if srcinfo.IsDir() {
+			return false, nil
+		}
+		if filepath.Ext(src) != ext {
+			return true, nil
+		}
+		return false, nil
+	}
+}
+
+func CopyAll(tasks ...CopyTask) error {
+	for _, task := range tasks {
+		if err := task.Copy(); err != nil {
+			return err
+		}
+	}
+	return nil
+}