| 1 |
commit: 93c4a548b0aa06c2b5fd40467b80e945e081be24 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 29 22:04:22 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 29 22:12:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=93c4a548 |
| 7 |
|
| 8 |
defaults/config.sh: Use --buildpkg=n and --usepkg=n in DEFAULT_MODULEREBUILD_CMD |
| 9 |
|
| 10 |
While we call emerge with "--ignore-default-opts" since commit da5a5fa797a5fffa6c4d694cbfe2edc83bab4890 |
| 11 |
to avoid conflicting emerge options, we also need to ensure that |
| 12 |
we don't clash with problematic emerge FEATURES like "getbinpkg". |
| 13 |
|
| 14 |
Reported-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 15 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 16 |
|
| 17 |
defaults/config.sh | 2 +- |
| 18 |
doc/genkernel.8.txt | 2 +- |
| 19 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/defaults/config.sh b/defaults/config.sh |
| 22 |
index 694b3e9..fed5355 100644 |
| 23 |
--- a/defaults/config.sh |
| 24 |
+++ b/defaults/config.sh |
| 25 |
@@ -34,7 +34,7 @@ DEFAULT_COMPRESS_INITRD_TYPE=best |
| 26 |
PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 27 |
DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 28 |
|
| 29 |
-DEFAULT_MODULEREBUILD_CMD="emerge --ignore-default-opts --quiet-build=y @module-rebuild" |
| 30 |
+DEFAULT_MODULEREBUILD_CMD="emerge --ignore-default-opts --buildpkg=n --usepkg=n --quiet-build=y @module-rebuild" |
| 31 |
|
| 32 |
DEFAULT_KERNEL_MAKE=make |
| 33 |
DEFAULT_UTILS_MAKE=make |
| 34 |
|
| 35 |
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt |
| 36 |
index aebea03..6c7b9bd 100644 |
| 37 |
--- a/doc/genkernel.8.txt |
| 38 |
+++ b/doc/genkernel.8.txt |
| 39 |
@@ -196,7 +196,7 @@ specified. |
| 40 |
Copies or does not copy all kernel modules to the initrd. |
| 41 |
|
| 42 |
*--*[*no-*]*module-rebuild*:: |
| 43 |
- Runs, or does not run "emerge --ignore-default-opts --quiet-build=y @module-rebuild" |
| 44 |
+ Runs, or does not run "emerge --ignore-default-opts --buildpkg=n --usepkg=n --quiet-build=y @module-rebuild" |
| 45 |
to build out-of-tree modules when possible, i.e. when non-static |
| 46 |
kernel and modules will be build, installed, no custom |
| 47 |
'INSTALL_MOD_PATH' is set, '/var/lib/module-rebuild/moduledb' exists |
Archives