Messages in this thread | | | Date | Mon, 19 Dec 2016 12:24:44 +0100 (CET) | From | Thomas Gleixner <> | Subject | Re: [PATCH] x86: Unbreak "make isoimage" with isolinux |
| |
On Fri, 2 Dec 2016, Andi Kleen wrote: > From: Andi Kleen <ak@linux.intel.com> > > 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 <ak@linux.intel.com> > --- > 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
| |