aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2020-01-29 23:04:22 +0100
committerThomas Deutschmann <whissi@gentoo.org>2020-01-29 23:12:36 +0100
commit93c4a548b0aa06c2b5fd40467b80e945e081be24 (patch)
treec6ed88d751eff9d855dbf7a23c5c739b1c70c0c2
parentsandbox: Set unique SANDBOX_LOG values to avoid collisions (diff)
downloadgenkernel-93c4a548.tar.gz
genkernel-93c4a548.tar.bz2
genkernel-93c4a548.zip
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@gentoo.org> Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--defaults/config.sh2
-rw-r--r--doc/genkernel.8.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/defaults/config.sh b/defaults/config.sh
index 694b3e94..fed53550 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 aebea033..6c7b9bd4 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