[gentoo-commits] proj/genkernel:master commit in: /, worker_modules/

[gentoo-commits] proj/genkernel:master commit in: /, worker_modules/

[Thomas Deutschmann]

commit:     a9545aa1df6385d7125010a9adc4c7e2eccd5b93
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 02:07:05 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 02:35:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a9545aa1

Change separator in mktemp() templates

Some packages will fail to build when path contains character sequences
like ".o". Using "_" as separator in mktemp() template will avoid that
problem.

Link: https://github.com/jthornber/thin-provisioning-tools/issues/127
Thanks-to: Doug Freed <dwfreed <AT> mtu.edu>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh       | 4 ++--
 genkernel                  | 2 +-
 worker_modules/dropbear.sh | 2 +-
 worker_modules/gkbuild.sh  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f0a5a86..e4aea0c 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -448,8 +448,8 @@ determine_real_args() {
 		mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
 	fi
 
-	declare -gr TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null)
-	[ -z "${TEMP}" ] && gen_die "'mktemp -d -p \"${TMPDIR}\" gk.XXXXXXXX' failed!"
+	declare -gr TEMP=$(mktemp -d -p "${TMPDIR}" gk_XXXXXXXX 2>/dev/null)
+	[ -z "${TEMP}" ] && gen_die "'mktemp -d -p \"${TMPDIR}\" gk_XXXXXXXX' failed!"
 
 	if ! isTrue "${CLEANUP}"
 	then

diff --git a/genkernel b/genkernel
index ae2df04..8435350 100755
--- a/genkernel
+++ b/genkernel
@@ -293,7 +293,7 @@ then
 		then
 			# We have to set $INSTALL_MOD_PATH to avoid installing files
 			# to /lib/modules because --no-install was set
-			INSTALL_MOD_PATH="$(mktemp -d -p "${TEMP}" kerncache-modules.XXXXXXX 2>/dev/null)"
+			INSTALL_MOD_PATH="$(mktemp -d -p "${TEMP}" kerncache-modules_XXXXXXX 2>/dev/null)"
 			if [ -z "${INSTALL_MOD_PATH}" ]
 			then
 				gen_die "Internal error: Variable 'INSTALL_MOD_PATH' is empty; mktemp() for kerncache modules failed!"

diff --git a/worker_modules/dropbear.sh b/worker_modules/dropbear.sh
index 3d8c4fa..9ab56b0 100644
--- a/worker_modules/dropbear.sh
+++ b/worker_modules/dropbear.sh
@@ -35,7 +35,7 @@ __module_main() {
 			;;
 	esac
 
-	local dropbear_temp=$(mktemp -d -p "${TEMP}" dropbear.XXXXXXXX 2>/dev/null)
+	local dropbear_temp=$(mktemp -d -p "${TEMP}" dropbear_XXXXXXXX 2>/dev/null)
 	[ -z "${dropbear_temp}" ] && die "mktemp failed!"
 
 	cd "${dropbear_temp}" || die "Failed to chdir to '${dropbear_temp}'!"

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 601d052..24c6e53 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -291,7 +291,7 @@ _initialize() {
 		die "Unable to build ${P}: '${GK_SHARE}/gkbuilds/${PN}.gkbuild' does NOT exist!"
 	fi
 
-	declare -gr WORKDIR=$(mktemp -d -p "${TEMP}" ${PN}.XXXXXXXX 2>/dev/null)
+	declare -gr WORKDIR=$(mktemp -d -p "${TEMP}" ${PN}_XXXXXXXX 2>/dev/null)
 	[ -z "${WORKDIR}" ] && die "mktemp failed!"
 
 	declare -gr BROOT="${WORKDIR}/buildroot"