* [gentoo-commits] proj/genkernel:master commit in: arch/s390/, arch/ppc/, arch/ppc64/, arch/ia64/, arch/x86_64/, arch/parisc/, ...
@ 2015-04-28 17:35 Richard Farina
0 siblings, 0 replies; only message in thread
From: Richard Farina @ 2015-04-28 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 547b48d1800dd18a693de428cb80ce5861057555
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 28 17:34:10 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 17:34:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=547b48d1
set DEFAULT_MAKEOPTS to what portage uses
Ask portage what MAKEOPTS should be and use this when unset on commandline or
genkernel.conf. If portage MAKEOPTS are also unset, keep original defaults.
arch/alpha/config.sh | 3 ++-
arch/arm/config.sh | 3 ++-
arch/ia64/config.sh | 3 ++-
arch/mips/config.sh | 2 ++
arch/parisc/config.sh | 3 ++-
arch/parisc64/config.sh | 3 ++-
arch/ppc/config.sh | 3 ++-
arch/ppc64/config.sh | 3 ++-
arch/s390/config.sh | 3 ++-
arch/sparc/config.sh | 3 ++-
arch/sparc64/config.sh | 3 ++-
arch/um/config.sh | 3 ++-
arch/x86/config.sh | 3 ++-
arch/x86_64/config.sh | 3 ++-
defaults/config.sh | 4 +++-
genkernel.conf | 2 +-
16 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/arch/alpha/config.sh b/arch/alpha/config.sh
index 68805fd..766a586 100755
--- a/arch/alpha/config.sh
+++ b/arch/alpha/config.sh
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/alpha/boot/vmlinux.gz"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/arm/config.sh b/arch/arm/config.sh
index 240a027..1220c42 100755
--- a/arch/arm/config.sh
+++ b/arch/arm/config.sh
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/arm/boot/zImage"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/ia64/config.sh b/arch/ia64/config.sh
index 3e9fd84..6c973ec 100755
--- a/arch/ia64/config.sh
+++ b/arch/ia64/config.sh
@@ -13,7 +13,8 @@ KERNEL_BINARY="vmlinux.gz"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/mips/config.sh b/arch/mips/config.sh
index 49b4050..62531fc 100755
--- a/arch/mips/config.sh
+++ b/arch/mips/config.sh
@@ -23,6 +23,8 @@ CMD_INSTALL=0
#
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
DEFAULT_UTILS_CC=gcc
diff --git a/arch/parisc/config.sh b/arch/parisc/config.sh
index e74e1a3..8c74021 100755
--- a/arch/parisc/config.sh
+++ b/arch/parisc/config.sh
@@ -13,7 +13,8 @@ KERNEL_BINARY="vmlinux"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/parisc64/config.sh b/arch/parisc64/config.sh
index e74e1a3..8c74021 100755
--- a/arch/parisc64/config.sh
+++ b/arch/parisc64/config.sh
@@ -13,7 +13,8 @@ KERNEL_BINARY="vmlinux"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/ppc/config.sh b/arch/ppc/config.sh
index c40ba0f..0bb4ad4 100755
--- a/arch/ppc/config.sh
+++ b/arch/ppc/config.sh
@@ -12,7 +12,8 @@ KERNEL_BINARY="vmlinux"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/ppc64/config.sh b/arch/ppc64/config.sh
index c40ba0f..0bb4ad4 100755
--- a/arch/ppc64/config.sh
+++ b/arch/ppc64/config.sh
@@ -12,7 +12,8 @@ KERNEL_BINARY="vmlinux"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/s390/config.sh b/arch/s390/config.sh
index 598955a..63f3639 100644
--- a/arch/s390/config.sh
+++ b/arch/s390/config.sh
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/s390/boot/bzImage"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/sparc/config.sh b/arch/sparc/config.sh
index fc87def..2e7c294 100755
--- a/arch/sparc/config.sh
+++ b/arch/sparc/config.sh
@@ -15,7 +15,8 @@ USECOLOR="no"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j1"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j1}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/sparc64/config.sh b/arch/sparc64/config.sh
index f5cb860..367bfcd 100755
--- a/arch/sparc64/config.sh
+++ b/arch/sparc64/config.sh
@@ -15,7 +15,8 @@ USECOLOR="no"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/um/config.sh b/arch/um/config.sh
index 2abe935..e998f11 100755
--- a/arch/um/config.sh
+++ b/arch/um/config.sh
@@ -15,7 +15,8 @@ ARCH_HAVENOPREPARE=yes
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE="make ARCH=um"
DEFAULT_UTILS_MAKE=make
diff --git a/arch/x86/config.sh b/arch/x86/config.sh
index d34afb2..60c6ab0 100755
--- a/arch/x86/config.sh
+++ b/arch/x86/config.sh
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/i386/boot/bzImage"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/arch/x86_64/config.sh b/arch/x86_64/config.sh
index 78b9167..b89d5ad 100755
--- a/arch/x86_64/config.sh
+++ b/arch/x86_64/config.sh
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/x86_64/boot/bzImage"
DEFAULT_COMPRESS_INITRD=yes
DEFAULT_COMPRESS_INITRD_TYPE=best
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/defaults/config.sh b/defaults/config.sh
index 7ee9ef2..6acf3bb 100755
--- a/defaults/config.sh
+++ b/defaults/config.sh
@@ -1,3 +1,4 @@
+#This file does not actually appear to be run at all anymore, and is kept as an example for new arches.
# $Id$
#
# Arch-specific options that normally shouldn't be changed.
@@ -19,7 +20,8 @@ DEFAULT_COMPRESS_INITRD_TYPE=best
# Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
-DEFAULT_MAKEOPTS="-j2"
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)"
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}"
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
diff --git a/genkernel.conf b/genkernel.conf
index ba656f9..a34e6e7 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -53,7 +53,7 @@ USECOLOR="yes"
# tweaking the following line. Default setting is set up by
# ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j
# argument is: <number of processors>*<number of cores per processor>+1
-#MAKEOPTS="-j2"
+#MAKEOPTS="$(portageq envvar MAKEOPTS)"
# Add in LVM support from static binaries if they exist on the system, or
# compile static LVM binaries if static ones do not exist.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-28 17:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-28 17:35 [gentoo-commits] proj/genkernel:master commit in: arch/s390/, arch/ppc/, arch/ppc64/, arch/ia64/, arch/x86_64/, arch/parisc/, Richard Farina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox