patch and updated ebuild file

distrobuilder.tar.gz (text/plain), 10.00 KB, created by rick on 2023-12-05 21:23:13 UTC

distrobuilder-3.0.ebuild0000644000175000017500000000241514533710533014065 0ustar  rickrick# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

inherit go-module linux-info

DESCRIPTION="System container image builder for LXC and incus"
HOMEPAGE="https://linuxcontainers.org/distrobuilder/introduction/"

SRC_URI="https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}.tar.gz
	verify-sig? ( https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}.tar.gz.asc )"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc64"
IUSE="verify-sig"

RDEPEND="app-crypt/gnupg
	dev-util/debootstrap
	dev-vcs/git
	net-misc/rsync
	sys-fs/squashfs-tools
	app-misc/hivex
	app-arch/wimlib
	app-cdr/cdrtools"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"

# Test deps aren't vendored.
RESTRICT="test"

CONFIG_CHECK="~OVERLAY_FS ~UDF_FS ~ISO9660_FS"
ERROR_UDF_FS="distrobuilder needs UDF_FS and ISO9660_FS to use repack-windows."

VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc

PATCHES=( "${FILESDIR}"/distrobuilder-3.0-mkisofs-fix.patch )

GOPATH="${S}/_dist"

src_compile() {
	export GOPATH="${S}/_dist"
	emake
}

src_test() {
	export GOPATH="${S}/_dist"
	emake check
}

src_install() {
	export GOPATH="${S}/_dist"
	dobin ${GOPATH}/bin/distrobuilder
	dodoc -r doc/*
}
files/distrobuilder-3.0-mkisofs-fix.patch0000644000175000017500000000423614533707505017267 0ustar  rickrickFrom 91ab435f54d1665e5f5c0497568ae7985c6b8b38 Mon Sep 17 00:00:00 2001
From: rick <[e-mail]>
Date: Wed, 25 Oct 2023 15:49:14 +0200
Subject: [PATCH] change genisoimage for mkisofs

---
 distrobuilder/main_repack-windows.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/distrobuilder/main_repack-windows.go b/distrobuilder/main_repack-windows.go
index 76735f2..cbeae34 100644
--- a/distrobuilder/main_repack-windows.go
+++ b/distrobuilder/main_repack-windows.go
@@ -327,17 +327,17 @@ func (c *cmdRepackWindows) run(cmd *cobra.Command, args []string, overlayDir str
 	logger.Info("Generating new ISO")
 	var stdout strings.Builder
 
-	err = shared.RunCommand(c.global.ctx, nil, &stdout, "genisoimage", "--version")
+	err = shared.RunCommand(c.global.ctx, nil, &stdout, "mkisofs", "--version")
 	if err != nil {
-		return fmt.Errorf("Failed to determine version of genisoimage: %w", err)
+		return fmt.Errorf("Failed to determine version of mkisofs: %w", err)
 	}
 
 	version := strings.Split(stdout.String(), "\n")[0]
 
 	if strings.HasPrefix(version, "mkisofs") {
-		err = shared.RunCommand(c.global.ctx, nil, nil, "genisoimage", "-iso-level", "3", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
+		err = shared.RunCommand(c.global.ctx, nil, nil, "mkisofs", "-iso-level", "3", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
 	} else {
-		err = shared.RunCommand(c.global.ctx, nil, nil, "genisoimage", "--allow-limited-size", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
+		err = shared.RunCommand(c.global.ctx, nil, nil, "mkisofs", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
 	}
 
 	if err != nil {
@@ -413,7 +413,7 @@ func (c *cmdRepackWindows) modifyWim(path string, index int) error {
 }
 
 func (c *cmdRepackWindows) checkDependencies() error {
-	dependencies := []string{"genisoimage", "hivexregedit", "rsync", "wimlib-imagex"}
+	dependencies := []string{"mkisofs", "hivexregedit", "rsync", "wimlib-imagex"}
 
 	for _, dep := range dependencies {
 		_, err := exec.LookPath(dep)
-- 
2.42.0