[Buildroot] [PATCH 1/2] syslinux: bump version and fix build

[Buildroot] [PATCH 1/2] syslinux: bump version and fix build

[Arnout Vandecappelle]

From: arnout <arnout@cab5c6b8-da64-4be1-9ed2-3136eea3ef10>

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 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

diff --git a/boot/syslinux/syslinux-3.85-makefile.patch b/boot/syslinux/syslinux-3.85-makefile.patch
deleted file mode 100644
index ff85b8d..0000000
--- a/boot/syslinux/syslinux-3.85-makefile.patch
+++ /dev/null
@@ -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)
- 
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 686124f..125960f 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -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 bundles 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
-- 
1.7.5.4

[Buildroot] [PATCH 2/2] syslinux: add support for host-install

[Arnout Vandecappelle]

From: arnout <arnout@cab5c6b8-da64-4be1-9ed2-3136eea3ef10>

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 boot/syslinux/syslinux.mk |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 125960f..fe48b34 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -34,4 +34,21 @@ 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
+
+define HOST_SYSLINUX_CLEAN_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) clean
+endef
+
 $(eval $(call GENTARGETS,boot,syslinux))
+$(eval $(call GENTARGETS,boot,syslinux,host))
+
-- 
1.7.5.4

[Buildroot] [PATCH 1/2] syslinux: bump version and fix build

[Arnout Vandecappelle]

On Tuesday 30 August 2011 18:28:49, Arnout Vandecappelle (Essensium/Mind) 
wrote:
> From: arnout <arnout@cab5c6b8-da64-4be1-9ed2-3136eea3ef10>

 Sorry for the commit message screw-up...  This comes through a git-svn 
repository, and svn has lousy author tracking :-)

 Do I need to resend?

 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110830/62fadb16/attachment.html>

[Buildroot] [PATCH 1/2] syslinux: bump version and fix build

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 Arnout> On Tuesday 30 August 2011 18:28:49, Arnout Vandecappelle (Essensium/Mind)
 Arnout> wrote:

 >> From: arnout <arnout@cab5c6b8-da64-4be1-9ed2-3136eea3ef10>


 Arnout> Sorry for the commit message screw-up... This comes through a git-svn
 Arnout> repository, and svn has lousy author tracking :-)

You can afaik handle it with ~/.git-svn-authors.

Your commit message mentions 'fix build' - Is this something needed for
2011.08, E.G. does the current syslinux version not build for you?

 Arnout> Do I need to resend?

Preferably yes.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] syslinux: bump version and fix build

[Arnout Vandecappelle]

On Tuesday 30 August 2011 23:09:40, Peter Korsgaard wrote:
> Your commit message mentions 'fix build' - Is this something needed for
> 2011.08, E.G. does the current syslinux version not build for you?

 No, it's a build problem of syslinux 4.04.  I've clarified that in the commit 
message.  There's a comment in the patch explaining the problem: 

# syslinux-4.04 comes with a bundled mk-lba-img executable which
# may not work in our host environment.

 [Actually, now I look at it again, it's a bit of a coincidence that it works 
for the other bundled executables.  Perhaps we should do a make clean before 
building instead...]

>  Arnout> Do I need to resend?
> 
> Preferably yes.

 Coming up...

 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