Fixes the isoimage target.

ghdk · Jul 18, 2016 · c15a5ae · c15a5ae
1 parent 5e149dd
commit c15a5ae
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
@@ -158,18 +158,26 @@ isoimage: $(obj)/bzImage
 	-rm -rf $(obj)/isoimage
 	mkdir $(obj)/isoimage
 	for i in lib lib64 share end ; do \
+		if [ -f /usr/$$i/syslinux/modules/bios/ldlinux.c32 ] ; then \
+			cp /usr/$$i/syslinux/modules/bios/ldlinux.c32 $(obj)/isoimage ; \
+		fi; \
 		if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \
 			cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \
 			break ; \
 		fi ; \
+		if [ -f /usr/$$i/ISOLINUX/isolinux.bin ] ; then \
+			cp /usr/$$i/ISOLINUX/isolinux.bin $(obj)/isoimage ; \
+			break ; \
+		fi ; \
 		if [ $$i = end ] ; then exit 1 ; fi ; \
 	done
 	cp $(obj)/bzImage $(obj)/isoimage/linux
 	echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg
 	if [ -f '$(FDINITRD)' ] ; then \
 		cp '$(FDINITRD)' $(obj)/isoimage/initrd.img ; \
 	fi
-	mkisofs -J -r -o $(obj)/image.iso -b isolinux.bin -c boot.cat \
+	$$(which mkisofs || which xorrisofs) -J -r \
+		-o $(obj)/image.iso -b isolinux.bin -c boot.cat \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
 		$(obj)/isoimage
 	isohybrid $(obj)/image.iso 2>/dev/null || true