[syslinux:master] hdt: Using dashed instead of . into label name
syslinux-bot for Erwan Velu
erwanaliasr1 at gmail.com
Mon Apr 25 15:29:28 PDT 2011
Commit-ID: 08dfec7bdce12402adfad7f489dba73f2f5ae0b0
Gitweb: http://syslinux.zytor.com/commit/08dfec7bdce12402adfad7f489dba73f2f5ae0b0
Author: Erwan Velu <erwanaliasr1 at gmail.com>
AuthorDate: Thu, 21 Apr 2011 21:43:54 +0200
Committer: Erwan Velu <erwanaliasr1 at gmail.com>
CommitDate: Thu, 21 Apr 2011 21:43:54 +0200
hdt: Using dashed instead of . into label name
When generating floppy images some version of mtools (< 4.0.14) are
buggy and generate incorrect labels. So using > 4.0.13 is recommended.
Anyway, let's use _ into the volume name, that cleaner :
We now have
disk label="HDT_0_5_0_B"
instead of
disk label="HDT_0~5~0-B"
---
com32/hdt/Makefile | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile
index f4abb85..edacd85 100644
--- a/com32/hdt/Makefile
+++ b/com32/hdt/Makefile
@@ -28,7 +28,7 @@ TESTFILES =
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
VERSION = $(shell $(SED) -n 's/\#define VERSION \"\(.*\)\"/\1/p' hdt.h)
CODENAME = $(shell $(SED) -n 's/\#define CODENAME \"\(.*\)\"/\1/p' hdt.h)
-VERSION_C32 = $(shell echo $(VERSION) | $(SED) -e 's/-/_/g' | $(SED) -e 's/\./_/g')
+NODASH_VERSION = $(shell echo $(VERSION) | $(SED) -e 's/-/_/g' | $(SED) -e 's/\./_/g')
SUM_FILE = hdt-$(VERSION).checksums
MEMTEST_URL = http://memtest.org/download/4.20/memtest86+-4.20.bin
@@ -61,7 +61,7 @@ hdt.img: hdt.c32 $(FLOPPY_DIR)/hdt.cfg $(FLOPPY_DIR)/mtools.conf $(topdir)/mtool
rm -f hdt*.img
$(SED) -e 's/%VERSION%/$(VERSION)/g' $(FLOPPY_DIR)/hdt.cfg |\
$(SED) -e 's/%CODENAME%/$(CODENAME)/g' > $(FLOPPY_DIR)/syslinux.cfg
- MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MFORMAT) -v HDT_$(VERSION) -f 1440 -C a:
+ MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MFORMAT) -v HDT_$(NODASH_VERSION) -f 1440 -C a:
$(topdir)/mtools/syslinux hdt.img
-[ ! -f $(GZ_PCI_IDS_FILE) ] && cp /usr/share/hwdata/pci.ids $(PCI_IDS_FILE) && $(GZIPPROG) $(PCI_IDS_FILE)
-[ ! -f $(GZ_PCI_IDS_FILE) ] && cp /usr/share/pci.ids $(PCI_IDS_FILE) && $(GZIPPROG) $(PCI_IDS_FILE)
@@ -111,8 +111,8 @@ hdt.iso: hdt.c32 $(topdir)/core/isolinux.bin $(FLOPPY_DIR)/hdt.cfg memtest
ln -sf hdt-$(VERSION).iso hdt.iso
release: spotless hdt.c32 hdt.img hdt.img.gz hdt.iso
- mv hdt.c32 hdt_$(VERSION_C32).c32
- md5sum hdt_$(VERSION_C32).c32 >$(SUM_FILE)
+ mv hdt.c32 hdt_$(NODASH_VERSION).c32
+ md5sum hdt_$(NODASH_VERSION).c32 >$(SUM_FILE)
md5sum hdt-$(VERSION).iso >>$(SUM_FILE)
md5sum hdt-$(VERSION).img >>$(SUM_FILE)
md5sum hdt-$(VERSION).img.gz >>$(SUM_FILE)
More information about the Syslinux-commits
mailing list