| 1 |
commit: a9545aa1df6385d7125010a9adc4c7e2eccd5b93 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 31 02:07:05 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 31 02:35:21 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a9545aa1 |
| 7 |
|
| 8 |
Change separator in mktemp() templates |
| 9 |
|
| 10 |
Some packages will fail to build when path contains character sequences |
| 11 |
like ".o". Using "_" as separator in mktemp() template will avoid that |
| 12 |
problem. |
| 13 |
|
| 14 |
Link: https://github.com/jthornber/thin-provisioning-tools/issues/127 |
| 15 |
Thanks-to: Doug Freed <dwfreed <AT> mtu.edu> |
| 16 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 17 |
|
| 18 |
gen_determineargs.sh | 4 ++-- |
| 19 |
genkernel | 2 +- |
| 20 |
worker_modules/dropbear.sh | 2 +- |
| 21 |
worker_modules/gkbuild.sh | 2 +- |
| 22 |
4 files changed, 5 insertions(+), 5 deletions(-) |
| 23 |
|
| 24 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 25 |
index f0a5a86..e4aea0c 100755 |
| 26 |
--- a/gen_determineargs.sh |
| 27 |
+++ b/gen_determineargs.sh |
| 28 |
@@ -448,8 +448,8 @@ determine_real_args() { |
| 29 |
mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!" |
| 30 |
fi |
| 31 |
|
| 32 |
- declare -gr TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null) |
| 33 |
- [ -z "${TEMP}" ] && gen_die "'mktemp -d -p \"${TMPDIR}\" gk.XXXXXXXX' failed!" |
| 34 |
+ declare -gr TEMP=$(mktemp -d -p "${TMPDIR}" gk_XXXXXXXX 2>/dev/null) |
| 35 |
+ [ -z "${TEMP}" ] && gen_die "'mktemp -d -p \"${TMPDIR}\" gk_XXXXXXXX' failed!" |
| 36 |
|
| 37 |
if ! isTrue "${CLEANUP}" |
| 38 |
then |
| 39 |
|
| 40 |
diff --git a/genkernel b/genkernel |
| 41 |
index ae2df04..8435350 100755 |
| 42 |
--- a/genkernel |
| 43 |
+++ b/genkernel |
| 44 |
@@ -293,7 +293,7 @@ then |
| 45 |
then |
| 46 |
# We have to set $INSTALL_MOD_PATH to avoid installing files |
| 47 |
# to /lib/modules because --no-install was set |
| 48 |
- INSTALL_MOD_PATH="$(mktemp -d -p "${TEMP}" kerncache-modules.XXXXXXX 2>/dev/null)" |
| 49 |
+ INSTALL_MOD_PATH="$(mktemp -d -p "${TEMP}" kerncache-modules_XXXXXXX 2>/dev/null)" |
| 50 |
if [ -z "${INSTALL_MOD_PATH}" ] |
| 51 |
then |
| 52 |
gen_die "Internal error: Variable 'INSTALL_MOD_PATH' is empty; mktemp() for kerncache modules failed!" |
| 53 |
|
| 54 |
diff --git a/worker_modules/dropbear.sh b/worker_modules/dropbear.sh |
| 55 |
index 3d8c4fa..9ab56b0 100644 |
| 56 |
--- a/worker_modules/dropbear.sh |
| 57 |
+++ b/worker_modules/dropbear.sh |
| 58 |
@@ -35,7 +35,7 @@ __module_main() { |
| 59 |
;; |
| 60 |
esac |
| 61 |
|
| 62 |
- local dropbear_temp=$(mktemp -d -p "${TEMP}" dropbear.XXXXXXXX 2>/dev/null) |
| 63 |
+ local dropbear_temp=$(mktemp -d -p "${TEMP}" dropbear_XXXXXXXX 2>/dev/null) |
| 64 |
[ -z "${dropbear_temp}" ] && die "mktemp failed!" |
| 65 |
|
| 66 |
cd "${dropbear_temp}" || die "Failed to chdir to '${dropbear_temp}'!" |
| 67 |
|
| 68 |
diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh |
| 69 |
index 601d052..24c6e53 100644 |
| 70 |
--- a/worker_modules/gkbuild.sh |
| 71 |
+++ b/worker_modules/gkbuild.sh |
| 72 |
@@ -291,7 +291,7 @@ _initialize() { |
| 73 |
die "Unable to build ${P}: '${GK_SHARE}/gkbuilds/${PN}.gkbuild' does NOT exist!" |
| 74 |
fi |
| 75 |
|
| 76 |
- declare -gr WORKDIR=$(mktemp -d -p "${TEMP}" ${PN}.XXXXXXXX 2>/dev/null) |
| 77 |
+ declare -gr WORKDIR=$(mktemp -d -p "${TEMP}" ${PN}_XXXXXXXX 2>/dev/null) |
| 78 |
[ -z "${WORKDIR}" ] && die "mktemp failed!" |
| 79 |
|
| 80 |
declare -gr BROOT="${WORKDIR}/buildroot" |
Archives