From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A9F729CB49; Mon, 5 May 2025 22:48:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485281; cv=none; b=ILzeQVWnqs4sAS4ZWz5Sd/9mqjn8QutQxa6AO54cqm7IeuA0E4bToojlR1VUIIfhoaL8tnO283VJ1UEVwBqQ8CwGqsv1CGVC8c5ZcGcRDqNIH54ih4TjEvlHU58pOt+dngw3dwDlTz6gd4RuHNfA98t7CMmqe5U4CanjbFxcVRM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485281; c=relaxed/simple; bh=Svz4wnp7COiUCkLASvgsNelQAE+ZagYIac/R1LzByOo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ivh9vhohltidVb85+5HzM8Pcii4cHKGvABcyq5WbXZtMG86e4CR2OQ2GMBgcCw3deVByyHgI+v7fESqhLWtFsYXP+nYwCBRvNfWkpCDdMbHmneHmybgybcmBZWglWVVSmNBDq6dJ+WFB5ZOznZ6/04+T8Ikk3nNvcZ1/olESRXg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k7NRojKo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k7NRojKo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1440C4CEE4; Mon, 5 May 2025 22:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485281; bh=Svz4wnp7COiUCkLASvgsNelQAE+ZagYIac/R1LzByOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k7NRojKoPV/A/pxs5He/OQYX0z7vsNDhB4Wd5Y/TzDHUbYhJuLe60MgCVGlQUr1DB FHczpphjNj8G6U7jPllzcXk/3k3Il9O6YMoYWgF9PPiL4lxtYCQpjNfD1+d1S4Lc6v p3V6OZ6wpL8pITLND0561Al9qdellX83jAfljWqjWL9lyrApMbki+ZPGpKxIQj6SeD YP1zYJAevaJYqj2G4hLT7LS04Tud2AwFqkTLHPtOZzpyEDdABdFvyn3o/dNPSW5Oln MK53zXKA6U66p4eOlACGOw0XhTmXt5dib3tUUMTDw5YE+zCexz9gA17qzpX/cEw5EW czIC23xbABbAA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nir Lichtman , Ingo Molnar , "H. Peter Anvin" , Ard Biesheuvel , Masahiro Yamada , Michal Marek , Sasha Levin , tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org Subject: [PATCH AUTOSEL 6.12 251/486] x86/build: Fix broken copy command in genimage.sh when making isoimage Date: Mon, 5 May 2025 18:35:27 -0400 Message-Id: <20250505223922.2682012-251-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505223922.2682012-1-sashal@kernel.org> References: <20250505223922.2682012-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.26 Content-Transfer-Encoding: 8bit From: Nir Lichtman [ Upstream commit e451630226bd09dc730eedb4e32cab1cc7155ae8 ] Problem: Currently when running the "make isoimage" command there is an error related to wrong parameters passed to the cp command: "cp: missing destination file operand after 'arch/x86/boot/isoimage/'" This is caused because FDINITRDS is an empty array. Solution: Check if FDINITRDS is empty before executing the "cp" command, similar to how it is done in the case of hdimage. Signed-off-by: Nir Lichtman Signed-off-by: Ingo Molnar Cc: "H. Peter Anvin" Cc: Ard Biesheuvel Cc: Masahiro Yamada Cc: Michal Marek Link: https://lore.kernel.org/r/20250110120500.GA923218@lichtman.org Signed-off-by: Sasha Levin --- arch/x86/boot/genimage.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/genimage.sh b/arch/x86/boot/genimage.sh index c9299aeb7333e..3882ead513f74 100644 --- a/arch/x86/boot/genimage.sh +++ b/arch/x86/boot/genimage.sh @@ -22,6 +22,7 @@ # This script requires: # bash # syslinux +# genisoimage # mtools (for fdimage* and hdimage) # edk2/OVMF (for hdimage) # @@ -251,7 +252,9 @@ geniso() { cp "$isolinux" "$ldlinux" "$tmp_dir" cp "$FBZIMAGE" "$tmp_dir"/linux echo default linux "$KCMDLINE" > "$tmp_dir"/isolinux.cfg - cp "${FDINITRDS[@]}" "$tmp_dir"/ + if [ ${#FDINITRDS[@]} -gt 0 ]; then + cp "${FDINITRDS[@]}" "$tmp_dir"/ + fi genisoimage -J -r -appid 'LINUX_BOOT' -input-charset=utf-8 \ -quiet -o "$FIMAGE" -b isolinux.bin \ -c boot.cat -no-emul-boot -boot-load-size 4 \ -- 2.39.5