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 9D539138334 for ; Sat, 23 Mar 2019 09:52:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40832E0A49; Sat, 23 Mar 2019 09:52:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10427E0A45 for ; Sat, 23 Mar 2019 09:52:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9924335D07 for ; Sat, 23 Mar 2019 09:52:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C98558A for ; Sat, 23 Mar 2019 09:52:42 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1553328668.31e006d1dc59c52c853d974a00dfbd7ed816e555.whissi@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: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 31e006d1dc59c52c853d974a00dfbd7ed816e555 X-VCS-Branch: master Date: Sat, 23 Mar 2019 09:52:42 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 08c5c598-9618-4144-9d8c-2545a99b571c X-Archives-Hash: 0bb5ca78ad6196682fe082567fcdd0f1 commit: 31e006d1dc59c52c853d974a00dfbd7ed816e555 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Mar 23 06:53:32 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Mar 23 08:11:08 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=31e006d1 create_initramfs(): Create ucode cpio in $TEMP Signed-off-by: Thomas Deutschmann gentoo.org> gen_initramfs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index f4706a5..d684844 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -1203,7 +1203,7 @@ create_initramfs() { cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL) cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD) print_info 1 "$(getIndent 1)>> Adding early-microcode support..." - UCODEDIR="${TMPDIR}/ucode_tmp/kernel/x86/microcode/" + UCODEDIR="${TEMP}/ucode_tmp/kernel/x86/microcode/" mkdir -p "${UCODEDIR}" if [ "${cfg_CONFIG_MICROCODE_INTEL}" == "y" ]; then if [ -d /lib/firmware/intel-ucode ]; then @@ -1223,11 +1223,11 @@ create_initramfs() { fi if [ -f "${UCODEDIR}/AuthenticAMD.bin" -o -f "${UCODEDIR}/GenuineIntel.bin" ]; then print_info 1 "$(getIndent 2)early-microcode: Creating cpio..." - pushd "${TMPDIR}/ucode_tmp" > /dev/null + pushd "${TEMP}/ucode_tmp" > /dev/null find . | cpio -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio" popd > /dev/null print_info 1 "$(getIndent 2)early-microcode: Prepending early-microcode to initramfs..." - cat "${TMPDIR}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs" + cat "${TEMP}/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 "$(getIndent 2)early-microcode: CONFIG_MICROCODE=y is set but no microcode found"