From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762032AbcLSL1p (ORCPT ); Mon, 19 Dec 2016 06:27:45 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:53085 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753318AbcLSL1n (ORCPT ); Mon, 19 Dec 2016 06:27:43 -0500 Date: Mon, 19 Dec 2016 12:24:44 +0100 (CET) From: Thomas Gleixner To: Andi Kleen cc: x86@kernel.org, mmarek@suse.com, linux-kernel@vger.kernel.org, Andi Kleen Subject: Re: [PATCH] x86: Unbreak "make isoimage" with isolinux In-Reply-To: <20161202231822.25616-1-andi@firstfloor.org> Message-ID: References: <20161202231822.25616-1-andi@firstfloor.org> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2 Dec 2016, Andi Kleen wrote: > 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 \ According to https://apps.fedoraproject.org/packages/syslinux-nonlinux/ both isolinux.bin and ldlinux.c32 are installed into /usr/share/syslinux/ So the existing check for isolinux.bin which has the ldlinux.c32 part inside should just work unless I'm missing something important. Thanks, tglx