x86: Unbreak "make isoimage" with isolinux
PATCH 1/1 x86: Unbreak "make isoimage" with isolinux
From: Andi Kleen <[email protected]>
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.
--- arch/x86/boot/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/boot/Makefile +2 -0
@@ -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 \
Signature · 1 line
2.9.3
Quoted 24 lines · Andi Kleen
From: Andi Kleen <[email protected]>
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 <[email protected]>--- arch/x86/boot/Makefile | 2 ++ 1 file changed, 2 insertions(+)arch/x86/boot/Makefile +0
-0
arch/x86/boot/Makefile isoimage: $(obj)/bzImage · line 167
Quoted 8 lines
arch/x86/boot/Makefile +2
-0@@ -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