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 18F472C327E; Mon, 2 Jun 2025 15:09:51 +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=1748876991; cv=none; b=FiHcfHXvQbJpd4zecIM2gbiJrCw4Ksw6vsEkC5zeAWZJuJBIQANsIbiLE4kyCVCF8CWzjvJVvtQrN6Q/gwSjhIepQBlZIT1UY87dy8bGS4VTBBBtbiX8C3Ku1mJtFDafLIGf8NRec+U97ekgYDzfVDyZ/dniYzwzT92BgmtzAv4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748876991; c=relaxed/simple; bh=hMexWv6w3+m3HfJ3kIf4FJZQ3HGqrASVckhsecXerGA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HaYQza7HKChGpWoA0e+hT2cgu0mpntXiOIaJLF6Zw39E+4s1rH2MZ5nCMD2mVuu5tShW2pAXMa48CVzbuROoAr5JJ6MRzgCpiCio/lBuR4p8NTBgeOqUMxz+m1019Fk6OGDy5fwHpd+mwMY+W02+dIPBpzifUYftkzofGFZe570= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WgM2woSQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WgM2woSQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7AD09C4CEEE; Mon, 2 Jun 2025 15:09:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748876991; bh=hMexWv6w3+m3HfJ3kIf4FJZQ3HGqrASVckhsecXerGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WgM2woSQQmv+Rm/WYkB2sKek5YNKv295+wKUwQJ6Hhk3mjtQrgg3AdN575JCyNhqR 9f5RDpktL3PQqUwi+LdQ4VykpkA44ZRIte6ru8S18uuunzvEq4euWN6YgbQlgW7Cdv MlkLbS8MfolvNjEB+JKeBD9psDavjMW92WErVWAE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nir Lichtman , Ingo Molnar , "H. Peter Anvin" , Ard Biesheuvel , Masahiro Yamada , Michal Marek , Sasha Levin Subject: [PATCH 6.1 136/325] x86/build: Fix broken copy command in genimage.sh when making isoimage Date: Mon, 2 Jun 2025 15:46:52 +0200 Message-ID: <20250602134325.333357459@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134319.723650984@linuxfoundation.org> References: <20250602134319.723650984@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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