syslinux: bump version to 4.04 and fix build error in 4.04

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 boot/syslinux/syslinux-3.85-makefile.patch |   17 -----------------
 boot/syslinux/syslinux.mk                  |   12 ++++++++++--
 2 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 boot/syslinux/syslinux-3.85-makefile.patch

(quoted diff) +0 -0

b/boot/syslinux/syslinux-3.85-makefile.patch deleted file mode 100644 index ff85b8d..0000000

boot/syslinux/syslinux-3.85-makefile.patch deleted +0 -17

@@ -1,17 +0,0 @@
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: syslinux-3.85/Makefile
-===================================================================
---- syslinux-3.85.orig/Makefile
-+++ syslinux-3.85/Makefile
-@@ -43,7 +43,7 @@
- 	mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
- 	mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
- 	core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
--	gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
-+	gpxe/gpxelinux.0 dos/syslinux.com \
- 	dosutil/*.com dosutil/*.sys \
- 	$(MODULES)
-

boot/syslinux/syslinux.mk +10 -2

index 686124f..118807a 100644
@@ -4,15 +4,23 @@
 #
 #############################################################
 
-SYSLINUX_VERSION = 3.85
+SYSLINUX_VERSION = 4.04
 SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
-SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/
+SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
 
 SYSLINUX_INSTALL_TARGET = NO
 SYSLINUX_INSTALL_IMAGES = YES
 
 SYSLINUX_DEPENDENCIES = host-nasm
 
+# syslinux-4.04 comes with a bundled mk-lba-img executable which
+# may not work in our host environment.
+define SYSLINUX_RM_MK_LBA_IMG
+	$(RM) $(@D)/diag/geodsp/mk-lba-img
+endef
+
+SYSLINUX_POST_EXTRACT_HOOKS += SYSLINUX_RM_MK_LBA_IMG
+
 define SYSLINUX_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(@D)
 endef

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 boot/syslinux/syslinux.mk |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

boot/syslinux/syslinux.mk +9 -0

index 118807a..2b4b5c0 100644
@@ -34,4 +34,19 @@ define SYSLINUX_INSTALL_IMAGES_CMDS
 	done
 endef
 
+
+HOST_SYSLINUX_POST_EXTRACT_HOOKS += SYSLINUX_RM_MK_LBA_IMG
+
+define HOST_SYSLINUX_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_SYSLINUX_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) INSTALLROOT=$(HOST_DIR)

install +endef

You don't have the $(eval $(call GENTARGETS,boot,syslinux,host)) line anymore, so the HOST_* variables are quite useless no ? This line was present in your previous posting.

Also can you comment how this host package is used ? It isn't part of the dependencies of any target package, so it doesn't seem to be used anywhere (except by manually running "make host-syslinux").

Not related to your patches directly, but could you elaborate a bit on how syslinux is used in practice by giving an example usage. This would explain a bit why a host version is needed, how to set up syslinux on the target, etc.

-----Original Message-----
From: buildroot-bounces at busybox.net [mailto:buildroot-bounces at busybox.net] On Behalf Of Arnout Vandecappelle
Sent: 01 September 2011 17:27

Quoted 5 lines

Not related to your patches directly, but could you elaborate a bit on how syslinux is used in practice by giving an example usage. This would explain a bit why a host version is needed, how to set up syslinux on the target, etc.

To build a rescue disk that rewrites the disk of the target device. The idea
is that the whole thing can be sent as a zip file and the customer just has to unzip it to a USB stick and run syslinux (from Windows) and voila, he has a rescue USB stick. The compiled syslinux.exe is taken from the tar file for that. However, I also want to be able to create a rescue disk directly from buildroot, hence I want a working host-syslinux.

FYI the make_rescue script is attached.

Regards,
Arnout

--

Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  31BB CF53 8660 6F88 345D  54CC A836 5879 20D7 CF43