From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AB0801393D0 for ; Thu, 27 Oct 2016 15:23:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2476AE0B9C; Thu, 27 Oct 2016 15:22:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2C90E0B9C for ; Thu, 27 Oct 2016 15:22:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5ED56341651 for ; Thu, 27 Oct 2016 15:22:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFA1A2413 for ; Thu, 27 Oct 2016 15:22:41 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1477580970.1f1a4409da8dcd38aa0ec27f7f07d07ed866bc0b.zerochaos@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 1f1a4409da8dcd38aa0ec27f7f07d07ed866bc0b X-VCS-Branch: master Date: Thu, 27 Oct 2016 15:22:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2998e316-01c0-47dc-9292-911914a1bb68 X-Archives-Hash: 4c1664f10a557c129b47a43f6a55c605 commit: 1f1a4409da8dcd38aa0ec27f7f07d07ed866bc0b Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Thu Oct 27 15:09:30 2016 +0000 Commit: Richard Farina gentoo org> CommitDate: Thu Oct 27 15:09:30 2016 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1f1a4409 enhance early microcode by actually checking if it will work gen_initramfs.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index fb74929..1f62f5c 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -1042,26 +1042,26 @@ create_initramfs() { fi ## To early load microcode we need to follow some pretty specific steps ## mostly laid out in linux/Documentation/x86/early-microcode.txt - #if CONFIG_MICROCODE=y; then + if grep -sq '^CONFIG_MICROCODE=y' "${KERNEL_OUTPUTDIR}"/.config; then print_info 1 "early-microcode: >> Preparing..." UCODEDIR="${TMPDIR}/ucode_tmp/kernel/x86/microcode/" mkdir -p "${UCODEDIR}" - #if CONFIG_MICROCODE_INTEL=y; then + if grep -sq '^CONFIG_MICROCODE_INTEL=y' "${KERNEL_OUTPUTDIR}"/.config; then if [ "$(ls -A /lib/firmware/intel-ucode)" ]; then print_info 1 " >> adding GenuineIntel.bin" cat /lib/firmware/intel-ucode/* > "${UCODEDIR}/GenuineIntel.bin" || gen_die "Failed to concat intel cpu ucode" - #else - #print_info 1 "CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]" + else + print_info 1 "CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]" fi - #fi - #if CONFIG_MICROCODE_AMD=y; then + fi + if grep -sq '^CONFIG_MICROCODE_AMD=y' "${KERNEL_OUTPUTDIR}"/.config; then if [ "$(ls -A /lib/firmware/amd-ucode)" ]; then print_info 1 " >> adding AuthenticAMD.bin" cat /lib/firmware/amd-ucode/*.bin > "${UCODEDIR}/AuthenticAMD.bin" || gen_dir "Failed to concat amd cpu ucode" - #else - #print_info 1 "CONFIG_MICROCODE_AMD=y set but no ucode available. Please install sys-firmware/linux-firmware" + else + print_info 1 "CONFIG_MICROCODE_AMD=y set but no ucode available. Please install sys-firmware/linux-firmware" fi - #fi + fi if [ "$(ls -A ${UCODE})" ]; then print_info 1 "early-microcode: >> Creating cpio..." pushd "${TMPDIR}/ucode_tmp" > /dev/null @@ -1070,10 +1070,10 @@ create_initramfs() { print_info 1 "early-microcode: >> Prepending early-microcode to initramfs" cat "${TMPDIR}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs" mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed" - #else - #print_info 1 "CONFIG_MICROCODE=y is set but no microcode found" + else + print_info 1 "CONFIG_MICROCODE=y is set but no microcode found" fi - #fi + fi if isTrue "${WRAP_INITRD}" then local mkimage_cmd=$(type -p mkimage)