From 4e979908047ac8f407b0cf603573a8304bb4f2b4 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Thu, 17 Nov 2022 16:29:04 -0800
Subject: [PATCH] archive: accept compression format parameter during
 instantiation (MR 25)

---
 cmd/mkinitfs/main.go        |  8 ++++----
 internal/archive/archive.go | 14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/cmd/mkinitfs/main.go b/cmd/mkinitfs/main.go
index 1199446..37de407 100644
--- a/cmd/mkinitfs/main.go
+++ b/cmd/mkinitfs/main.go
@@ -91,7 +91,7 @@ func main() {
 	log.Print("Generating for kernel version: ", kernVer)
 	log.Print("Output directory: ", *outDir)
 
-	if err := generateArchive("initramfs", workDir, []filelist.FileLister{
+	if err := generateArchive("initramfs", devinfo.InitfsCompression, workDir, []filelist.FileLister{
 		hookdirs.New("/usr/share/mkinitfs/dirs"),
 		hookdirs.New("/etc/mkinitfs/dirs"),
 		hookfiles.New("/usr/share/mkinitfs/files"),
@@ -107,7 +107,7 @@ func main() {
 		return
 	}
 
-	if err := generateArchive("initramfs-extra", workDir, []filelist.FileLister{
+	if err := generateArchive("initramfs-extra", devinfo.InitfsCompression, workDir, []filelist.FileLister{
 		hookfiles.New("/usr/share/mkinitfs/files-extra"),
 		hookfiles.New("/etc/mkinitfs/files-extra"),
 		hookscripts.New("/usr/share/mkinitfs/hooks-extra"),
@@ -141,10 +141,10 @@ func bootDeploy(workDir, outDir, ubootBoardname string) error {
 	return bd.Run()
 }
 
-func generateArchive(name string, path string, features []filelist.FileLister) error {
+func generateArchive(name string, compressionFormat string, path string, features []filelist.FileLister) error {
 	log.Printf("== Generating %s ==\n", name)
 	defer misc.TimeFunc(time.Now(), name)
-	a, err := archive.New()
+	a, err := archive.New(archive.CompressFormat(compressionFormat))
 	if err != nil {
 		return err
 	}
diff --git a/internal/archive/archive.go b/internal/archive/archive.go
index 3151a1a..fd14f4a 100644
--- a/internal/archive/archive.go
+++ b/internal/archive/archive.go
@@ -28,16 +28,18 @@ const (
 )
 
 type Archive struct {
-	items      archiveItems
-	cpioWriter *cpio.Writer
-	buf        *bytes.Buffer
+	items           archiveItems
+	cpioWriter      *cpio.Writer
+	buf             *bytes.Buffer
+	compress_format CompressFormat
 }
 
-func New() (*Archive, error) {
+func New(format CompressFormat) (*Archive, error) {
 	buf := new(bytes.Buffer)
 	archive := &Archive{
-		cpioWriter: cpio.NewWriter(buf),
-		buf:        buf,
+		cpioWriter:      cpio.NewWriter(buf),
+		buf:             buf,
+		compress_format: format,
 	}
 
 	return archive, nil