From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754929AbcLBXTQ (ORCPT ); Fri, 2 Dec 2016 18:19:16 -0500 Received: from mga03.intel.com ([134.134.136.65]:48744 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752550AbcLBXTM (ORCPT ); Fri, 2 Dec 2016 18:19:12 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,289,1477983600"; d="scan'208";a="12902512" From: Andi Kleen To: x86@kernel.org Cc: mmarek@suse.com, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH] x86: Unbreak "make isoimage" with isolinux Date: Fri, 2 Dec 2016 15:18:22 -0800 Message-Id: <20161202231822.25616-1-andi@firstfloor.org> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen make isoimage doesn't work on recent Fedora versions, the resulting image always fails with "Failed to load ldlinux.c32 ..." The fix (originally found by "SebbiUltimate" on reddit) just copies the file into the iso image. On Fedora, this is somewhat complicated by the fact that the syslinux package was split into syslinux and "syslinux-nonlinux", but the ldlinux.c32 file needed to boot Linux is actually in the syslinux-nonlinux package(!). So it will only work when that package is installed, which updates from older versions don't do. Signed-off-by: Andi Kleen --- arch/x86/boot/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 12ea8f8384f4..8d0919872c5c 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -160,6 +160,8 @@ isoimage: $(obj)/bzImage -rm -rf $(obj)/isoimage mkdir $(obj)/isoimage for i in lib lib64 share end ; do \ + [ -r /usr/$$i/syslinux/ldlinux.c32 ] && \ + cp /usr/$$i/syslinux/ldlinux.c32 $(obj)/isoimage ; \ if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \ cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \ if [ -f /usr/$$i/syslinux/ldlinux.c32 ]; then \ -- 2.9.3