| 1 |
commit: 547b48d1800dd18a693de428cb80ce5861057555 |
| 2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 28 17:34:10 2015 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 28 17:34:10 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=547b48d1 |
| 7 |
|
| 8 |
set DEFAULT_MAKEOPTS to what portage uses |
| 9 |
|
| 10 |
Ask portage what MAKEOPTS should be and use this when unset on commandline or |
| 11 |
genkernel.conf. If portage MAKEOPTS are also unset, keep original defaults. |
| 12 |
|
| 13 |
arch/alpha/config.sh | 3 ++- |
| 14 |
arch/arm/config.sh | 3 ++- |
| 15 |
arch/ia64/config.sh | 3 ++- |
| 16 |
arch/mips/config.sh | 2 ++ |
| 17 |
arch/parisc/config.sh | 3 ++- |
| 18 |
arch/parisc64/config.sh | 3 ++- |
| 19 |
arch/ppc/config.sh | 3 ++- |
| 20 |
arch/ppc64/config.sh | 3 ++- |
| 21 |
arch/s390/config.sh | 3 ++- |
| 22 |
arch/sparc/config.sh | 3 ++- |
| 23 |
arch/sparc64/config.sh | 3 ++- |
| 24 |
arch/um/config.sh | 3 ++- |
| 25 |
arch/x86/config.sh | 3 ++- |
| 26 |
arch/x86_64/config.sh | 3 ++- |
| 27 |
defaults/config.sh | 4 +++- |
| 28 |
genkernel.conf | 2 +- |
| 29 |
16 files changed, 32 insertions(+), 15 deletions(-) |
| 30 |
|
| 31 |
diff --git a/arch/alpha/config.sh b/arch/alpha/config.sh |
| 32 |
index 68805fd..766a586 100755 |
| 33 |
--- a/arch/alpha/config.sh |
| 34 |
+++ b/arch/alpha/config.sh |
| 35 |
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/alpha/boot/vmlinux.gz" |
| 36 |
DEFAULT_COMPRESS_INITRD=yes |
| 37 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 38 |
|
| 39 |
-DEFAULT_MAKEOPTS="-j2" |
| 40 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 41 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 42 |
|
| 43 |
DEFAULT_KERNEL_MAKE=make |
| 44 |
DEFAULT_UTILS_MAKE=make |
| 45 |
|
| 46 |
diff --git a/arch/arm/config.sh b/arch/arm/config.sh |
| 47 |
index 240a027..1220c42 100755 |
| 48 |
--- a/arch/arm/config.sh |
| 49 |
+++ b/arch/arm/config.sh |
| 50 |
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/arm/boot/zImage" |
| 51 |
DEFAULT_COMPRESS_INITRD=yes |
| 52 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 53 |
|
| 54 |
-DEFAULT_MAKEOPTS="-j2" |
| 55 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 56 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 57 |
|
| 58 |
DEFAULT_KERNEL_MAKE=make |
| 59 |
DEFAULT_UTILS_MAKE=make |
| 60 |
|
| 61 |
diff --git a/arch/ia64/config.sh b/arch/ia64/config.sh |
| 62 |
index 3e9fd84..6c973ec 100755 |
| 63 |
--- a/arch/ia64/config.sh |
| 64 |
+++ b/arch/ia64/config.sh |
| 65 |
@@ -13,7 +13,8 @@ KERNEL_BINARY="vmlinux.gz" |
| 66 |
DEFAULT_COMPRESS_INITRD=yes |
| 67 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 68 |
|
| 69 |
-DEFAULT_MAKEOPTS="-j2" |
| 70 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 71 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 72 |
|
| 73 |
DEFAULT_KERNEL_MAKE=make |
| 74 |
DEFAULT_UTILS_MAKE=make |
| 75 |
|
| 76 |
diff --git a/arch/mips/config.sh b/arch/mips/config.sh |
| 77 |
index 49b4050..62531fc 100755 |
| 78 |
--- a/arch/mips/config.sh |
| 79 |
+++ b/arch/mips/config.sh |
| 80 |
@@ -23,6 +23,8 @@ CMD_INSTALL=0 |
| 81 |
# |
| 82 |
DEFAULT_COMPRESS_INITRD=yes |
| 83 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 84 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 85 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 86 |
DEFAULT_KERNEL_MAKE=make |
| 87 |
DEFAULT_UTILS_MAKE=make |
| 88 |
DEFAULT_UTILS_CC=gcc |
| 89 |
|
| 90 |
diff --git a/arch/parisc/config.sh b/arch/parisc/config.sh |
| 91 |
index e74e1a3..8c74021 100755 |
| 92 |
--- a/arch/parisc/config.sh |
| 93 |
+++ b/arch/parisc/config.sh |
| 94 |
@@ -13,7 +13,8 @@ KERNEL_BINARY="vmlinux" |
| 95 |
DEFAULT_COMPRESS_INITRD=yes |
| 96 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 97 |
|
| 98 |
-DEFAULT_MAKEOPTS="-j2" |
| 99 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 100 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 101 |
|
| 102 |
DEFAULT_KERNEL_MAKE=make |
| 103 |
DEFAULT_UTILS_MAKE=make |
| 104 |
|
| 105 |
diff --git a/arch/parisc64/config.sh b/arch/parisc64/config.sh |
| 106 |
index e74e1a3..8c74021 100755 |
| 107 |
--- a/arch/parisc64/config.sh |
| 108 |
+++ b/arch/parisc64/config.sh |
| 109 |
@@ -13,7 +13,8 @@ KERNEL_BINARY="vmlinux" |
| 110 |
DEFAULT_COMPRESS_INITRD=yes |
| 111 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 112 |
|
| 113 |
-DEFAULT_MAKEOPTS="-j2" |
| 114 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 115 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 116 |
|
| 117 |
DEFAULT_KERNEL_MAKE=make |
| 118 |
DEFAULT_UTILS_MAKE=make |
| 119 |
|
| 120 |
diff --git a/arch/ppc/config.sh b/arch/ppc/config.sh |
| 121 |
index c40ba0f..0bb4ad4 100755 |
| 122 |
--- a/arch/ppc/config.sh |
| 123 |
+++ b/arch/ppc/config.sh |
| 124 |
@@ -12,7 +12,8 @@ KERNEL_BINARY="vmlinux" |
| 125 |
DEFAULT_COMPRESS_INITRD=yes |
| 126 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 127 |
|
| 128 |
-DEFAULT_MAKEOPTS="-j2" |
| 129 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 130 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 131 |
|
| 132 |
DEFAULT_KERNEL_MAKE=make |
| 133 |
DEFAULT_UTILS_MAKE=make |
| 134 |
|
| 135 |
diff --git a/arch/ppc64/config.sh b/arch/ppc64/config.sh |
| 136 |
index c40ba0f..0bb4ad4 100755 |
| 137 |
--- a/arch/ppc64/config.sh |
| 138 |
+++ b/arch/ppc64/config.sh |
| 139 |
@@ -12,7 +12,8 @@ KERNEL_BINARY="vmlinux" |
| 140 |
DEFAULT_COMPRESS_INITRD=yes |
| 141 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 142 |
|
| 143 |
-DEFAULT_MAKEOPTS="-j2" |
| 144 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 145 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 146 |
|
| 147 |
DEFAULT_KERNEL_MAKE=make |
| 148 |
DEFAULT_UTILS_MAKE=make |
| 149 |
|
| 150 |
diff --git a/arch/s390/config.sh b/arch/s390/config.sh |
| 151 |
index 598955a..63f3639 100644 |
| 152 |
--- a/arch/s390/config.sh |
| 153 |
+++ b/arch/s390/config.sh |
| 154 |
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/s390/boot/bzImage" |
| 155 |
DEFAULT_COMPRESS_INITRD=yes |
| 156 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 157 |
|
| 158 |
-DEFAULT_MAKEOPTS="-j2" |
| 159 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 160 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 161 |
|
| 162 |
DEFAULT_KERNEL_MAKE=make |
| 163 |
DEFAULT_UTILS_MAKE=make |
| 164 |
|
| 165 |
diff --git a/arch/sparc/config.sh b/arch/sparc/config.sh |
| 166 |
index fc87def..2e7c294 100755 |
| 167 |
--- a/arch/sparc/config.sh |
| 168 |
+++ b/arch/sparc/config.sh |
| 169 |
@@ -15,7 +15,8 @@ USECOLOR="no" |
| 170 |
DEFAULT_COMPRESS_INITRD=yes |
| 171 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 172 |
|
| 173 |
-DEFAULT_MAKEOPTS="-j1" |
| 174 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 175 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j1}" |
| 176 |
|
| 177 |
DEFAULT_KERNEL_MAKE=make |
| 178 |
DEFAULT_UTILS_MAKE=make |
| 179 |
|
| 180 |
diff --git a/arch/sparc64/config.sh b/arch/sparc64/config.sh |
| 181 |
index f5cb860..367bfcd 100755 |
| 182 |
--- a/arch/sparc64/config.sh |
| 183 |
+++ b/arch/sparc64/config.sh |
| 184 |
@@ -15,7 +15,8 @@ USECOLOR="no" |
| 185 |
DEFAULT_COMPRESS_INITRD=yes |
| 186 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 187 |
|
| 188 |
-DEFAULT_MAKEOPTS="-j2" |
| 189 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 190 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 191 |
|
| 192 |
DEFAULT_KERNEL_MAKE=make |
| 193 |
DEFAULT_UTILS_MAKE=make |
| 194 |
|
| 195 |
diff --git a/arch/um/config.sh b/arch/um/config.sh |
| 196 |
index 2abe935..e998f11 100755 |
| 197 |
--- a/arch/um/config.sh |
| 198 |
+++ b/arch/um/config.sh |
| 199 |
@@ -15,7 +15,8 @@ ARCH_HAVENOPREPARE=yes |
| 200 |
DEFAULT_COMPRESS_INITRD=yes |
| 201 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 202 |
|
| 203 |
-DEFAULT_MAKEOPTS="-j2" |
| 204 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 205 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 206 |
|
| 207 |
DEFAULT_KERNEL_MAKE="make ARCH=um" |
| 208 |
DEFAULT_UTILS_MAKE=make |
| 209 |
|
| 210 |
diff --git a/arch/x86/config.sh b/arch/x86/config.sh |
| 211 |
index d34afb2..60c6ab0 100755 |
| 212 |
--- a/arch/x86/config.sh |
| 213 |
+++ b/arch/x86/config.sh |
| 214 |
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/i386/boot/bzImage" |
| 215 |
DEFAULT_COMPRESS_INITRD=yes |
| 216 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 217 |
|
| 218 |
-DEFAULT_MAKEOPTS="-j2" |
| 219 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 220 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 221 |
|
| 222 |
DEFAULT_KERNEL_MAKE=make |
| 223 |
DEFAULT_UTILS_MAKE=make |
| 224 |
|
| 225 |
diff --git a/arch/x86_64/config.sh b/arch/x86_64/config.sh |
| 226 |
index 78b9167..b89d5ad 100755 |
| 227 |
--- a/arch/x86_64/config.sh |
| 228 |
+++ b/arch/x86_64/config.sh |
| 229 |
@@ -13,7 +13,8 @@ KERNEL_BINARY="arch/x86_64/boot/bzImage" |
| 230 |
DEFAULT_COMPRESS_INITRD=yes |
| 231 |
DEFAULT_COMPRESS_INITRD_TYPE=best |
| 232 |
|
| 233 |
-DEFAULT_MAKEOPTS="-j2" |
| 234 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 235 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 236 |
|
| 237 |
DEFAULT_KERNEL_MAKE=make |
| 238 |
DEFAULT_UTILS_MAKE=make |
| 239 |
|
| 240 |
diff --git a/defaults/config.sh b/defaults/config.sh |
| 241 |
index 7ee9ef2..6acf3bb 100755 |
| 242 |
--- a/defaults/config.sh |
| 243 |
+++ b/defaults/config.sh |
| 244 |
@@ -1,3 +1,4 @@ |
| 245 |
+#This file does not actually appear to be run at all anymore, and is kept as an example for new arches. |
| 246 |
# $Id$ |
| 247 |
# |
| 248 |
# Arch-specific options that normally shouldn't be changed. |
| 249 |
@@ -19,7 +20,8 @@ DEFAULT_COMPRESS_INITRD_TYPE=best |
| 250 |
# Arch-specific defaults that can be overridden in the config file or on the |
| 251 |
# command line. |
| 252 |
# |
| 253 |
-DEFAULT_MAKEOPTS="-j2" |
| 254 |
+PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 255 |
+DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
| 256 |
|
| 257 |
DEFAULT_KERNEL_MAKE=make |
| 258 |
DEFAULT_UTILS_MAKE=make |
| 259 |
|
| 260 |
diff --git a/genkernel.conf b/genkernel.conf |
| 261 |
index ba656f9..a34e6e7 100644 |
| 262 |
--- a/genkernel.conf |
| 263 |
+++ b/genkernel.conf |
| 264 |
@@ -53,7 +53,7 @@ USECOLOR="yes" |
| 265 |
# tweaking the following line. Default setting is set up by |
| 266 |
# ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j |
| 267 |
# argument is: <number of processors>*<number of cores per processor>+1 |
| 268 |
-#MAKEOPTS="-j2" |
| 269 |
+#MAKEOPTS="$(portageq envvar MAKEOPTS)" |
| 270 |
|
| 271 |
# Add in LVM support from static binaries if they exist on the system, or |
| 272 |
# compile static LVM binaries if static ones do not exist. |
Archives