aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
authorErwan Velu <erwan.velu@free.fr>2009-11-26 23:14:51 +0100
committerErwan Velu <erwan.velu@free.fr>2009-12-04 10:11:14 +0100
commit45cbbf3d1ea302cc6379c5400186f36f1b03b238 (patch)
treea77d7ad2e7a62c948db4638a358bcc67d3a160b0 /com32
parent91817a19429135c6fd8f5c96a2ebe8d024dff7f7 (diff)
downloadsyslinux.git-45cbbf3d1ea302cc6379c5400186f36f1b03b238.tar.gz
syslinux.git-45cbbf3d1ea302cc6379c5400186f36f1b03b238.tar.xz
syslinux.git-45cbbf3d1ea302cc6379c5400186f36f1b03b238.zip
hdt: Adding CODENAME in title (menu.c32)
Impact: visual Let's display the CODENAME in the menu title
Diffstat (limited to 'com32')
-rw-r--r--com32/hdt/Makefile7
-rw-r--r--com32/hdt/floppy/hdt.cfg2
2 files changed, 6 insertions, 3 deletions
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile
index b5a32af7..84b6ec80 100644
--- a/com32/hdt/Makefile
+++ b/com32/hdt/Makefile
@@ -27,6 +27,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)
KERNEL_VERSION ?= $(shell uname -r)
MODULES_ALIAS_FILE ?= /lib/modules/$(KERNEL_VERSION)/modules.alias
@@ -49,7 +50,8 @@ hdt.elf : $(OBJS) $(LIBS) $(C_LIBS)
hdt.img: hdt.c32 $(FLOPPY_DIR)/hdt.cfg $(FLOPPY_DIR)/mtools.conf $(topdir)/mtools/syslinux $(REBOOT_COM32) $(MENU_COM32)
rm -f hdt.img
- $(SED) -e 's/%VERSION%/$(VERSION)/g' $(FLOPPY_DIR)/hdt.cfg > $(FLOPPY_DIR)/syslinux.cfg
+ $(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 -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)
@@ -72,7 +74,8 @@ hdt.iso: hdt.c32 $(topdir)/core/isolinux.bin $(FLOPPY_DIR)/hdt.cfg
rm -f hdt.iso
mkdir -p $(ISO_DIR)/$(ISOLINUX_DIR)
cp $(topdir)/core/isolinux.bin $(ISO_DIR)/$(ISOLINUX_DIR)
- $(SED) -e 's/%VERSION%/$(VERSION)/g' $(FLOPPY_DIR)/hdt.cfg > $(ISO_DIR)/$(ISOLINUX_DIR)/isolinux.cfg
+ $(SED) -e 's/%VERSION%/$(VERSION)/g' $(FLOPPY_DIR)/hdt.cfg |\
+ $(SED) -e 's/%CODENAME%/$(CODENAME)/g' > $(ISO_DIR)/$(ISOLINUX_DIR)/isolinux.cfg
cp hdt.c32 $(ISO_DIR)/$(ISOLINUX_DIR)
cp $(REBOOT_COM32) $(ISO_DIR)/$(ISOLINUX_DIR)
cp $(MENU_COM32) $(ISO_DIR)/$(ISOLINUX_DIR)
diff --git a/com32/hdt/floppy/hdt.cfg b/com32/hdt/floppy/hdt.cfg
index 6b0c97d5..5627246e 100644
--- a/com32/hdt/floppy/hdt.cfg
+++ b/com32/hdt/floppy/hdt.cfg
@@ -2,7 +2,7 @@ UI menu.c32
DEFAULT hdt
PROMPT 0
TIMEOUT 50
-MENU TITLE Hardware Detection Tool (HDT) version %VERSION%
+MENU TITLE Hardware Detection Tool (HDT) version %VERSION% (%CODENAME%)
MENU MARGIN 0
MENU ROWS 15
MENU TABMSG