1 |
commit: 41a7b4515071ef386f919215fa02a90beb426500 |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 29 21:47:36 2016 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 29 21:47:36 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=41a7b451 |
7 |
|
8 |
config.sh: ensure generic config.sh is used again; and refactor duplicate settings. |
9 |
|
10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
11 |
|
12 |
arch/alpha/config.sh | 22 +--------------------- |
13 |
arch/arm/config.sh | 22 +--------------------- |
14 |
arch/ia64/config.sh | 22 +--------------------- |
15 |
arch/mips/config.sh | 16 +--------------- |
16 |
arch/parisc/config.sh | 22 +--------------------- |
17 |
arch/parisc64/config.sh | 22 +--------------------- |
18 |
arch/ppc/config.sh | 22 +--------------------- |
19 |
arch/ppc64/config.sh | 22 +--------------------- |
20 |
arch/s390/config.sh | 22 +--------------------- |
21 |
arch/sparc/config.sh | 20 +------------------- |
22 |
arch/sparc64/config.sh | 22 +--------------------- |
23 |
arch/um/config.sh | 21 +-------------------- |
24 |
arch/x86/config.sh | 22 +--------------------- |
25 |
arch/x86_64/config.sh | 22 +--------------------- |
26 |
defaults/config.sh | 16 ++++++++++------ |
27 |
genkernel | 1 + |
28 |
16 files changed, 25 insertions(+), 291 deletions(-) |
29 |
|
30 |
diff --git a/arch/alpha/config.sh b/arch/alpha/config.sh |
31 |
index 766a586..60dad51 100755 |
32 |
--- a/arch/alpha/config.sh |
33 |
+++ b/arch/alpha/config.sh |
34 |
@@ -1,28 +1,8 @@ |
35 |
# $Id$ |
36 |
# |
37 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
38 |
# Arch-specific options that normally shouldn't be changed. |
39 |
# |
40 |
KERNEL_MAKE_DIRECTIVE="boot" |
41 |
KERNEL_MAKE_DIRECTIVE_2="" |
42 |
KERNEL_BINARY="arch/alpha/boot/vmlinux.gz" |
43 |
- |
44 |
-# |
45 |
-# Arch-specific defaults that can be overridden in the config file or on the |
46 |
-# command line. |
47 |
-# |
48 |
-DEFAULT_COMPRESS_INITRD=yes |
49 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
50 |
- |
51 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
52 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
53 |
- |
54 |
-DEFAULT_KERNEL_MAKE=make |
55 |
-DEFAULT_UTILS_MAKE=make |
56 |
- |
57 |
-DEFAULT_KERNEL_CC=gcc |
58 |
-DEFAULT_KERNEL_AS=as |
59 |
-DEFAULT_KERNEL_LD=ld |
60 |
- |
61 |
-DEFAULT_UTILS_CC=gcc |
62 |
-DEFAULT_UTILS_AS=as |
63 |
-DEFAULT_UTILS_LD=ld |
64 |
|
65 |
diff --git a/arch/arm/config.sh b/arch/arm/config.sh |
66 |
index 1220c42..ce478c8 100755 |
67 |
--- a/arch/arm/config.sh |
68 |
+++ b/arch/arm/config.sh |
69 |
@@ -1,28 +1,8 @@ |
70 |
# $Id$ |
71 |
# |
72 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
73 |
# Arch-specific options that normally shouldn't be changed. |
74 |
# |
75 |
KERNEL_MAKE_DIRECTIVE="" |
76 |
KERNEL_MAKE_DIRECTIVE_2="" |
77 |
KERNEL_BINARY="arch/arm/boot/zImage" |
78 |
- |
79 |
-# |
80 |
-# Arch-specific defaults that can be overridden in the config file or on the |
81 |
-# command line. |
82 |
-# |
83 |
-DEFAULT_COMPRESS_INITRD=yes |
84 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
85 |
- |
86 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
87 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
88 |
- |
89 |
-DEFAULT_KERNEL_MAKE=make |
90 |
-DEFAULT_UTILS_MAKE=make |
91 |
- |
92 |
-DEFAULT_KERNEL_CC=gcc |
93 |
-DEFAULT_KERNEL_AS=as |
94 |
-DEFAULT_KERNEL_LD=ld |
95 |
- |
96 |
-DEFAULT_UTILS_CC=gcc |
97 |
-DEFAULT_UTILS_AS=as |
98 |
-DEFAULT_UTILS_LD=ld |
99 |
|
100 |
diff --git a/arch/ia64/config.sh b/arch/ia64/config.sh |
101 |
index 6c973ec..fc63648 100755 |
102 |
--- a/arch/ia64/config.sh |
103 |
+++ b/arch/ia64/config.sh |
104 |
@@ -1,28 +1,8 @@ |
105 |
# $Id$ |
106 |
# |
107 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
108 |
# Arch-specific options that normally shouldn't be changed. |
109 |
# |
110 |
KERNEL_MAKE_DIRECTIVE="" |
111 |
KERNEL_MAKE_DIRECTIVE_2="" |
112 |
KERNEL_BINARY="vmlinux.gz" |
113 |
- |
114 |
-# |
115 |
-# Arch-specific defaults that can be overridden in the config file or on the |
116 |
-# command line. |
117 |
-# |
118 |
-DEFAULT_COMPRESS_INITRD=yes |
119 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
120 |
- |
121 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
122 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
123 |
- |
124 |
-DEFAULT_KERNEL_MAKE=make |
125 |
-DEFAULT_UTILS_MAKE=make |
126 |
- |
127 |
-DEFAULT_KERNEL_CC=gcc |
128 |
-DEFAULT_KERNEL_AS=as |
129 |
-DEFAULT_KERNEL_LD=ld |
130 |
- |
131 |
-DEFAULT_UTILS_CC=gcc |
132 |
-DEFAULT_UTILS_AS=as |
133 |
-DEFAULT_UTILS_LD=ld |
134 |
|
135 |
diff --git a/arch/mips/config.sh b/arch/mips/config.sh |
136 |
index 62531fc..8b8374a 100755 |
137 |
--- a/arch/mips/config.sh |
138 |
+++ b/arch/mips/config.sh |
139 |
@@ -1,5 +1,6 @@ |
140 |
# $Id$ |
141 |
# |
142 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
143 |
# Arch-specific options that normally shouldn't be changed. |
144 |
# |
145 |
KERNEL_MAKE_DIRECTIVE="vmlinux" |
146 |
@@ -16,18 +17,3 @@ DISKLABEL=0 |
147 |
# genkernel on mips is only used for LiveCDs && netboots. Catalyst |
148 |
# will know where to get the kernels at. |
149 |
CMD_INSTALL=0 |
150 |
- |
151 |
-# |
152 |
-# Arch-specific defaults that can be overridden in the config file or on the |
153 |
-# command line. |
154 |
-# |
155 |
-DEFAULT_COMPRESS_INITRD=yes |
156 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
157 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
158 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
159 |
-DEFAULT_KERNEL_MAKE=make |
160 |
-DEFAULT_UTILS_MAKE=make |
161 |
-DEFAULT_UTILS_CC=gcc |
162 |
-DEFAULT_UTILS_AS=as |
163 |
-DEFAULT_UTILS_LD=ld |
164 |
- |
165 |
|
166 |
diff --git a/arch/parisc/config.sh b/arch/parisc/config.sh |
167 |
index 8c74021..5793af2 100755 |
168 |
--- a/arch/parisc/config.sh |
169 |
+++ b/arch/parisc/config.sh |
170 |
@@ -1,28 +1,8 @@ |
171 |
# $Id$ |
172 |
# |
173 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
174 |
# Arch-specific options that normally shouldn't be changed. |
175 |
# |
176 |
KERNEL_MAKE_DIRECTIVE="vmlinux" |
177 |
KERNEL_MAKE_DIRECTIVE_2="" |
178 |
KERNEL_BINARY="vmlinux" |
179 |
- |
180 |
-# |
181 |
-# Arch-specific defaults that can be overridden in the config file or on the |
182 |
-# command line. |
183 |
-# |
184 |
-DEFAULT_COMPRESS_INITRD=yes |
185 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
186 |
- |
187 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
188 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
189 |
- |
190 |
-DEFAULT_KERNEL_MAKE=make |
191 |
-DEFAULT_UTILS_MAKE=make |
192 |
- |
193 |
-DEFAULT_KERNEL_CC=gcc |
194 |
-DEFAULT_KERNEL_AS=as |
195 |
-DEFAULT_KERNEL_LD=ld |
196 |
- |
197 |
-DEFAULT_UTILS_CC=gcc |
198 |
-DEFAULT_UTILS_AS=as |
199 |
-DEFAULT_UTILS_LD=ld |
200 |
|
201 |
diff --git a/arch/parisc64/config.sh b/arch/parisc64/config.sh |
202 |
index 8c74021..5793af2 100755 |
203 |
--- a/arch/parisc64/config.sh |
204 |
+++ b/arch/parisc64/config.sh |
205 |
@@ -1,28 +1,8 @@ |
206 |
# $Id$ |
207 |
# |
208 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
209 |
# Arch-specific options that normally shouldn't be changed. |
210 |
# |
211 |
KERNEL_MAKE_DIRECTIVE="vmlinux" |
212 |
KERNEL_MAKE_DIRECTIVE_2="" |
213 |
KERNEL_BINARY="vmlinux" |
214 |
- |
215 |
-# |
216 |
-# Arch-specific defaults that can be overridden in the config file or on the |
217 |
-# command line. |
218 |
-# |
219 |
-DEFAULT_COMPRESS_INITRD=yes |
220 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
221 |
- |
222 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
223 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
224 |
- |
225 |
-DEFAULT_KERNEL_MAKE=make |
226 |
-DEFAULT_UTILS_MAKE=make |
227 |
- |
228 |
-DEFAULT_KERNEL_CC=gcc |
229 |
-DEFAULT_KERNEL_AS=as |
230 |
-DEFAULT_KERNEL_LD=ld |
231 |
- |
232 |
-DEFAULT_UTILS_CC=gcc |
233 |
-DEFAULT_UTILS_AS=as |
234 |
-DEFAULT_UTILS_LD=ld |
235 |
|
236 |
diff --git a/arch/ppc/config.sh b/arch/ppc/config.sh |
237 |
index 0bb4ad4..173cff1 100755 |
238 |
--- a/arch/ppc/config.sh |
239 |
+++ b/arch/ppc/config.sh |
240 |
@@ -1,27 +1,7 @@ |
241 |
# $Id$ |
242 |
# |
243 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
244 |
# Arch-specific options that normally shouldn't be changed. |
245 |
# |
246 |
KERNEL_MAKE_DIRECTIVE="vmlinux" |
247 |
KERNEL_BINARY="vmlinux" |
248 |
- |
249 |
-# |
250 |
-# Arch-specific defaults that can be overridden in the config file or on the |
251 |
-# command line. |
252 |
-# |
253 |
-DEFAULT_COMPRESS_INITRD=yes |
254 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
255 |
- |
256 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
257 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
258 |
- |
259 |
-DEFAULT_KERNEL_MAKE=make |
260 |
-DEFAULT_UTILS_MAKE=make |
261 |
- |
262 |
-DEFAULT_KERNEL_CC=gcc |
263 |
-DEFAULT_KERNEL_AS=as |
264 |
-DEFAULT_KERNEL_LD=ld |
265 |
- |
266 |
-DEFAULT_UTILS_CC=gcc |
267 |
-DEFAULT_UTILS_AS=as |
268 |
-DEFAULT_UTILS_LD=ld |
269 |
|
270 |
diff --git a/arch/ppc64/config.sh b/arch/ppc64/config.sh |
271 |
index 0bb4ad4..173cff1 100755 |
272 |
--- a/arch/ppc64/config.sh |
273 |
+++ b/arch/ppc64/config.sh |
274 |
@@ -1,27 +1,7 @@ |
275 |
# $Id$ |
276 |
# |
277 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
278 |
# Arch-specific options that normally shouldn't be changed. |
279 |
# |
280 |
KERNEL_MAKE_DIRECTIVE="vmlinux" |
281 |
KERNEL_BINARY="vmlinux" |
282 |
- |
283 |
-# |
284 |
-# Arch-specific defaults that can be overridden in the config file or on the |
285 |
-# command line. |
286 |
-# |
287 |
-DEFAULT_COMPRESS_INITRD=yes |
288 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
289 |
- |
290 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
291 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
292 |
- |
293 |
-DEFAULT_KERNEL_MAKE=make |
294 |
-DEFAULT_UTILS_MAKE=make |
295 |
- |
296 |
-DEFAULT_KERNEL_CC=gcc |
297 |
-DEFAULT_KERNEL_AS=as |
298 |
-DEFAULT_KERNEL_LD=ld |
299 |
- |
300 |
-DEFAULT_UTILS_CC=gcc |
301 |
-DEFAULT_UTILS_AS=as |
302 |
-DEFAULT_UTILS_LD=ld |
303 |
|
304 |
diff --git a/arch/s390/config.sh b/arch/s390/config.sh |
305 |
index 63f3639..7ef4aa2 100644 |
306 |
--- a/arch/s390/config.sh |
307 |
+++ b/arch/s390/config.sh |
308 |
@@ -1,28 +1,8 @@ |
309 |
# $Id$ |
310 |
# |
311 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
312 |
# Arch-specific options that normally shouldn't be changed. |
313 |
# |
314 |
KERNEL_MAKE_DIRECTIVE="" |
315 |
KERNEL_MAKE_DIRECTIVE_2="" |
316 |
KERNEL_BINARY="arch/s390/boot/bzImage" |
317 |
- |
318 |
-# |
319 |
-# Arch-specific defaults that can be overridden in the config file or on the |
320 |
-# command line. |
321 |
-# |
322 |
-DEFAULT_COMPRESS_INITRD=yes |
323 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
324 |
- |
325 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
326 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
327 |
- |
328 |
-DEFAULT_KERNEL_MAKE=make |
329 |
-DEFAULT_UTILS_MAKE=make |
330 |
- |
331 |
-DEFAULT_KERNEL_CC=gcc |
332 |
-DEFAULT_KERNEL_AS=as |
333 |
-DEFAULT_KERNEL_LD=ld |
334 |
- |
335 |
-DEFAULT_UTILS_CC=gcc |
336 |
-DEFAULT_UTILS_AS=as |
337 |
-DEFAULT_UTILS_LD=ld |
338 |
|
339 |
diff --git a/arch/sparc/config.sh b/arch/sparc/config.sh |
340 |
index 2e7c294..19c89ac 100755 |
341 |
--- a/arch/sparc/config.sh |
342 |
+++ b/arch/sparc/config.sh |
343 |
@@ -1,5 +1,6 @@ |
344 |
# $Id$ |
345 |
# |
346 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
347 |
# Arch-specific options that normally shouldn't be changed. |
348 |
# |
349 |
KERNEL_MAKE_DIRECTIVE="vmlinux" |
350 |
@@ -7,22 +8,3 @@ KERNEL_MAKE_DIRECTIVE_2="" |
351 |
KERNEL_BINARY="vmlinux" |
352 |
|
353 |
USECOLOR="no" |
354 |
- |
355 |
-# |
356 |
-# Arch-specific defaults that can be overridden in the config file or on the |
357 |
-# command line. |
358 |
-# |
359 |
-DEFAULT_COMPRESS_INITRD=yes |
360 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
361 |
- |
362 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
363 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j1}" |
364 |
- |
365 |
-DEFAULT_KERNEL_MAKE=make |
366 |
-DEFAULT_UTILS_MAKE=make |
367 |
- |
368 |
-DEFAULT_KERNEL_CC=gcc |
369 |
- |
370 |
-DEFAULT_UTILS_CC=gcc |
371 |
-DEFAULT_UTILS_AS=as |
372 |
-DEFAULT_UTILS_LD=ld |
373 |
|
374 |
diff --git a/arch/sparc64/config.sh b/arch/sparc64/config.sh |
375 |
index 367bfcd..620b03d 100755 |
376 |
--- a/arch/sparc64/config.sh |
377 |
+++ b/arch/sparc64/config.sh |
378 |
@@ -1,5 +1,6 @@ |
379 |
# $Id$ |
380 |
# |
381 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
382 |
# Arch-specific options that normally shouldn't be changed. |
383 |
# |
384 |
KERNEL_MAKE_DIRECTIVE="vmlinux" |
385 |
@@ -7,24 +8,3 @@ KERNEL_MAKE_DIRECTIVE_2="image" |
386 |
KERNEL_BINARY="arch/sparc64/boot/image arch/sparc/boot/image" |
387 |
|
388 |
USECOLOR="no" |
389 |
- |
390 |
-# |
391 |
-# Arch-specific defaults that can be overridden in the config file or on the |
392 |
-# command line. |
393 |
-# |
394 |
-DEFAULT_COMPRESS_INITRD=yes |
395 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
396 |
- |
397 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
398 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
399 |
- |
400 |
-DEFAULT_KERNEL_MAKE=make |
401 |
-DEFAULT_UTILS_MAKE=make |
402 |
- |
403 |
-#DEFAULT_KERNEL_CC=sparc64-linux-gcc |
404 |
-#DEFAULT_KERNEL_AS=as |
405 |
-#DEFAULT_KERNEL_LD=ld |
406 |
- |
407 |
-DEFAULT_UTILS_CC=gcc |
408 |
-DEFAULT_UTILS_AS=as |
409 |
-DEFAULT_UTILS_LD=ld |
410 |
|
411 |
diff --git a/arch/um/config.sh b/arch/um/config.sh |
412 |
index e998f11..f8bfd95 100755 |
413 |
--- a/arch/um/config.sh |
414 |
+++ b/arch/um/config.sh |
415 |
@@ -1,5 +1,6 @@ |
416 |
# $Id$ |
417 |
# |
418 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
419 |
# Arch-specific options that normally shouldn't be changed. |
420 |
# |
421 |
KERNEL_MAKE_DIRECTIVE="linux" |
422 |
@@ -7,24 +8,4 @@ KERNEL_MAKE_DIRECTIVE_2="" |
423 |
KERNEL_BINARY="linux" |
424 |
|
425 |
ARCH_HAVENOPREPARE=yes |
426 |
- |
427 |
-# |
428 |
-# Arch-specific defaults that can be overridden in the config file or on the |
429 |
-# command line. |
430 |
-# |
431 |
-DEFAULT_COMPRESS_INITRD=yes |
432 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
433 |
- |
434 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
435 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
436 |
- |
437 |
DEFAULT_KERNEL_MAKE="make ARCH=um" |
438 |
-DEFAULT_UTILS_MAKE=make |
439 |
- |
440 |
-DEFAULT_KERNEL_CC=gcc |
441 |
-DEFAULT_KERNEL_AS=as |
442 |
-DEFAULT_KERNEL_LD=ld |
443 |
- |
444 |
-DEFAULT_UTILS_CC=gcc |
445 |
-DEFAULT_UTILS_AS=as |
446 |
-DEFAULT_UTILS_LD=ld |
447 |
|
448 |
diff --git a/arch/x86/config.sh b/arch/x86/config.sh |
449 |
index 60c6ab0..dfbc120 100755 |
450 |
--- a/arch/x86/config.sh |
451 |
+++ b/arch/x86/config.sh |
452 |
@@ -1,28 +1,8 @@ |
453 |
# $Id$ |
454 |
# |
455 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
456 |
# Arch-specific options that normally shouldn't be changed. |
457 |
# |
458 |
KERNEL_MAKE_DIRECTIVE="bzImage" |
459 |
KERNEL_MAKE_DIRECTIVE_2="" |
460 |
KERNEL_BINARY="arch/i386/boot/bzImage" |
461 |
- |
462 |
-# |
463 |
-# Arch-specific defaults that can be overridden in the config file or on the |
464 |
-# command line. |
465 |
-# |
466 |
-DEFAULT_COMPRESS_INITRD=yes |
467 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
468 |
- |
469 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
470 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
471 |
- |
472 |
-DEFAULT_KERNEL_MAKE=make |
473 |
-DEFAULT_UTILS_MAKE=make |
474 |
- |
475 |
-DEFAULT_KERNEL_CC=gcc |
476 |
-DEFAULT_KERNEL_AS=as |
477 |
-DEFAULT_KERNEL_LD=ld |
478 |
- |
479 |
-DEFAULT_UTILS_CC=gcc |
480 |
-DEFAULT_UTILS_AS=as |
481 |
-DEFAULT_UTILS_LD=ld |
482 |
|
483 |
diff --git a/arch/x86_64/config.sh b/arch/x86_64/config.sh |
484 |
index b89d5ad..bf58957 100755 |
485 |
--- a/arch/x86_64/config.sh |
486 |
+++ b/arch/x86_64/config.sh |
487 |
@@ -1,28 +1,8 @@ |
488 |
# $Id$ |
489 |
# |
490 |
+# This file is sourced AFTER defaults/config.sh; generic options should be set there. |
491 |
# Arch-specific options that normally shouldn't be changed. |
492 |
# |
493 |
KERNEL_MAKE_DIRECTIVE="bzImage" |
494 |
KERNEL_MAKE_DIRECTIVE_2="" |
495 |
KERNEL_BINARY="arch/x86_64/boot/bzImage" |
496 |
- |
497 |
-# |
498 |
-# Arch-specific defaults that can be overridden in the config file or on the |
499 |
-# command line. |
500 |
-# |
501 |
-DEFAULT_COMPRESS_INITRD=yes |
502 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
503 |
- |
504 |
-PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
505 |
-DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
506 |
- |
507 |
-DEFAULT_KERNEL_MAKE=make |
508 |
-DEFAULT_UTILS_MAKE=make |
509 |
- |
510 |
-DEFAULT_KERNEL_CC=gcc |
511 |
-DEFAULT_KERNEL_AS=as |
512 |
-DEFAULT_KERNEL_LD=ld |
513 |
- |
514 |
-DEFAULT_UTILS_CC=gcc |
515 |
-DEFAULT_UTILS_AS=as |
516 |
-DEFAULT_UTILS_LD=ld |
517 |
|
518 |
diff --git a/defaults/config.sh b/defaults/config.sh |
519 |
index 6acf3bb..b961f68 100755 |
520 |
--- a/defaults/config.sh |
521 |
+++ b/defaults/config.sh |
522 |
@@ -1,25 +1,29 @@ |
523 |
-#This file does not actually appear to be run at all anymore, and is kept as an example for new arches. |
524 |
+# This file is sourced before the arch-specific configs. |
525 |
# $Id$ |
526 |
# |
527 |
-# Arch-specific options that normally shouldn't be changed. |
528 |
+# Arch-specific options that normally shouldn't be changed (and should be set in the arch-specific configs) |
529 |
# |
530 |
-KERNEL_MAKE_DIRECTIVE="bzImage" |
531 |
+KERNEL_MAKE_DIRECTIVE="--INVALID--" |
532 |
# since "" is allowed (this will translate in `make `, which is nice |
533 |
# for xen-based kernels, the default value of |
534 |
# KERNEL_MAKE_DIRECTIVE_OVERRIDE cannot be "" |
535 |
DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE="--INVALID--" |
536 |
KERNEL_MAKE_DIRECTIVE_OVERRIDE="${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}" |
537 |
KERNEL_MAKE_DIRECTIVE_2="" |
538 |
-KERNEL_BINARY="arch/i386/boot/bzImage" |
539 |
+KERNEL_BINARY="--INVALID--" |
540 |
KERNEL_BINARY_OVERRIDE="" |
541 |
|
542 |
-DEFAULT_COMPRESS_INITRD=yes |
543 |
-DEFAULT_COMPRESS_INITRD_TYPE=best |
544 |
+# At a bare minimum, every arch MUST override these two options: |
545 |
+# KERNEL_MAKE_DIRECTIVE |
546 |
+# KERNEL_BINARY |
547 |
|
548 |
# |
549 |
# Arch-specific defaults that can be overridden in the config file or on the |
550 |
# command line. |
551 |
# |
552 |
+DEFAULT_COMPRESS_INITRD=yes |
553 |
+DEFAULT_COMPRESS_INITRD_TYPE=best |
554 |
+ |
555 |
PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" |
556 |
DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" |
557 |
|
558 |
|
559 |
diff --git a/genkernel b/genkernel |
560 |
index 60300f2..e7cadcc 100755 |
561 |
--- a/genkernel |
562 |
+++ b/genkernel |
563 |
@@ -41,6 +41,7 @@ LOGLEVEL=${LOGLEVEL:-1} |
564 |
|
565 |
# Start sourcing other scripts |
566 |
source ${GK_SHARE}/defaults/software.sh || small_die "Could not read ${GK_SHARE}/defaults/software.sh" |
567 |
+source ${GK_SHARE}/defaults/config.sh || small_die "Could not read ${GK_SHARE}/defaults/config.sh" |
568 |
source ${GK_SHARE}/gen_funcs.sh || small_die "Could not read ${GK_SHARE}/gen_funcs.sh" |
569 |
source ${GK_SHARE}/gen_cmdline.sh || gen_die "Could not read ${GK_SHARE}/gen_cmdline.sh" |
570 |
source ${GK_SHARE}/gen_arch.sh || gen_die "Could not read ${GK_SHARE}/gen_arch.sh" |