| 1 |
commit: 6882485e665f8b6eb388696dfc0fd983faa9d922 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 2 10:40:47 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 2 22:40:14 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6882485e |
| 7 |
|
| 8 |
Rename INSTALL_MOD_PATH option to KERNEL_MODULES_PREFIX |
| 9 |
|
| 10 |
Before this change we had different names in config file |
| 11 |
and command-line for the same thing. |
| 12 |
|
| 13 |
With this change we have one option named KERNEL_MODULES_PREFIX and its |
| 14 |
corresponding --kernel-modules-prefix command-line argument. |
| 15 |
|
| 16 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 17 |
|
| 18 |
doc/genkernel.8.txt | 6 +++--- |
| 19 |
gen_cmdline.sh | 9 +++++---- |
| 20 |
gen_compile.sh | 16 ++++++++-------- |
| 21 |
gen_determineargs.sh | 2 +- |
| 22 |
gen_initramfs.sh | 4 ++-- |
| 23 |
gen_moddeps.sh | 6 +++--- |
| 24 |
gen_package.sh | 13 ++++++------- |
| 25 |
genkernel | 15 ++++++++------- |
| 26 |
genkernel.conf | 3 +-- |
| 27 |
9 files changed, 37 insertions(+), 37 deletions(-) |
| 28 |
|
| 29 |
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt |
| 30 |
index 50f1471..8c527b0 100644 |
| 31 |
--- a/doc/genkernel.8.txt |
| 32 |
+++ b/doc/genkernel.8.txt |
| 33 |
@@ -198,8 +198,8 @@ specified. |
| 34 |
*--*[*no-*]*module-rebuild*:: |
| 35 |
Runs, or does not run "emerge --ignore-default-opts --buildpkg=n --usepkg=n --quiet-build=y @module-rebuild" |
| 36 |
to build out-of-tree modules when possible, i.e. when non-static |
| 37 |
- kernel and modules will be build, installed, no custom |
| 38 |
- 'INSTALL_MOD_PATH' is set, '/var/lib/module-rebuild/moduledb' exists |
| 39 |
+ kernel and modules will be build, installed, |
| 40 |
+ *--kernel-modules-prefix* is not set, '/var/lib/module-rebuild/moduledb' exists |
| 41 |
and is not empty. |
| 42 |
|
| 43 |
NOTE: Command can be customized using '--module-rebuild-cmd' command-line |
| 44 |
@@ -231,7 +231,7 @@ KERNEL LOCATIONS |
| 45 |
Use the special value 'default' to force usage of default kernel |
| 46 |
config. |
| 47 |
|
| 48 |
-*--module-prefix*=<dir>:: |
| 49 |
+*--kernel-modules-prefix*=<dir>:: |
| 50 |
Prefix to kernel module destination, modules will be installed in |
| 51 |
'<prefix>/lib/modules'. |
| 52 |
|
| 53 |
|
| 54 |
diff --git a/gen_cmdline.sh b/gen_cmdline.sh |
| 55 |
index f502350..5cc0d87 100755 |
| 56 |
--- a/gen_cmdline.sh |
| 57 |
+++ b/gen_cmdline.sh |
| 58 |
@@ -80,7 +80,8 @@ longusage() { |
| 59 |
echo " --kernel-localversion=<...>" |
| 60 |
echo " Set kernel CONFIG_LOCALVERSION, use special value" |
| 61 |
echo " 'UNSET' to unset any set LOCALVERSION" |
| 62 |
- echo " --module-prefix=<dir> Prefix to kernel module destination, modules" |
| 63 |
+ echo " --kernel-modules-prefix=<dir>" |
| 64 |
+ echo " Prefix to kernel module destination, modules" |
| 65 |
echo " will be installed in <prefix>/lib/modules" |
| 66 |
echo " Low-Level Compile settings" |
| 67 |
echo " --cross-compile=<target-triplet>" |
| 68 |
@@ -680,9 +681,9 @@ parse_cmdline() { |
| 69 |
CMD_KERNEL_LOCALVERSION="${*#*=}" |
| 70 |
print_info 3 "CMD_KERNEL_LOCALVERSION: ${CMD_KERNEL_LOCALVERSION}" |
| 71 |
;; |
| 72 |
- --module-prefix=*) |
| 73 |
- CMD_INSTALL_MOD_PATH="${*#*=}" |
| 74 |
- print_info 3 "CMD_INSTALL_MOD_PATH: ${CMD_INSTALL_MOD_PATH}" |
| 75 |
+ --kernel-modules-prefix=*) |
| 76 |
+ CMD_KERNEL_MODULES_PREFIX="${*#*=}" |
| 77 |
+ print_info 3 "CMD_KERNEL_MODULES_PREFIX: ${CMD_KERNEL_MODULES_PREFIX}" |
| 78 |
;; |
| 79 |
--cachedir=*) |
| 80 |
CACHE_DIR="${*#*=}" |
| 81 |
|
| 82 |
diff --git a/gen_compile.sh b/gen_compile.sh |
| 83 |
index 0fa6912..d755150 100755 |
| 84 |
--- a/gen_compile.sh |
| 85 |
+++ b/gen_compile.sh |
| 86 |
@@ -20,10 +20,10 @@ compile_external_modules() { |
| 87 |
return |
| 88 |
fi |
| 89 |
|
| 90 |
- if [ -n "${INSTALL_MOD_PATH}" ] |
| 91 |
+ if [ -n "${KERNEL_MODULES_PREFIX}" ] |
| 92 |
then |
| 93 |
# emerge would install to a different location |
| 94 |
- print_warning 1 "$(get_indent 1)>> INSTALL_MOD_PATH set; Skipping '${MODULEREBUILD_CMD}' ..." |
| 95 |
+ print_warning 1 "$(get_indent 1)>> KERNEL_MODULES_PREFIX set; Skipping '${MODULEREBUILD_CMD}' ..." |
| 96 |
return |
| 97 |
fi |
| 98 |
|
| 99 |
@@ -182,7 +182,7 @@ compile_modules() { |
| 100 |
|
| 101 |
compile_generic modules kernel |
| 102 |
|
| 103 |
- [ -n "${INSTALL_MOD_PATH}" ] && local -x INSTALL_MOD_PATH="${INSTALL_MOD_PATH}" |
| 104 |
+ [ -n "${KERNEL_MODULES_PREFIX}" ] && local -x INSTALL_MOD_PATH="${KERNEL_MODULES_PREFIX%/}" |
| 105 |
if [ "${CMD_STRIP_TYPE}" == "all" -o "${CMD_STRIP_TYPE}" == "modules" ] |
| 106 |
then |
| 107 |
print_info 1 "$(get_indent 1)>> Installing ${KV} modules (and stripping) ..." |
| 108 |
@@ -195,10 +195,10 @@ compile_modules() { |
| 109 |
compile_generic "modules_install" kernel |
| 110 |
|
| 111 |
print_info 1 "$(get_indent 1)>> Generating module dependency data ..." |
| 112 |
- if [ -n "${INSTALL_MOD_PATH}" ] |
| 113 |
+ if [ -n "${KERNEL_MODULES_PREFIX}" ] |
| 114 |
then |
| 115 |
- depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b "${INSTALL_MOD_PATH}" ${KV} \ |
| 116 |
- || gen_die "depmod (INSTALL_MOD_PATH=${INSTALL_MOD_PATH}) failed!" |
| 117 |
+ depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b "${KERNEL_MODULES_PREFIX%/}" ${KV} \ |
| 118 |
+ || gen_die "depmod (INSTALL_MOD_PATH=${KERNEL_MODULES_PREFIX%/}) failed!" |
| 119 |
else |
| 120 |
depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map ${KV} \ |
| 121 |
|| gen_die "depmod failed!" |
| 122 |
@@ -250,8 +250,8 @@ compile_kernel() { |
| 123 |
print_info 1 "$(get_indent 1)>> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y) ..." |
| 124 |
else |
| 125 |
print_info 1 "$(get_indent 1)>> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y ..." |
| 126 |
- [ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH |
| 127 |
- [ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH |
| 128 |
+ [ -n "${KERNEL_MODULES_PREFIX}" ] && local -x INSTALL_MOD_PATH="${KERNEL_MODULES_PREFIX%/}" |
| 129 |
+ [ -n "${INSTALL_FW_PATH}" ] && export INSTALL_FW_PATH |
| 130 |
MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel |
| 131 |
fi |
| 132 |
elif [ ${KV_NUMERIC} -lt 4014 ] |
| 133 |
|
| 134 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 135 |
index d9056e4..0a404ee 100755 |
| 136 |
--- a/gen_determineargs.sh |
| 137 |
+++ b/gen_determineargs.sh |
| 138 |
@@ -300,6 +300,7 @@ determine_real_args() { |
| 139 |
set_config_with_override STRING TMPDIR CMD_TMPDIR "/var/tmp/genkernel" |
| 140 |
set_config_with_override STRING LOGFILE CMD_LOGFILE "/var/log/genkernel.conf" |
| 141 |
set_config_with_override STRING KERNEL_DIR CMD_KERNEL_DIR "${DEFAULT_KERNEL_SOURCE}" |
| 142 |
+ set_config_with_override STRING KERNEL_MODULES_PREFIX CMD_KERNEL_MODULES_PREFIX |
| 143 |
set_config_with_override BOOL KERNEL_SOURCES CMD_KERNEL_SOURCES "yes" |
| 144 |
set_config_with_override STRING INITRAMFS_FILENAME CMD_INITRAMFS_FILENAME "${DEFAULT_INITRAMFS_FILENAME}" |
| 145 |
set_config_with_override STRING INITRAMFS_SYMLINK_NAME CMD_INITRAMFS_SYMLINK_NAME "${DEFAULT_INITRAMFS_SYMLINK_NAME}" |
| 146 |
@@ -356,7 +357,6 @@ determine_real_args() { |
| 147 |
set_config_with_override BOOL BUILD_STATIC CMD_STATIC "no" |
| 148 |
set_config_with_override BOOL SAVE_CONFIG CMD_SAVE_CONFIG "yes" |
| 149 |
set_config_with_override BOOL SYMLINK CMD_SYMLINK "no" |
| 150 |
- set_config_with_override STRING INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH |
| 151 |
set_config_with_override BOOL OLDCONFIG CMD_OLDCONFIG "yes" |
| 152 |
set_config_with_override BOOL SANDBOX CMD_SANDBOX "yes" |
| 153 |
set_config_with_override BOOL SSH CMD_SSH "no" |
| 154 |
|
| 155 |
diff --git a/gen_initramfs.sh b/gen_initramfs.sh |
| 156 |
index d1a0e33..24ddcb5 100755 |
| 157 |
--- a/gen_initramfs.sh |
| 158 |
+++ b/gen_initramfs.sh |
| 159 |
@@ -1680,9 +1680,9 @@ append_modules() { |
| 160 |
|
| 161 |
print_info 2 "$(get_indent 2)modules: >> Copying modules to initramfs ..." |
| 162 |
|
| 163 |
- if [ -n "${INSTALL_MOD_PATH}" ] |
| 164 |
+ if [ -n "${KERNEL_MODULES_PREFIX}" ] |
| 165 |
then |
| 166 |
- modules_srcdir="${INSTALL_MOD_PATH%/}${modules_srcdir}" |
| 167 |
+ modules_srcdir="${KERNEL_MODULES_PREFIX%/}${modules_srcdir}" |
| 168 |
fi |
| 169 |
|
| 170 |
if [ ! -d "${modules_srcdir}" ] |
| 171 |
|
| 172 |
diff --git a/gen_moddeps.sh b/gen_moddeps.sh |
| 173 |
index 5e6c980..fd7800f 100755 |
| 174 |
--- a/gen_moddeps.sh |
| 175 |
+++ b/gen_moddeps.sh |
| 176 |
@@ -4,7 +4,7 @@ |
| 177 |
gen_dep_list() { |
| 178 |
if isTrue "${ALLRAMDISKMODULES}" |
| 179 |
then |
| 180 |
- strip_mod_paths $(find "${INSTALL_MOD_PATH}/lib/modules/${KV}" -name "*$(modules_kext)") | sort |
| 181 |
+ strip_mod_paths $(find "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" -name "*$(modules_kext)") | sort |
| 182 |
else |
| 183 |
rm -f "${TEMP}/moddeps" >/dev/null |
| 184 |
|
| 185 |
@@ -48,9 +48,9 @@ gen_deps() { |
| 186 |
|
| 187 |
modules_dep_list() { |
| 188 |
KEXT=$(modules_kext) |
| 189 |
- if [ -f ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep ] |
| 190 |
+ if [ -f "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" ] |
| 191 |
then |
| 192 |
- cat ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep | grep ${1}${KEXT}\: | cut -d\: -f2 |
| 193 |
+ cat "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" | grep ${1}${KEXT}\: | cut -d\: -f2 |
| 194 |
fi |
| 195 |
} |
| 196 |
|
| 197 |
|
| 198 |
diff --git a/gen_package.sh b/gen_package.sh |
| 199 |
index 5182d51..c49141f 100755 |
| 200 |
--- a/gen_package.sh |
| 201 |
+++ b/gen_package.sh |
| 202 |
@@ -89,14 +89,14 @@ gen_minkernpackage() { |
| 203 |
} |
| 204 |
|
| 205 |
gen_modulespackage() { |
| 206 |
- if [ -d "${INSTALL_MOD_PATH}/lib/modules/${KV}" ] |
| 207 |
+ if [ -d "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" ] |
| 208 |
then |
| 209 |
print_info 1 "modulespkg: >> Creating modules package in '${MODULESPACKAGE}' ..." |
| 210 |
rm -rf "${TEMP}/modulespackage" >/dev/null 2>&1 |
| 211 |
mkdir "${TEMP}/modulespackage" || gen_die "Failed to create '${TEMP}/modulespackage'!" |
| 212 |
|
| 213 |
mkdir -p "${TEMP}/modulespackage/lib/modules" || gen_die "Failed to create '${TEMP}/modulespackage/lib/modules'!" |
| 214 |
- cp -arP "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/modulespackage/lib/modules" |
| 215 |
+ cp -arP "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" "${TEMP}/modulespackage/lib/modules" |
| 216 |
|
| 217 |
cd "${TEMP}/modulespackage" || gen_die "Failed to chdir to '${TEMP}/modulespackage'!" |
| 218 |
|
| 219 |
@@ -106,7 +106,7 @@ gen_modulespackage() { |
| 220 |
print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1 |
| 221 |
eval "${tar_cmd[@]}" || gen_die "Failed to create compressed modules package '${MODULESPACKAGE}'!" |
| 222 |
else |
| 223 |
- print_info 1 "modulespkg: >> '${INSTALL_MOD_PATH}/lib/modules/${KV}' was not found; Skipping creation of modules package in '${MODULESPACKAGE}' ..." |
| 224 |
+ print_info 1 "modulespkg: >> '${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}' was not found; Skipping creation of modules package in '${MODULESPACKAGE}' ..." |
| 225 |
fi |
| 226 |
} |
| 227 |
|
| 228 |
@@ -165,9 +165,9 @@ gen_kerncache() { |
| 229 |
mkdir -p "${TEMP}/kerncache/lib/modules/" \ |
| 230 |
|| gen_die "Failed to create '${TEMP}/kerncache/lib/modules'" |
| 231 |
|
| 232 |
- if [ -d "${INSTALL_MOD_PATH}/lib/modules/${KV}" ] |
| 233 |
+ if [ -d "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" ] |
| 234 |
then |
| 235 |
- cp -arP "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/kerncache/lib/modules" |
| 236 |
+ cp -arP "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" "${TEMP}/kerncache/lib/modules" |
| 237 |
fi |
| 238 |
|
| 239 |
cd "${TEMP}/kerncache" || gen_die "Failed to chdir to '${TEMP}/kerncache'!" |
| 240 |
@@ -204,8 +204,7 @@ gen_kerncache_extract_kernel() { |
| 241 |
} |
| 242 |
|
| 243 |
gen_kerncache_extract_modules() { |
| 244 |
- local modules_dir=/lib |
| 245 |
- [ -n "${INSTALL_MOD_PATH}" ] && modules_dir="${INSTALL_MOD_PATH}/lib" |
| 246 |
+ local modules_dir="${KERNEL_MODULES_PREFIX%/}/lib" |
| 247 |
|
| 248 |
if [ ! -d "${modules_dir}" ] |
| 249 |
then |
| 250 |
|
| 251 |
diff --git a/genkernel b/genkernel |
| 252 |
index efa4360..a155a9c 100755 |
| 253 |
--- a/genkernel |
| 254 |
+++ b/genkernel |
| 255 |
@@ -38,6 +38,7 @@ if [ ${#GK_SETTINGS[@]} -gt 0 ] |
| 256 |
then |
| 257 |
GK_SETTINGS+=( CALLBACK ) |
| 258 |
GK_SETTINGS+=( EXTRAVERSION ) |
| 259 |
+ GK_SETTINGS+=( INSTALL_MOD_PATH ) |
| 260 |
GK_SETTINGS+=( MOD_INSTALL ) |
| 261 |
|
| 262 |
for GK_SETTING in "${GK_SETTINGS[@]}" |
| 263 |
@@ -295,18 +296,18 @@ then |
| 264 |
|
| 265 |
if ! isTrue "${BUILD_STATIC}" |
| 266 |
then |
| 267 |
- if ! isTrue "${CMD_INSTALL}" && [ -z "${INSTALL_MOD_PATH}" ] |
| 268 |
+ if ! isTrue "${CMD_INSTALL}" && [ -z "${KERNEL_MODULE_PREFIX}" ] |
| 269 |
then |
| 270 |
- # We have to set $INSTALL_MOD_PATH to avoid installing files |
| 271 |
+ # We have to set $KERNEL_MODULE_PREFIX to avoid installing files |
| 272 |
# to /lib/modules because --no-install was set |
| 273 |
- INSTALL_MOD_PATH="$(mktemp -d -p "${TEMP}" kerncache-modules_XXXXXXX 2>/dev/null)" |
| 274 |
- if [ -z "${INSTALL_MOD_PATH}" ] |
| 275 |
+ KERNEL_MODULE_PREFIX="$(mktemp -d -p "${TEMP}" kerncache-modules_XXXXXXX 2>/dev/null)" |
| 276 |
+ if [ -z "${KERNEL_MODULE_PREFIX}" ] |
| 277 |
then |
| 278 |
- gen_die "Internal error: Variable 'INSTALL_MOD_PATH' is empty; mktemp() for kerncache modules failed!" |
| 279 |
+ gen_die "Internal error: Variable 'KERNEL_MODULE_PREFIX' is empty; mktemp() for kerncache modules failed!" |
| 280 |
else |
| 281 |
print_info 5 '' 1 0 |
| 282 |
- print_info 5 "INSTALL_MOD_PATH set to '${INSTALL_MOD_PATH}' because --kerncache is used but --no-install was set ..." |
| 283 |
- mkdir "${INSTALL_MOD_PATH}/lib" || gen_die "Failed to create '${INSTALL_MOD_PATH}/lib'!" |
| 284 |
+ print_info 5 "KERNEL_MODULE_PREFIX set to '${KERNEL_MODULE_PREFIX}' because --kerncache is used but --no-install was set ..." |
| 285 |
+ mkdir "${KERNEL_MODULE_PREFIX}/lib" || gen_die "Failed to create '${KERNEL_MODULE_PREFIX}/lib'!" |
| 286 |
fi |
| 287 |
fi |
| 288 |
|
| 289 |
|
| 290 |
diff --git a/genkernel.conf b/genkernel.conf |
| 291 |
index 43415ef..93cf8e7 100644 |
| 292 |
--- a/genkernel.conf |
| 293 |
+++ b/genkernel.conf |
| 294 |
@@ -322,8 +322,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux" |
| 295 |
|
| 296 |
# Prefix to kernel module destination, modules |
| 297 |
# will be installed in <prefix>/lib/modules |
| 298 |
-# (.conf equivalent of --module-prefix=<dir>) |
| 299 |
-#INSTALL_MOD_PATH="" |
| 300 |
+#KERNEL_MODULES_PREFIX="" |
| 301 |
|
| 302 |
|
| 303 |
# =========MISC INITRAMFS CONFIGURATION============ |
Archives