diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2016-02-29 13:47:36 -0800 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2016-02-29 13:47:36 -0800 |
commit | 41a7b4515071ef386f919215fa02a90beb426500 (patch) | |
tree | f1aefe1992339598fb0f65932b5e2868e05360ef /arch/um | |
parent | fix rootfs detection per bug #552052 (diff) | |
download | genkernel-41a7b4515071ef386f919215fa02a90beb426500.tar.gz genkernel-41a7b4515071ef386f919215fa02a90beb426500.tar.bz2 genkernel-41a7b4515071ef386f919215fa02a90beb426500.zip |
config.sh: ensure generic config.sh is used again; and refactor duplicate settings.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'arch/um')
-rwxr-xr-x | arch/um/config.sh | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/um/config.sh b/arch/um/config.sh index e998f11..f8bfd95 100755 --- a/arch/um/config.sh +++ b/arch/um/config.sh @@ -1,5 +1,6 @@ # $Id$ # +# This file is sourced AFTER defaults/config.sh; generic options should be set there. # Arch-specific options that normally shouldn't be changed. # KERNEL_MAKE_DIRECTIVE="linux" @@ -7,24 +8,4 @@ KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="linux" ARCH_HAVENOPREPARE=yes - -# -# Arch-specific defaults that can be overridden in the config file or on the -# command line. -# -DEFAULT_COMPRESS_INITRD=yes -DEFAULT_COMPRESS_INITRD_TYPE=best - -PORTAGE_MAKEOPTS="$(portageq envvar MAKEOPTS)" -DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j2}" - DEFAULT_KERNEL_MAKE="make ARCH=um" -DEFAULT_UTILS_MAKE=make - -DEFAULT_KERNEL_CC=gcc -DEFAULT_KERNEL_AS=as -DEFAULT_KERNEL_LD=ld - -DEFAULT_UTILS_CC=gcc -DEFAULT_UTILS_AS=as -DEFAULT_UTILS_LD=ld |