diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2016-10-12 06:48:30 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2016-10-12 06:48:30 -0700 |
| commit | c9855842ac422b8d3a6e7265b6a3c00efe3891e7 (patch) | |
| tree | c00c8e94dd725bb538387059405192d7cd9bbf88 /gen_compile.sh | |
| parent | Bump version to 3.5.0.5 (diff) | |
| download | genkernel-c9855842ac422b8d3a6e7265b6a3c00efe3891e7.tar.gz genkernel-c9855842ac422b8d3a6e7265b6a3c00efe3891e7.tar.bz2 genkernel-c9855842ac422b8d3a6e7265b6a3c00efe3891e7.zip | |
FIRMWARE_INSTALL control option.
Prefer sys-kernel/linux-firmware to be installed and used rather than
always running firmware_install and overwriting the root copy.
Defaults to FIRMWARE_INSTALL=no, with ebuild updated to RDEPEND on
sys-kernel/linux-firmware, via IUSE='+firmware'
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'gen_compile.sh')
| -rwxr-xr-x | gen_compile.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gen_compile.sh b/gen_compile.sh index 0bb1399..3a77a75 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -333,15 +333,19 @@ compile_kernel() { compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel fi - local firmware_in_kernel_line=`fgrep CONFIG_FIRMWARE_IN_KERNEL "${KERNEL_OUTPUTDIR}"/.config` - if [ -n "${firmware_in_kernel_line}" -a "${firmware_in_kernel_line}" != CONFIG_FIRMWARE_IN_KERNEL=y ] - then - print_info 1 " >> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..." - [ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH - [ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH - MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel + if isTrue "${FIRMWARE_INSTALL}" ; then + local firmware_in_kernel_line=`fgrep CONFIG_FIRMWARE_IN_KERNEL "${KERNEL_OUTPUTDIR}"/.config` + if [ -n "${firmware_in_kernel_line}" -a "${firmware_in_kernel_line}" != CONFIG_FIRMWARE_IN_KERNEL=y ] + then + print_info 1 " >> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..." + [ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH + [ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH + MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel + else + print_info 1 " >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..." + fi else - print_info 1 " >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..." + print_info 1 " >> Not installing firmware as requested by configuration FIRMWARE_INSTALL=no..." fi local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}}) |