Skip to contentSkip to conversation

Patch "x86, build: copy ldlinux.c32 to image.iso" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jul 11, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

x86, build: copy ldlinux.c32 to image.iso

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     x86-build-copy-ldlinux.c32-to-image.iso.patch

and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 9c77679cadb118c0aa99e6f88533d91765a131ba Mon Sep 17 00:00:00 2001

From: "H. Peter Anvin" <[email protected]>
Date: Tue, 5 Apr 2016 17:01:33 -0700
Subject: x86, build: copy ldlinux.c32 to image.iso

From: H. Peter Anvin <[email protected]>

commit 9c77679cadb118c0aa99e6f88533d91765a131ba upstream.

For newer versions of Syslinux, we need ldlinux.c32 in addition to isolinux.bin to reside on the boot disk, so if the latter is found, copy it, too, to the isoimage tree.

---
 arch/x86/boot/Makefile |    3 +++
 1 file changed, 3 insertions(+)
arch/x86/boot/Makefile +3 -0
@@ -162,6 +162,9 @@ isoimage: $(obj)/bzImage
 	for i in lib lib64 share end ; do \
 		if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \
 			cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \
+			if [ -f /usr/$$i/syslinux/ldlinux.c32 ]; then \
+				cp /usr/$$i/syslinux/ldlinux.c32 $(obj)/isoimage ; \
+			fi ; \
 			break ; \
 		fi ; \
 		if [ $$i = end ] ; then exit 1 ; fi ; \

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/kprobes-x86-clear-tf-bit-in-fault-on-single-stepping.patch queue-4.4/x86-build-copy-ldlinux.c32-to-image.iso.patch