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 CAC61138359 for ; Thu, 16 Jul 2020 18:36:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7C4FE0806; Thu, 16 Jul 2020 18:36:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B29FAE0806 for ; Thu, 16 Jul 2020 18:36:52 +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 C2CFD34EF24 for ; Thu, 16 Jul 2020 18:36:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A07E2DD for ; Thu, 16 Jul 2020 18:36:50 +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: <1594922198.a864c2fa9a75c488355a9f4821aa5bc97cc188c5.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: a864c2fa9a75c488355a9f4821aa5bc97cc188c5 X-VCS-Branch: master Date: Thu, 16 Jul 2020 18:36:50 +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: 41ec3d83-5487-49b4-81d6-69535858f84e X-Archives-Hash: 8717f4caaa0ecc9f11740dc90e59310f commit: a864c2fa9a75c488355a9f4821aa5bc97cc188c5 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Jul 16 17:56:38 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Jul 16 17:56:38 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a864c2fa gen_initramfs.sh: create_initramfs(): Call set_initramfs_compression_method() when not building kernel We need to call set_initramfs_compression_method() manually when we didn't build kernel in same run to ensure that $COMPRESS_INITRD_TYPE is initialized. Signed-off-by: Thomas Deutschmann gentoo.org> gen_initramfs.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 617c656..ba7b5e8 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -1912,6 +1912,13 @@ create_initramfs() { else if isTrue "${COMPRESS_INITRD}" then + if ! isTrue "${BUILD_KERNEL}" + then + # We need to initialize COMPRESS_INITRD_TYPE in case it was set + # to best/fastest + set_initramfs_compression_method "${KERNEL_OUTPUTDIR}/.config" + fi + print_info 1 "$(get_indent 1)>> Compressing cpio data (${GKICM_LOOKUP_TABLE_EXT[${COMPRESS_INITRD_TYPE}]}) ..." print_info 3 "COMMAND: ${GKICM_LOOKUP_TABLE_CMD[${COMPRESS_INITRD_TYPE}]} ${CPIO_ARCHIVE}" 1 0 1 ${GKICM_LOOKUP_TABLE_CMD[${COMPRESS_INITRD_TYPE}]} "${CPIO_ARCHIVE}" || gen_die "Initramfs compression using '${GKICM_LOOKUP_TABLE_CMD[${COMPRESS_INITRD_TYPE}]}' failed"