Add: releng airootfs

Author: Hayao0819

LICENSE

@@ -1,13 +1,8 @@
 package airootfs
 
 import (
-	"log/slog"
 	"os"
 	"os/exec"
-	"path"
-	"strings"
-
-	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 )
 
 type Chroot struct {
@@ -43,9 +38,6 @@ func (e *Chroot) Init() error {
 	if err := os.MkdirAll(e.Dir, 0755); err != nil {
 		return err
 	}
-	if e.initilized {
-		return nil
-	}
 
 	pacstrap := exec.Command("pacstrap", "-c", e.Dir, "base", "base-devel", "linux", "linux-firmware", "syslinux")
 	pacstrap.Env = append(os.Environ(), "LANG=C")
@@ -65,40 +57,47 @@ type kernel struct {
 	Initrd string
 }
 
-func (e *Chroot) FindKernels() ([]kernel, error) {
-	kernels := []kernel{}
+// func (e *Chroot) FindKernels() ([]kernel, error) {
+// 	kernels := []kernel{}
 
-	//bootDir := path.Join(e.Dir, "boot")
+// 	presetsDir := path.Join(e.Dir, "etc", "mkinitcpio.d")
+// 	entry, err := os.ReadDir(presetsDir)
+// 	if err != nil {
+// 		return nil, err
+// 	}
 
-	presetsDir := path.Join(e.Dir, "etc", "mkinitcpio.d")
-	entry, err := os.ReadDir(presetsDir)
-	if err != nil {
-		return nil, err
-	}
+// 	for _, e := range entry {
+// 		if e.IsDir() || !strings.HasSuffix(e.Name(), ".preset") {
+// 			continue
+// 		}
 
-	for _, e := range entry {
-		if e.IsDir() || !strings.HasSuffix(e.Name(), ".preset") {
-			continue
-		}
+// 		fp := path.Join(presetsDir, e.Name())
+// 		env, err := utils.LoadEnvFile(fp)
+// 		if err != nil {
+// 			continue
+// 		}
 
-		fp := path.Join(presetsDir, e.Name())
-		env, err := utils.LoadEnvFile(fp)
-		if err != nil {
-			continue
-		}
+// 		ker := env["ALL_kver"]
+// 		initrd := env["default_image"]
 
-		ker := env["ALL_kver"]
-		initrd := env["default_image"]
+// 		if ker != "" && initrd != "" {
+// 			kernels = append(kernels, kernel{
+// 				Linux:  ker,
+// 				Initrd: initrd,
+// 			})
+// 		}
 
-		if ker != "" && initrd != "" {
-			kernels = append(kernels, kernel{
-				Linux:  ker,
-				Initrd: initrd,
-			})
-		}
+// 	}
 
-	}
+// 	slog.Debug("FindKernels:", "kernels", kernels)
+// 	return kernels, nil
+// }
 
-	slog.Debug("FindKernels:", "kernels", kernels)
-	return kernels, nil
+func (e *Chroot) FindKernels() ([]kernel, error) {
+	return []kernel{
+		{
+			Linux:  "/boot/vmlinuz-linux",
+			Initrd: "/boot/initramfs-linux.img",
+		},
+	}, nil
 }

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

@@ -13,17 +13,15 @@ func (work Work) Build(p config.Profile, t config.Target, c *cobra.Command) erro
 
 	tasks := []*BuildTask{
 		makeBaseDirs,
+		makeCustomAirootfs,
 		makeChroot,
 		makeBootModes,
 		makeAirootfs,
 		makeOutFiles,
 	}
 
 	for _, t := range tasks {
-		//err := (*t).task(&work)
-
-		err := work.RunOnce(t)
-		if err != nil {
+		if err := work.RunOnce(t); err != nil {
 			return err
 		}
 	}

alteriso5/cmd/build/work/build.go

@@ -29,6 +29,7 @@ var makeCustomAirootfs *BuildTask = NewBuildTask("makeCustomAirootfs", func(w Wo
 	if err := cp.Copy(profileAirootfsDir, w.GetDirs().Pacstrap, cp.Options{
 		PreserveOwner: true,
 		Sync:          true,
+		
 	}); err != nil {
 		return err
 	}

alteriso5/cmd/build/work/mkinitcpio/preset.go

@@ -0,0 +1 @@
+archiso

alteriso5/cmd/build/work/tasks.go alteriso5/cmd/build/work/task-airootfs.goalteriso5/cmd/build/work/tasks.go renamed to alteriso5/cmd/build/work/task-airootfs.go

@@ -0,0 +1 @@
+LANG=C.UTF-8

alteriso5/cmd/build/work/task-init.go

@@ -0,0 +1 @@
+/usr/share/zoneinfo/UTC

profile/airootfs/etc/hostname

@@ -0,0 +1,2 @@
+HOOKS=(base udev microcode modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
+COMPRESSION="xz"