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: Mon, 29 Jul 2019 20:10:32
Message-Id: 1564430426.15b34c0a3b9c63cbedc25db05081fc5e2ed00b67.whissi@gentoo
1 commit: 15b34c0a3b9c63cbedc25db05081fc5e2ed00b67
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 28 21:10:49 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 29 20:00:26 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=15b34c0a
7
8 genkernel: Don't install modules to /lib/modules when --kerncache is used but --no-install is set
9
10 Bug: https://bugs.gentoo.org/505810
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 genkernel | 15 +++++++++++++++
14 1 file changed, 15 insertions(+)
15
16 diff --git a/genkernel b/genkernel
17 index f33379c..c3aa8d1 100755
18 --- a/genkernel
19 +++ b/genkernel
20 @@ -280,6 +280,21 @@ if isTrue "${KERNCACHE_IS_VALID}"
21 then
22 if ! isTrue "${BUILD_STATIC}"
23 then
24 + if ! isTrue "${CMD_INSTALL}" && [ -z "${INSTALL_MOD_PATH}" ]
25 + then
26 + # We have to set $INSTALL_MOD_PATH to avoid installing files
27 + # to /lib/modules because --no-install was set
28 + INSTALL_MOD_PATH="$(mktemp -d -p "${TEMP}" kerncache-modules.XXXXXXX 2>/dev/null)"
29 + if [ -z "${INSTALL_MOD_PATH}" ]
30 + then
31 + gen_die "Internal error: Variable 'INSTALL_MOD_PATH' is empty; mktemp() for kerncache modules failed!"
32 + else
33 + print_info 5 '' 1 0
34 + print_info 5 "INSTALL_MOD_PATH set to '${INSTALL_MOD_PATH}' because --kerncache is used but --no-install was set ..."
35 + mkdir "${INSTALL_MOD_PATH}/lib" || gen_die "Failed to create '${INSTALL_MOD_PATH}/lib'!"
36 + fi
37 + fi
38 +
39 print_info 1 '' 1 0
40 gen_kerncache_extract_modules
41 fi