Add: Add new BuildTask

Author: Hayao0819

alteriso5/cmd/README.md

@@ -0,0 +1,3 @@
+# AlterISO 5.0 Cmds
+
+各サブコマンドが格納され、コマンドのエントリーポイントを提供します。

alteriso5/cmd/build/work/airootfs/squashfs.go

@@ -1,8 +1,31 @@
 package airootfs
 
+import (
+	"os"
+	"os/exec"
+	"path/filepath"
+)
+
 type SquashFS struct {
 	Base string
-	Out string
+	Out  string
 	Args []string
 }
 
+func (s *SquashFS) Build() error {
+	args := append([]string{s.Base, s.Out}, s.Args...)
+
+	if err := os.MkdirAll(filepath.Dir(s.Out), 0755); err != nil {
+		return err
+	}
+
+	cmd := exec.Command("mksquashfs", args...)
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}

alteriso5/cmd/build/work/build.go

@@ -9,8 +9,10 @@ func (work Work) Build(p config.Profile, t config.Target) error {
 
 	tasks := []*BuildTask{
 		makeBaseDirs,
-		//makeChroot,
+		makeChroot,
 		makeBootModes,
+		makeAirootfs,
+		makeBoot,
 	}
 
 	for _, t := range tasks {

alteriso5/cmd/build/work/tasks.go

@@ -4,7 +4,9 @@ import (
 	"log/slog"
 	"path"
 
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/airootfs"
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/chroot"
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/xorriso"
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	cp "github.com/otiai10/copy"
 )
@@ -51,3 +53,30 @@ var makeBootModes *BuildTask = NewBuildTask("makeBootModes", func(w *Work) error
 
 	return nil
 })
+
+var makeAirootfs *BuildTask = NewBuildTask("makeAirootfs", func(w *Work) error {
+
+	slog.Debug("Copying profile to airootfs...")
+	airootfsDir := path.Join(w.Base, w.target.Arch, "airootfs")
+	isoDir := path.Join(w.Base, "iso")
+
+	sqfs := airootfs.SquashFS{
+		Base: airootfsDir,
+		Out:  path.Join(isoDir, w.profile.InstallDir, w.target.Arch, "airootfs.sfs"),
+	}
+
+	return sqfs.Build()
+})
+
+var makeBoot *BuildTask = NewBuildTask("makeBoot", func(w *Work) error {
+	// TODO: ISO以外もサポートする
+
+	opt := xorriso.Options{
+		SysLinux: true,
+	}
+
+	isodir := path.Join(w.Base, "iso")
+
+	return xorriso.Build(isodir, w.target.Out, &opt)
+
+})

alteriso5/cmd/build/work/utils.go

@@ -17,6 +17,7 @@ func (w *Work) RunOnce(task *BuildTask) error {
 		return err
 	} else {
 		// Dont care about error
+		os.MkdirAll(path.Dir(lp), 0755)
 		os.Create(lp)
 
 	}

alteriso5/cmd/build/work/xorriso/struct.go

@@ -0,0 +1,72 @@
+package xorriso
+
+import (
+	"os"
+	"os/exec"
+	"slices"
+)
+
+type Options struct {
+	SysLinux bool
+	fsDir    string
+	out      string
+	args     []string
+	added    []string
+}
+
+func (o *Options) AddArgs(args ...string) {
+	o.args = append(o.args, args...)
+}
+
+// SysLinux MBR El Torito
+func (o *Options) setArgsForSysLinuxElTorito() {
+	name := "SysLinuxEltorito"
+
+	if slices.Contains(o.added, name) {
+		return
+	}
+
+	o.AddArgs("-eltorito-boot", "boot/syslinux/isolinux.bin")
+	o.AddArgs("-eltorito-catalog", "boot/syslinux/boot.cat")
+	o.AddArgs("-no-emul-boot", "-boot-load-size", "4", "-boot-info-table")
+	o.args = append(o.args, name)
+}
+
+func (o *Options) setArgsForSysLinuxMBRBios() {
+	name := "SysLinuxMBRBios"
+	if slices.Contains(o.added, name) {
+		return
+	}
+	o.AddArgs("-isohybrid-mbr", "${isofs_dir}/boot/syslinux/isohdpfx.bin")
+	o.AddArgs("--mbr-force-bootable")
+	o.AddArgs("-partition_offset", "16")
+	o.added = append(o.added, name)
+}
+
+func (o *Options) Args() []string {
+	if o.SysLinux {
+		o.setArgsForSysLinuxElTorito()
+		o.setArgsForSysLinuxMBRBios()
+	}
+
+	d := []string{
+		"--output", o.out,
+		o.fsDir,
+	}
+
+	return append(d, o.args...)
+}
+
+func Build(dir string, out string, opt *Options) error {
+	opt.fsDir = dir
+	opt.out = out
+
+	args := opt.Args()
+
+	cmd := exec.Command("xorriso", args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stdin = os.Stdin
+	cmd.Stderr = os.Stderr
+
+	return cmd.Run()
+}

alteriso5/cmd/root.go

@@ -9,6 +9,7 @@ func Root() *cobra.Command {
 	root := cobra.Command{
 		Use:   "alteriso5",
 		Short: "AlterISO5 is a tool to build Arch Linux live ISO images",
+		SilenceUsage: true,
 	}
 
 	cobrautils.AddSubCmdsToRoot(&root)

alteriso5/main.go

@@ -1,10 +1,14 @@
 package main
 
-import "github.com/FascodeNet/alterlinux/alteriso5/cmd"
+import (
+	"os"
+
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd"
+)
 
 func main() {
 	root := cmd.Root()
 	if err := root.Execute(); err != nil {
-		root.PrintErrln(err)
+		os.Exit(1)
 	}
 }