commit: 6882485e665f8b6eb388696dfc0fd983faa9d922
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 2 10:40:47 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 2 22:40:14 2020 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6882485e
Rename INSTALL_MOD_PATH option to KERNEL_MODULES_PREFIX
Before this change we had different names in config file
and command-line for the same thing.
With this change we have one option named KERNEL_MODULES_PREFIX and its
corresponding --kernel-modules-prefix command-line argument.
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
doc/genkernel.8.txt | 6 +++---
gen_cmdline.sh | 9 +++++----
gen_compile.sh | 16 ++++++++--------
gen_determineargs.sh | 2 +-
gen_initramfs.sh | 4 ++--
gen_moddeps.sh | 6 +++---
gen_package.sh | 13 ++++++-------
genkernel | 15 ++++++++-------
genkernel.conf | 3 +--
9 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 50f1471..8c527b0 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -198,8 +198,8 @@ specified.
*--*[*no-*]*module-rebuild*::
Runs, or does not run "emerge --ignore-default-opts --buildpkg=n
--usepkg=n --quiet-build=y @module-rebuild"
to build out-of-tree modules when possible, i.e. when non-static
- kernel and modules will be build, installed, no custom
- 'INSTALL_MOD_PATH' is set, '/var/lib/module-rebuild/moduledb' exists
+ kernel and modules will be build, installed,
+ *--kernel-modules-prefix* is not set, '/var/lib/module-rebuild/moduledb'
exists
and is not empty.
NOTE: Command can be customized using '--module-rebuild-cmd' command-line
@@ -231,7 +231,7 @@ KERNEL LOCATIONS
Use the special value 'default' to force usage of default kernel
config.
-*--module-prefix*=<dir>::
+*--kernel-modules-prefix*=<dir>::
Prefix to kernel module destination, modules will be installed in
'<prefix>/lib/modules'.
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index f502350..5cc0d87 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -80,7 +80,8 @@ longusage() {
echo " --kernel-localversion=<...>"
echo " Set kernel CONFIG_LOCALVERSION, use
special value"
echo " 'UNSET' to unset any set LOCALVERSION"
- echo " --module-prefix=<dir> Prefix to kernel module destination,
modules"
+ echo " --kernel-modules-prefix=<dir>"
+ echo " Prefix to kernel module destination,
modules"
echo " will be installed in
<prefix>/lib/modules"
echo " Low-Level Compile settings"
echo " --cross-compile=<target-triplet>"
@@ -680,9 +681,9 @@ parse_cmdline() {
CMD_KERNEL_LOCALVERSION="${*#*=}"
print_info 3 "CMD_KERNEL_LOCALVERSION:
${CMD_KERNEL_LOCALVERSION}"
;;
- --module-prefix=*)
- CMD_INSTALL_MOD_PATH="${*#*=}"
- print_info 3 "CMD_INSTALL_MOD_PATH:
${CMD_INSTALL_MOD_PATH}"
+ --kernel-modules-prefix=*)
+ CMD_KERNEL_MODULES_PREFIX="${*#*=}"
+ print_info 3 "CMD_KERNEL_MODULES_PREFIX:
${CMD_KERNEL_MODULES_PREFIX}"
;;
--cachedir=*)
CACHE_DIR="${*#*=}"
diff --git a/gen_compile.sh b/gen_compile.sh
index 0fa6912..d755150 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -20,10 +20,10 @@ compile_external_modules() {
return
fi
- if [ -n "${INSTALL_MOD_PATH}" ]
+ if [ -n "${KERNEL_MODULES_PREFIX}" ]
then
# emerge would install to a different location
- print_warning 1 "$(get_indent 1)>> INSTALL_MOD_PATH set;
Skipping '${MODULEREBUILD_CMD}' ..."
+ print_warning 1 "$(get_indent 1)>> KERNEL_MODULES_PREFIX set;
Skipping '${MODULEREBUILD_CMD}' ..."
return
fi
@@ -182,7 +182,7 @@ compile_modules() {
compile_generic modules kernel
- [ -n "${INSTALL_MOD_PATH}" ] && local -x
INSTALL_MOD_PATH="${INSTALL_MOD_PATH}"
+ [ -n "${KERNEL_MODULES_PREFIX}" ] && local -x
INSTALL_MOD_PATH="${KERNEL_MODULES_PREFIX%/}"
if [ "${CMD_STRIP_TYPE}" == "all" -o "${CMD_STRIP_TYPE}" == "modules" ]
then
print_info 1 "$(get_indent 1)>> Installing ${KV} modules (and
stripping) ..."
@@ -195,10 +195,10 @@ compile_modules() {
compile_generic "modules_install" kernel
print_info 1 "$(get_indent 1)>> Generating module dependency data ..."
- if [ -n "${INSTALL_MOD_PATH}" ]
+ if [ -n "${KERNEL_MODULES_PREFIX}" ]
then
- depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b
"${INSTALL_MOD_PATH}" ${KV} \
- || gen_die "depmod
(INSTALL_MOD_PATH=${INSTALL_MOD_PATH}) failed!"
+ depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b
"${KERNEL_MODULES_PREFIX%/}" ${KV} \
+ || gen_die "depmod
(INSTALL_MOD_PATH=${KERNEL_MODULES_PREFIX%/}) failed!"
else
depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map ${KV} \
|| gen_die "depmod failed!"
@@ -250,8 +250,8 @@ compile_kernel() {
print_info 1 "$(get_indent 1)>> Not installing firmware
as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y) ..."
else
print_info 1 "$(get_indent 1)>> Installing firmware
('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y ..."
- [ "${INSTALL_MOD_PATH}" != '' ] && export
INSTALL_MOD_PATH
- [ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH
+ [ -n "${KERNEL_MODULES_PREFIX}" ] && local -x
INSTALL_MOD_PATH="${KERNEL_MODULES_PREFIX%/}"
+ [ -n "${INSTALL_FW_PATH}" ] && export INSTALL_FW_PATH
MAKEOPTS="${MAKEOPTS} -j1" compile_generic
"firmware_install" kernel
fi
elif [ ${KV_NUMERIC} -lt 4014 ]
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d9056e4..0a404ee 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -300,6 +300,7 @@ determine_real_args() {
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 STRING KERNEL_MODULES_PREFIX
CMD_KERNEL_MODULES_PREFIX
set_config_with_override BOOL KERNEL_SOURCES
CMD_KERNEL_SOURCES "yes"
set_config_with_override STRING INITRAMFS_FILENAME
CMD_INITRAMFS_FILENAME "${DEFAULT_INITRAMFS_FILENAME}"
set_config_with_override STRING INITRAMFS_SYMLINK_NAME
CMD_INITRAMFS_SYMLINK_NAME "${DEFAULT_INITRAMFS_SYMLINK_NAME}"
@@ -356,7 +357,6 @@ determine_real_args() {
set_config_with_override BOOL BUILD_STATIC
CMD_STATIC "no"
set_config_with_override BOOL SAVE_CONFIG
CMD_SAVE_CONFIG "yes"
set_config_with_override BOOL SYMLINK
CMD_SYMLINK "no"
- set_config_with_override STRING INSTALL_MOD_PATH
CMD_INSTALL_MOD_PATH
set_config_with_override BOOL OLDCONFIG
CMD_OLDCONFIG "yes"
set_config_with_override BOOL SANDBOX
CMD_SANDBOX "yes"
set_config_with_override BOOL SSH
CMD_SSH "no"
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index d1a0e33..24ddcb5 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1680,9 +1680,9 @@ append_modules() {
print_info 2 "$(get_indent 2)modules: >> Copying modules to initramfs
..."
- if [ -n "${INSTALL_MOD_PATH}" ]
+ if [ -n "${KERNEL_MODULES_PREFIX}" ]
then
- modules_srcdir="${INSTALL_MOD_PATH%/}${modules_srcdir}"
+ modules_srcdir="${KERNEL_MODULES_PREFIX%/}${modules_srcdir}"
fi
if [ ! -d "${modules_srcdir}" ]
diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 5e6c980..fd7800f 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -4,7 +4,7 @@
gen_dep_list() {
if isTrue "${ALLRAMDISKMODULES}"
then
- strip_mod_paths $(find "${INSTALL_MOD_PATH}/lib/modules/${KV}"
-name "*$(modules_kext)") | sort
+ strip_mod_paths $(find
"${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" -name "*$(modules_kext)") | sort
else
rm -f "${TEMP}/moddeps" >/dev/null
@@ -48,9 +48,9 @@ gen_deps() {
modules_dep_list() {
KEXT=$(modules_kext)
- if [ -f ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep ]
+ if [ -f "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" ]
then
- cat ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep | grep
${1}${KEXT}\: | cut -d\: -f2
+ cat "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep"
| grep ${1}${KEXT}\: | cut -d\: -f2
fi
}
diff --git a/gen_package.sh b/gen_package.sh
index 5182d51..c49141f 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -89,14 +89,14 @@ gen_minkernpackage() {
}
gen_modulespackage() {
- if [ -d "${INSTALL_MOD_PATH}/lib/modules/${KV}" ]
+ if [ -d "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" ]
then
print_info 1 "modulespkg: >> Creating modules package in
'${MODULESPACKAGE}' ..."
rm -rf "${TEMP}/modulespackage" >/dev/null 2>&1
mkdir "${TEMP}/modulespackage" || gen_die "Failed to create
'${TEMP}/modulespackage'!"
mkdir -p "${TEMP}/modulespackage/lib/modules" || gen_die
"Failed to create '${TEMP}/modulespackage/lib/modules'!"
- cp -arP "${INSTALL_MOD_PATH}/lib/modules/${KV}"
"${TEMP}/modulespackage/lib/modules"
+ cp -arP "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}"
"${TEMP}/modulespackage/lib/modules"
cd "${TEMP}/modulespackage" || gen_die "Failed to chdir to
'${TEMP}/modulespackage'!"
@@ -106,7 +106,7 @@ gen_modulespackage() {
print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1
eval "${tar_cmd[@]}" || gen_die "Failed to create compressed
modules package '${MODULESPACKAGE}'!"
else
- print_info 1 "modulespkg: >>
'${INSTALL_MOD_PATH}/lib/modules/${KV}' was not found; Skipping creation of
modules package in '${MODULESPACKAGE}' ..."
+ print_info 1 "modulespkg: >>
'${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}' was not found; Skipping creation
of modules package in '${MODULESPACKAGE}' ..."
fi
}
@@ -165,9 +165,9 @@ gen_kerncache() {
mkdir -p "${TEMP}/kerncache/lib/modules/" \
|| gen_die "Failed to create '${TEMP}/kerncache/lib/modules'"
- if [ -d "${INSTALL_MOD_PATH}/lib/modules/${KV}" ]
+ if [ -d "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" ]
then
- cp -arP "${INSTALL_MOD_PATH}/lib/modules/${KV}"
"${TEMP}/kerncache/lib/modules"
+ cp -arP "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}"
"${TEMP}/kerncache/lib/modules"
fi
cd "${TEMP}/kerncache" || gen_die "Failed to chdir to
'${TEMP}/kerncache'!"
@@ -204,8 +204,7 @@ gen_kerncache_extract_kernel() {
}
gen_kerncache_extract_modules() {
- local modules_dir=/lib
- [ -n "${INSTALL_MOD_PATH}" ] && modules_dir="${INSTALL_MOD_PATH}/lib"
+ local modules_dir="${KERNEL_MODULES_PREFIX%/}/lib"
if [ ! -d "${modules_dir}" ]
then
diff --git a/genkernel b/genkernel
index efa4360..a155a9c 100755
--- a/genkernel
+++ b/genkernel
@@ -38,6 +38,7 @@ if [ ${#GK_SETTINGS[@]} -gt 0 ]
then
GK_SETTINGS+=( CALLBACK )
GK_SETTINGS+=( EXTRAVERSION )
+ GK_SETTINGS+=( INSTALL_MOD_PATH )
GK_SETTINGS+=( MOD_INSTALL )
for GK_SETTING in "${GK_SETTINGS[@]}"
@@ -295,18 +296,18 @@ then
if ! isTrue "${BUILD_STATIC}"
then
- if ! isTrue "${CMD_INSTALL}" && [ -z "${INSTALL_MOD_PATH}" ]
+ if ! isTrue "${CMD_INSTALL}" && [ -z "${KERNEL_MODULE_PREFIX}" ]
then
- # We have to set $INSTALL_MOD_PATH to avoid installing
files
+ # We have to set $KERNEL_MODULE_PREFIX 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)"
- if [ -z "${INSTALL_MOD_PATH}" ]
+ KERNEL_MODULE_PREFIX="$(mktemp -d -p "${TEMP}"
kerncache-modules_XXXXXXX 2>/dev/null)"
+ if [ -z "${KERNEL_MODULE_PREFIX}" ]
then
- gen_die "Internal error: Variable
'INSTALL_MOD_PATH' is empty; mktemp() for kerncache modules failed!"
+ gen_die "Internal error: Variable
'KERNEL_MODULE_PREFIX' is empty; mktemp() for kerncache modules failed!"
else
print_info 5 '' 1 0
- print_info 5 "INSTALL_MOD_PATH set to
'${INSTALL_MOD_PATH}' because --kerncache is used but --no-install was set ..."
- mkdir "${INSTALL_MOD_PATH}/lib" || gen_die
"Failed to create '${INSTALL_MOD_PATH}/lib'!"
+ print_info 5 "KERNEL_MODULE_PREFIX set to
'${KERNEL_MODULE_PREFIX}' because --kerncache is used but --no-install was set
..."
+ mkdir "${KERNEL_MODULE_PREFIX}/lib" || gen_die
"Failed to create '${KERNEL_MODULE_PREFIX}/lib'!"
fi
fi
diff --git a/genkernel.conf b/genkernel.conf
index 43415ef..93cf8e7 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -322,8 +322,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
# Prefix to kernel module destination, modules
# will be installed in <prefix>/lib/modules
-# (.conf equivalent of --module-prefix=<dir>)
-#INSTALL_MOD_PATH=""
+#KERNEL_MODULES_PREFIX=""
# =========MISC INITRAMFS CONFIGURATION============
