summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwan Velu <erwan.velu@free.fr>2009-10-27 23:33:12 +0100
committerErwan Velu <erwan.velu@free.fr>2009-10-27 23:33:12 +0100
commit53fb37cfa09127a56dc68c95f3dfa877d11452f4 (patch)
tree099c2661f6d4268e35237a0a2c9349236db946c2
parent4dc540d979c770c6131217d6e94b29a6f188e1c1 (diff)
downloadsyslinux-53fb37cfa09127a56dc68c95f3dfa877d11452f4.tar.gz
hdt: Fixing hdt.iso target, pci.ids was missing
Impact: Iso file is now having pci.ids The makefile did forget to copy the pci.ids into the iso. This stupid test is fixed. Thx gert from reporting it.
-rw-r--r--com32/hdt/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile
index a939d7b2..65047485 100644
--- a/com32/hdt/Makefile
+++ b/com32/hdt/Makefile
@@ -59,10 +59,11 @@ hdt.iso: hdt.c32 $(topdir)/core/isolinux.bin $(FLOPPY_DIR)/hdt.cfg
cp $(topdir)/core/isolinux.bin $(ISO_DIR)/$(ISOLINUX_DIR)
cp $(FLOPPY_DIR)/hdt.cfg $(ISO_DIR)/$(ISOLINUX_DIR)/isolinux.cfg
cp hdt.c32 $(ISO_DIR)/$(ISOLINUX_DIR)
- -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/hwdata/pci.ids $(ISO_DIR)/$(ISOLINUX_DIR)
- -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/pci.ids $(ISO_DIR)/$(ISOLINUX_DIR)
+ -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/hwdata/pci.ids $(PCI_IDS_FILE)
+ -[ ! -f $(PCI_IDS_FILE) ] && cp /usr/share/pci.ids $(PCI_IDS_FILE)
-[ -f $(MODULES_ALIAS_FILE) ] && cp $(MODULES_ALIAS_FILE) $(ISO_DIR)/$(ISOLINUX_DIR)
-[ -f $(MODULES_PCIMAP_FILE) ] && cp $(MODULES_PCIMAP_FILE) $(ISO_DIR)/$(ISOLINUX_DIR)
+ -[ ! -f $(ISO_DIR)/$(ISOLINUX_DIR)/pci.ids ] && cp $(PCI_IDS_FILE) $(ISO_DIR)/$(ISOLINUX_DIR)
-[ ! -f $(ISO_DIR)/$(ISOLINUX_DIR)/pci.ids ] && printf "\nThe $(FLOPPY_DIR)/pci.ids file is missing and can be downloaded from http://pciids.sourceforge.net and put in\nthe ./com32/hdt/$(FLOPPY_DIR) directory of the extracted Syslinux source.\n\n"
$(MKISOFS) -o hdt.iso -b $(ISOLINUX_DIR)/isolinux.bin -c $(ISOLINUX_DIR)/boot.cat \
-no-emul-boot -boot-load-size 4 -boot-info-table \