From: Andi Kleen <andi@firstfloor.org>
To: x86@kernel.org
Cc: mmarek@suse.com, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH] x86: Unbreak "make isoimage" with isolinux
Date: Fri, 2 Dec 2016 15:18:22 -0800 [thread overview]
Message-ID: <20161202231822.25616-1-andi@firstfloor.org> (raw)
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 \
--
2.9.3
next reply other threads:[~2016-12-02 23:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 23:18 Andi Kleen [this message]
2016-12-19 11:24 ` [PATCH] x86: Unbreak "make isoimage" with isolinux Thomas Gleixner
-- strict thread matches above, loose matches on Subject: below --
2016-11-18 16:58 Andi Kleen
2016-03-18 18:02 Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161202231822.25616-1-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).