ISOLINUX: fix booting when mastered with non-mkisofs tools

When we are *not* mastered with mkisofs, we depend on running the
checksumiso.pl script, in order to create a default boot info table.
Due to the Makefile changes in 3.50 (commit
9e3d217ee3869e4f4ddb1466621c079e14754660) that hasn't happened since
3.50-pre23.

Make it work now.

diff --git a/Makefile b/Makefile
index 5962e95..9fddb8a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,15 @@ version.h: version version.pl
 kwdhash.gen: keywords genhash.pl
        $(PERL) genhash.pl < keywords > kwdhash.gen
 
-# Standard rule for {ldlinux,pxelinux,isolinux,isolinux-debug,extlinux}.bin
+# Standard rule for {isolinux,isolinux-debug}.bin
+iso%.bin: iso%.asm kwdhash.gen version.gen
+       $(NASM) $(NASMOPT) -f bin -DDATE_STR="'$(DATE)'" -DHEXDATE="$(HEXDATE)" \
+               -DMAP=$(@:.bin=.map) -l $(@:.bin=.lsr) -o $@ $<
+       $(PERL) lstadjust.pl $(@:.bin=.lsr) $(@:.bin=.map) $(@:.bin=.lst)
+       $(PERL) checksumiso.pl $@
+       $(PERL) checkov.pl $(@:.bin=.map) $@
+
+# Standard rule for {ldlinux,pxelinux,extlinux}.bin
 %.bin: %.asm kwdhash.gen version.gen
        $(NASM) $(NASMOPT) -f bin -DDATE_STR="'$(DATE)'" -DHEXDATE="$(HEXDATE)" \
                -DMAP=$(@:.bin=.map) -l $(@:.bin=.lsr) -o $@ $<

diff --git a/NEWS b/NEWS
index 220fc0f..b618dac 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Changes in 3.61:
        * EXTLINUX: fix crash when accessing an empty file.
        * elf.c32: If a PHDR segment is present, load it.
        * Fix SHA-1 passwords.
+       * ISOLINUX: fix booting when mastered without
+         mkisofs -boot-info-table (broken since 3.50, sigh...)
 
 Changes in 3.60:
        * Support for "auxilliary data vector", a small amount of