From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1078845-garchives=archives.gentoo.org@lists.gentoo.org>
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 5DDF5138334
for <garchives@archives.gentoo.org>; Thu, 21 Mar 2019 22:57:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6BBD2E09C4;
Thu, 21 Mar 2019 22:56:59 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 41B4EE09C4
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Mar 2019 22:56:59 +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 50254335D0F
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Mar 2019 22:56:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 33A9C518
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Mar 2019 22:56:55 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
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" <whissi@gentoo.org>
Message-ID: <1553208066.919cbc4b10215b54fb7b1c74b11ea25534243608.whissi@gentoo>
Subject: [gentoo-commits] proj/genkernel:bug642988 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: 919cbc4b10215b54fb7b1c74b11ea25534243608
X-VCS-Branch: bug642988
Date: Thu, 21 Mar 2019 22:56:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 87d59d0d-7b79-4cfd-8088-8cc2a8dcf80e
X-Archives-Hash: 2e07356627804614cdd4e5084aeb9c29
commit: 919cbc4b10215b54fb7b1c74b11ea25534243608
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 22:41:06 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 22:41:06 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=919cbc4b
create_initramfs(): Move ACTUAL_KERNEL_CONFIG block
This will allow us to do additional kernel config checks.
Bug: https://bugs.gentoo.org/673590
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gen_initramfs.sh | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 175ccc5..a0c7601 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1065,6 +1065,21 @@ create_initramfs() {
cd "${TEMP}"
+ # NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
+ # "make oldconfig" or --noclean could be in effect.
+ if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
+ local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
+ else
+ local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
+ fi
+
+ if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
+ # Support --kernel-config=/proc/config.gz, mainly
+ local CONFGREP=zgrep
+ else
+ local CONFGREP=grep
+ fi
+
if isTrue "${INTEGRATED_INITRAMFS}"
then
# Explicitly do not compress if we are integrating into the kernel.
@@ -1099,21 +1114,6 @@ create_initramfs() {
else
if isTrue "${COMPRESS_INITRD}"
then
- # NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
- # "make oldconfig" or --noclean could be in effect.
- if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
- local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
- else
- local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
- fi
-
- if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
- # Support --kernel-config=/proc/config.gz, mainly
- local CONFGREP=zgrep
- else
- local CONFGREP=grep
- fi
-
cmd_xz=$(type -p xz)
cmd_lzma=$(type -p lzma)
cmd_bzip2=$(type -p bzip2)
@@ -1177,6 +1177,7 @@ create_initramfs() {
print_info 1 "$(getIndent 1)>> Not compressing cpio data ..."
fi
fi
+
## To early load microcode we need to follow some pretty specific steps
## mostly laid out in linux/Documentation/x86/early-microcode.txt
## It only loads monolithic ucode from an uncompressed cpio, which MUST
From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1078855-garchives=archives.gentoo.org@lists.gentoo.org>
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 6299D138334
for <garchives@archives.gentoo.org>; Thu, 21 Mar 2019 23:51:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 393D2E08C3;
Thu, 21 Mar 2019 23:51:22 +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 14F53E08C3
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Mar 2019 23:51:22 +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 1759C335D29
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Mar 2019 23:51:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D175557A
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Mar 2019 23:51:17 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
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" <whissi@gentoo.org>
Message-ID: <1553208066.919cbc4b10215b54fb7b1c74b11ea25534243608.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: 919cbc4b10215b54fb7b1c74b11ea25534243608
X-VCS-Branch: master
Date: Thu, 21 Mar 2019 23:51:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6a841fe5-3d35-46e8-90c8-f3aa6e6b1a88
X-Archives-Hash: 2be835489126e59b0f54893f127f4f83
Message-ID: <20190321235117.v2zoe74kcafeI7NXsfXhAnpBSK-H1lfz_G1FDpTiPJs@z>
commit: 919cbc4b10215b54fb7b1c74b11ea25534243608
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 22:41:06 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 22:41:06 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=919cbc4b
create_initramfs(): Move ACTUAL_KERNEL_CONFIG block
This will allow us to do additional kernel config checks.
Bug: https://bugs.gentoo.org/673590
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gen_initramfs.sh | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 175ccc5..a0c7601 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1065,6 +1065,21 @@ create_initramfs() {
cd "${TEMP}"
+ # NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
+ # "make oldconfig" or --noclean could be in effect.
+ if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
+ local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
+ else
+ local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
+ fi
+
+ if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
+ # Support --kernel-config=/proc/config.gz, mainly
+ local CONFGREP=zgrep
+ else
+ local CONFGREP=grep
+ fi
+
if isTrue "${INTEGRATED_INITRAMFS}"
then
# Explicitly do not compress if we are integrating into the kernel.
@@ -1099,21 +1114,6 @@ create_initramfs() {
else
if isTrue "${COMPRESS_INITRD}"
then
- # NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
- # "make oldconfig" or --noclean could be in effect.
- if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
- local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
- else
- local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
- fi
-
- if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
- # Support --kernel-config=/proc/config.gz, mainly
- local CONFGREP=zgrep
- else
- local CONFGREP=grep
- fi
-
cmd_xz=$(type -p xz)
cmd_lzma=$(type -p lzma)
cmd_bzip2=$(type -p bzip2)
@@ -1177,6 +1177,7 @@ create_initramfs() {
print_info 1 "$(getIndent 1)>> Not compressing cpio data ..."
fi
fi
+
## To early load microcode we need to follow some pretty specific steps
## mostly laid out in linux/Documentation/x86/early-microcode.txt
## It only loads monolithic ucode from an uncompressed cpio, which MUST