summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-01-17 01:14:57 -0500
committerH. Peter Anvin <hpa@zytor.com>2008-01-17 01:30:01 -0500
commit8e0e6580eca67b69007a93d05ffa4f57ea6a0b28 (patch)
tree896d1b4b68c2253bc6ea32b9a814eb672ed67e41
parent913407066687306f9b5f51e0a649989888d1cebb (diff)
downloadsyslinux-3.61-pre2.tar.gz
ISOLINUX: fix booting when mastered with non-mkisofs toolssyslinux-3.61-pre2
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.
-rw-r--r--Makefile10
-rw-r--r--NEWS2
2 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5962e958..9fddb8a9 100644
--- 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 220fc0f1..b618daca 100644
--- 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