14 files changed, 28 insertions, 13 deletions
diff --git a/arch/alpha/config.sh b/arch/alpha/config.sh
index 68805fdd..766a5864 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 240a0270..1220c42d 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 3e9fd844..6c973ec8 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 49b40507..62531fce 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 e74e1a37..8c740213 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 e74e1a37..8c740213 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 c40ba0fc..0bb4ad4a 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 c40ba0fc..0bb4ad4a 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 598955a4..63f36390 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 fc87defd..2e7c2941 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 f5cb860c..367bfcd8 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 2abe9359..e998f11e 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 d34afb2b..60c6ab02 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 78b9167a..b89d5ade 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