Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /
Date: Wed, 03 Apr 2019 01:59:49
Message-Id: 1554256736.60a0ba78d26c1829b77ffa9aa59aac761a970b93.whissi@gentoo
1 commit: 60a0ba78d26c1829b77ffa9aa59aac761a970b93
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 3 01:58:56 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 3 01:58:56 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=60a0ba78
7
8 Make sure $TMPDIR exists
9
10 Since commit 479b2386c8 we are using mktemp to create the temporary folder $TEMP
11 for the current genkernel run. However, when $TMPDIR doesn't exist, mktemp
12 will fail.
13
14 Reported-By: Aaron Bauman <bman <AT> gentoo.org>
15 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
16
17 gen_cmdline.sh | 1 +
18 genkernel | 3 ++-
19 2 files changed, 3 insertions(+), 1 deletion(-)
20
21 diff --git a/gen_cmdline.sh b/gen_cmdline.sh
22 index 795c2c6..c5697e2 100755
23 --- a/gen_cmdline.sh
24 +++ b/gen_cmdline.sh
25 @@ -587,6 +587,7 @@ parse_cmdline() {
26 ;;
27 --tempdir=*)
28 TMPDIR="${*#*=}"
29 + [ ! -d "${TMPDIR}" ] && mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
30 TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
31 print_info 2 "TMPDIR: ${TMPDIR}"
32 print_info 2 "TEMP: ${TEMP}"
33
34 diff --git a/genkernel b/genkernel
35 index 676471c..6904ff2 100755
36 --- a/genkernel
37 +++ b/genkernel
38 @@ -44,6 +44,7 @@ source ${GK_SHARE}/gen_moddeps.sh || gen_die "Could not read ${GK_SHARE}/gen_mod
39 source ${GK_SHARE}/gen_package.sh || gen_die "Could not read ${GK_SHARE}/gen_package.sh"
40 source ${GK_SHARE}/gen_bootloader.sh || gen_die "Could not read ${GK_SHARE}/gen_bootloader.sh"
41
42 +[ ! -d "${TMPDIR}" ] && mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
43 TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
44
45 trap_cleanup(){
46 @@ -150,7 +151,7 @@ determine_config_file
47
48 set_kernel_arch
49
50 -[ ! -f "${TEMP}" ] && mkdir -p "${TEMP}"
51 +[ ! -f "${TEMP}" ] && mkdir "${TEMP}" || gen_die "Failed to create '${TEMP}'!"
52
53 setup_cache_dir