commit: 2cefc2738a7fd73139b3c80ad16b4deacd12920c
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:13:33 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:51 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2cefc273
genkernel: Move --tempdir handling to determine_real_args()
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gen_cmdline.sh | 11 ++---------
gen_determineargs.sh | 9 +++++++++
genkernel | 12 ------------
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index a7b35a8..b9f1326 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -585,15 +585,8 @@ parse_cmdline() {
print_info 3 "CMD_STATIC: ${CMD_STATIC}"
;;
--tempdir=*)
- TMPDIR="${*#*=}"
- if [ ! -d "${TMPDIR}" ]
- then
- mkdir -p "${TMPDIR}" || gen_die "Failed to
create '${TMPDIR}'!"
- fi
- TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null)
- [ -z "${TEMP}" ] && gen_die "mktemp failed!"
- print_info 3 "TMPDIR: ${TMPDIR}"
- print_info 3 "TEMP: ${TEMP}"
+ CMD_TMPDIR="${*#*=}"
+ print_info 3 "CMD_TMPDIR: ${CMD_TMPDIR}"
;;
--postclear|--no-postclear)
CMD_POSTCLEAR=$(parse_optbool "$*")
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index c969188..d39412c 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -97,6 +97,7 @@ determine_real_args() {
# Dest / Config File Command Line
Arch Default
# ------------------ ------------
------------
+ set_config_with_override STRING TMPDIR CMD_TMPDIR
"/var/tmp/genkernel"
set_config_with_override STRING LOGFILE CMD_LOGFILE
"/var/log/genkernel.conf"
set_config_with_override STRING KERNEL_DIR CMD_KERNEL_DIR
"${DEFAULT_KERNEL_SOURCE}"
set_config_with_override BOOL KERNEL_SOURCES
CMD_KERNEL_SOURCES "yes"
@@ -187,6 +188,14 @@ determine_real_args() {
set_config_with_override BOOL INSTALL CMD_INSTALL
"yes"
set_config_with_override BOOL CLEANUP CMD_CLEANUP
"yes"
+ if [ ! -d "${TMPDIR}" ]
+ then
+ 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 GK_V_CACHEDIR="${CACHE_DIR}/${GK_V}"
if [ -n "${CMD_CROSS_COMPILE}" ]
diff --git a/genkernel b/genkernel
index ccd0820..8991e69 100755
--- a/genkernel
+++ b/genkernel
@@ -4,10 +4,6 @@
PATH="${PATH}:/sbin:/usr/sbin"
GK_V='4.0.0_beta7'
-# Set the default for TMPDIR. May be modified by genkernel.conf or the
-# --tempdir command line option.
-TMPDIR='/var/tmp/genkernel'
-
TODEBUGCACHE=yes # Until an error occurs or LOGFILE is fully qualified.
small_die() {
@@ -75,14 +71,6 @@ source "${GK_SHARE}"/gen_moddeps.sh || gen_die "Could not
read '${GK_SHARE}/gen_
source "${GK_SHARE}"/gen_package.sh || gen_die "Could not read
'${GK_SHARE}/gen_package.sh'"
source "${GK_SHARE}"/gen_bootloader.sh || gen_die "Could not read
'${GK_SHARE}/gen_bootloader.sh'"
-if [ ! -d "${TMPDIR}" ]
-then
- mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
-fi
-
-TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null)
-[ -z "${TEMP}" ] && gen_die "mktemp failed!"
-
export GK_MASTER_PID=${BASHPID}
set_default_gk_trap
