commit:     93c4a548b0aa06c2b5fd40467b80e945e081be24
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 22:04:22 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 22:12:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=93c4a548

defaults/config.sh: Use --buildpkg=n and --usepkg=n in DEFAULT_MODULEREBUILD_CMD

While we call emerge with "--ignore-default-opts" since commit 
da5a5fa797a5fffa6c4d694cbfe2edc83bab4890
to avoid conflicting emerge options, we also need to ensure that
we don't clash with problematic emerge FEATURES like "getbinpkg".

Reported-by: Rick Farina <zerochaos <AT> gentoo.org>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/config.sh  | 2 +-
 doc/genkernel.8.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/config.sh b/defaults/config.sh
index 694b3e9..fed5355 100644
--- a/defaults/config.sh
+++ b/defaults/config.sh
@@ -34,7 +34,7 @@ DEFAULT_COMPRESS_INITRD_TYPE=best
 PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
 DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
 
-DEFAULT_MODULEREBUILD_CMD="emerge --ignore-default-opts --quiet-build=y 
@module-rebuild"
+DEFAULT_MODULEREBUILD_CMD="emerge --ignore-default-opts --buildpkg=n 
--usepkg=n --quiet-build=y @module-rebuild"
 
 DEFAULT_KERNEL_MAKE=make
 DEFAULT_UTILS_MAKE=make

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index aebea03..6c7b9bd 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -196,7 +196,7 @@ specified.
     Copies or does not copy all kernel modules to the initrd.
 
 *--*[*no-*]*module-rebuild*::
-    Runs, or does not run "emerge --ignore-default-opts --quiet-build=y 
@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

Reply via email to