Added additional paths for ukify in shell.go to support different installations of ukify.

Author: magerstam

internal/chroot/deb/installer.go

@@ -192,11 +192,15 @@ func (debInstaller *DebInstaller) InstallDebPkg(targetOsConfigDir, chrootEnvPath
 		"-- %s %s %s",
 		debArch, pkgListStr, suite, chrootEnvPath, localRepoConfigPath)
 
-	// Set environment variables to ensure non-interactive installation
+	// Set environment variables to ensure non-interactive installation.
+	// PYTHONDONTWRITEBYTECODE skips py3compile during postinst scripts, which
+	// is very slow under QEMU user-mode emulation in cross-arch builds. Python
+	// will recompile bytecode on first execution on the target device.
 	envVars := []string{
 		"DEBIAN_FRONTEND=noninteractive",
 		"DEBCONF_NONINTERACTIVE_SEEN=true",
 		"DEBCONF_NOWARNINGS=yes",
+		"PYTHONDONTWRITEBYTECODE=1",
 	}
 
 	if _, err = shell.ExecCmdWithStream(cmd, true, shell.HostPath, envVars); err != nil {

internal/utils/shell/shell.go

@@ -108,7 +108,7 @@ var commandMap = map[string][]string{
 	"touch":              {"/usr/bin/touch"},
 	"truncate":           {"/usr/bin/truncate"},
 	"tune2fs":            {"/usr/sbin/tune2fs"},
-	"ukify":              {"/usr/bin/ukify"},
+	"ukify":              {"/usr/bin/ukify", "/usr/local/bin/ukify"},
 	"umount":             {"/usr/bin/umount"},
 	"uname":              {"/usr/bin/uname"},
 	"uniq":               {"/usr/bin/uniq"},