Update: Add package list

Author: Hayao0819

alteriso5/cmd/build.go

@@ -2,9 +2,8 @@ package cmd
 
 import (
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build"
-	"github.com/Hayao0819/nahi/cobrautils"
 )
 
 func init() {
-	cobrautils.RegisterSubCmd(build.Cmd())
+	rootSubCmds.RegisterSubCmd(build.Cmd())
 }

alteriso5/config/pkg/package.go

@@ -4,7 +4,9 @@ import (
 	"log/slog"
 	"os"
 	"path"
+	"strings"
 
+	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	"github.com/Hayao0819/nahi/osutils"
 )
 
@@ -38,7 +40,7 @@ func FindPkgListFiles(profile string, arch string) ([]string, error) {
 		slog.Debug("Found pkglist", "files", files)
 		for _, f := range files {
 			p := path.Join(profile, d, f.Name())
-			slog.Info("Found pkglist", "file",p)
+			slog.Info("Found pkglist", "file", p)
 			findFiles = append(findFiles, p)
 		}
 	}
@@ -54,3 +56,41 @@ func FindPkgListFiles(profile string, arch string) ([]string, error) {
 
 	return retunPaths, nil
 }
+
+func ReadPkgListFile(file string) ([]string, error) {
+	pkgs := []string{}
+
+	lines, err := utils.ReadFileLine(file)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, l := range lines {
+		if l == "" || strings.HasPrefix(l, "#") {
+			continue
+		}
+		pkgs = append(pkgs, l)
+	}
+
+	return pkgs, nil
+}
+
+func GetPkgList(profile string, arch string) ([]string, error) {
+	files, err := FindPkgListFiles(profile, arch)
+	if err != nil {
+		return nil, err
+	}
+
+	pkgs := []string{}
+
+	for _, f := range files {
+		p, err := ReadPkgListFile(f)
+		if err != nil {
+			return nil, err
+		}
+
+		pkgs = append(pkgs, p...)
+	}
+
+	return pkgs, nil
+}

alteriso5/config/profile.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"os"
 	"path"
+
+	"github.com/FascodeNet/alterlinux/alteriso5/config/pkg"
 )
 
 type Profile struct {
@@ -31,3 +33,7 @@ func ReadProfile(dir string) (*Profile, error) {
 
 	return &new, nil
 }
+
+func (p *Profile) GetPkgList(arch string) ([]string, error) {
+	return pkg.GetPkgList(p.Base,arch)
+}

alteriso5/work/airootfs/chroot.go

@@ -1,6 +1,7 @@
 package airootfs
 
 import (
+	"log/slog"
 	"os"
 	"os/exec"
 )
@@ -34,12 +35,17 @@ func GetChrootDir(dir, arch string) (*Chroot, error) {
 	return &env, nil
 }
 
-func (e *Chroot) Init() error {
+func (e *Chroot) Init(pkgs ...string) error {
 	if err := os.MkdirAll(e.Dir, 0755); err != nil {
 		return err
 	}
 
-	pacstrap := exec.Command("pacstrap", "-c", e.Dir, "base", "base-devel", "linux", "linux-firmware", "syslinux", "mkinitcpio-archiso")
+	args := []string{"-c", e.Dir}
+	args = append(args, pkgs...)
+
+	slog.Debug("pacstrap", "args", args)
+
+	pacstrap := exec.Command("pacstrap", args...)
 	pacstrap.Env = append(os.Environ(), "LANG=C")
 	pacstrap.Stdout = os.Stdout
 	pacstrap.Stderr = os.Stderr

alteriso5/work/buildtask.go

@@ -2,6 +2,7 @@ package work
 
 import (
 	"fmt"
+	"log/slog"
 )
 
 type BuildTask struct {
@@ -21,6 +22,8 @@ func (t *BuildTask) Name() string {
 }
 
 func (t *BuildTask) Run(w *Work) error {
+	slog.Info("Running task", "name", t.name)
+
 	err := t.task(*w)
 	if err != nil {
 		return fmt.Errorf("error running task %s: %v", t.name, err)

alteriso5/work/task-init.go

@@ -29,7 +29,6 @@ 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
 	}
@@ -42,9 +41,14 @@ var makeChroot *BuildTask = NewBuildTask("makeChroot", func(work Work) error {
 	env, err := work.GetChroot()
 	if err != nil {
 		return err
+	}
 
+	pkglist, err := work.profile.GetPkgList(work.target.Arch)
+	if err != nil {
+		return err
 	}
-	if err := env.Init(); err != nil {
+
+	if err := env.Init(pkglist...); err != nil {
 		return err
 
 	}

profile/packages.x86_64

@@ -0,0 +1,131 @@
+alsa-utils
+amd-ucode
+arch-install-scripts
+archinstall
+b43-fwcutter
+base
+bcachefs-tools
+bind
+bolt
+brltty
+broadcom-wl
+btrfs-progs
+clonezilla
+cloud-init
+cryptsetup
+darkhttpd
+ddrescue
+dhclient
+dhcpcd
+diffutils
+dmidecode
+dmraid
+dnsmasq
+dosfstools
+e2fsprogs
+edk2-shell
+efibootmgr
+espeakup
+ethtool
+exfatprogs
+f2fs-tools
+fatresize
+foot-terminfo
+fsarchiver
+gnu-netcat
+gpart
+gpm
+gptfdisk
+grml-zsh-config
+grub
+hdparm
+hyperv
+intel-ucode
+irssi
+iw
+iwd
+jfsutils
+kitty-terminfo
+ldns
+less
+lftp
+libfido2
+libusb-compat
+linux
+linux-atm
+linux-firmware
+linux-firmware-marvell
+livecd-sounds
+lsscsi
+lvm2
+lynx
+man-db
+man-pages
+mc
+mdadm
+memtest86+
+memtest86+-efi
+mkinitcpio
+mkinitcpio-archiso
+mkinitcpio-nfs-utils
+modemmanager
+mtools
+nano
+nbd
+ndisc6
+nfs-utils
+nilfs-utils
+nmap
+ntfs-3g
+nvme-cli
+open-iscsi
+open-vm-tools
+openconnect
+openpgp-card-tools
+openssh
+openvpn
+partclone
+parted
+partimage
+pcsclite
+ppp
+pptpclient
+pv
+qemu-guest-agent
+refind
+reflector
+reiserfsprogs
+rp-pppoe
+rsync
+rxvt-unicode-terminfo
+screen
+sdparm
+sequoia-sq
+sg3_utils
+smartmontools
+sof-firmware
+squashfs-tools
+sudo
+syslinux
+systemd-resolvconf
+tcpdump
+terminus-font
+testdisk
+tmux
+tpm2-tools
+tpm2-tss
+udftools
+usb_modeswitch
+usbmuxd
+usbutils
+vim
+virtualbox-guest-utils-nox
+vpnc
+wezterm-terminfo
+wireless-regdb
+wireless_tools
+wpa_supplicant
+wvdial
+xfsprogs
+xl2tpd
+zsh