commit: dd9c8493fec3e75fb5de6c3a25b83b8df391196d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 05:16:48 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:11:02 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dd9c8493
Add "--[no-]clear-cachedir" parameter
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gen_cmdline.sh | 10 +++++++++-
gen_determineargs.sh | 1 +
gen_funcs.sh | 2 +-
genkernel | 2 +-
genkernel.conf | 2 +-
maintenance/docmatcher.py | 2 +-
6 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 2fb9ace..d0e45be 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -142,7 +142,11 @@ longusage() {
echo " Internals"
echo " --arch-override=<arch> Force to arch instead of autodetect"
echo " --cachedir=<dir> Override the default cache location"
- echo " --tempdir=<dir> Location of Genkernel's temporary
directory"
+ echo " --clear-cachedir Clear genkernel's cache location on
start. Useful"
+ echo " if you want to force rebuild of
included tools"
+ echo " like BusyBox, DMRAID, GnuPG, LVM, MDADM
..."
+ echo " --no-clear-cachedir Do not clean up on genkernel start"
+ echo " --tempdir=<dir> Location of genkernel's temporary
directory"
echo " --postclear Clear all tmp files and caches
after genkernel has run"
echo " --no-postclear Do not clean up after genkernel has run"
echo " Output Settings"
@@ -603,6 +607,10 @@ parse_cmdline() {
CACHE_DIR="${*#*=}"
print_info 2 "CACHE_DIR: ${CACHE_DIR}"
;;
+ --clear-cachedir|--no-clear-cachedir)
+ CMD_CLEAR_CACHEDIR=`parse_optbool "$*"`
+ print_info 2 "CMD_CLEAR_CACHEDIR: ${CMD_CLEAR_CACHEDIR}"
+ ;;
--minkernpackage=*)
CMD_MINKERNPACKAGE="${*#*=}"
[ ${CMD_MINKERNPACKAGE:0:1} != / ] &&
CMD_MINKERNPACKAGE=$PWD/$CMD_MINKERNPACKAGE
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 2a7d008..40d3d2f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -95,6 +95,7 @@ determine_real_args() {
set_config_with_override STRING MODPROBEDIR CMD_MODPROBEDIR
"/etc/modprobe.d"
set_config_with_override BOOL SPLASH CMD_SPLASH
"no"
+ set_config_with_override BOOL CLEAR_CACHEDIR CMD_CLEAR_CACHEDIR
"no"
set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR
set_config_with_override BOOL MRPROPER CMD_MRPROPER
set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG
diff --git a/gen_funcs.sh b/gen_funcs.sh
index 3f06584..7b89468 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -252,7 +252,7 @@ isBootRO() {
setup_cache_dir() {
[ ! -d "${CACHE_DIR}/${GK_V}" ] && mkdir -p "${CACHE_DIR}/${GK_V}"
- if isTrue "${CLEAR_CACHE_DIR}"
+ if isTrue "${CLEAR_CACHEDIR}"
then
print_info 1 "Clearing cache dir contents from ${CACHE_DIR} ..."
while read i
diff --git a/genkernel b/genkernel
index 59d8c2f..eca6ea0 100755
--- a/genkernel
+++ b/genkernel
@@ -63,7 +63,7 @@ cleanup(){
echo
print_info 1 'RUNNING FINAL CACHE/TMP CLEANUP'
print_info 1 "CACHE_DIR: ${CACHE_DIR}"
- CLEAR_CACHE_DIR='yes'
+ CLEAR_CACHEDIR='yes'
setup_cache_dir
echo
print_info 1 "TMPDIR: ${TMPDIR}"
diff --git a/genkernel.conf b/genkernel.conf
index 687db35..4574f7c 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -51,7 +51,7 @@ SAVE_CONFIG="yes"
USECOLOR="yes"
# Clear build cache dir on gernkernel start
-#CLEAR_CACHE_DIR="no"
+#CLEAR_CACHEDIR="no"
# Clear all tmp files and caches after genkernel has run
#POSTCLEAR="no"
diff --git a/maintenance/docmatcher.py b/maintenance/docmatcher.py
index 6ba2cf9..0aa7c81 100644
--- a/maintenance/docmatcher.py
+++ b/maintenance/docmatcher.py
@@ -18,7 +18,7 @@ NON_CONFIG_VARIABLES = ('BUILD_KERNEL', 'BUILD_MODULES',
'BUILD_RAMDISK',
'TERM_COLUMNS', 'TERM_LINES', 'SPLASH_RES', 'TEMP')
-EXTRA_VARIABLES = ['ARCH_OVERRIDE', 'BOOTLOADER', 'CLEAR_CACHE_DIR',
'DEFAULT_KERNEL_SOURCE', 'DISTDIR', 'GK_SHARE', 'BUSYBOX_APPLETS']
+EXTRA_VARIABLES = ['ARCH_OVERRIDE', 'BOOTLOADER', 'CLEAR_CACHEDIR',
'DEFAULT_KERNEL_SOURCE', 'DISTDIR', 'GK_SHARE', 'BUSYBOX_APPLETS']
for app in ('DEVICE_MAPPER', 'UNIONFS_FUSE', 'BUSYBOX', 'DMRAID', 'LVM',
'ISCSI', 'FUSE', 'GPG', 'MDADM'):
for prop in ('DIR', 'SRCTAR', 'VER'):
EXTRA_VARIABLES.append('%s_%s' % (app, prop))
