From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Wed, 14 Sep 2011 10:45:36 +0200 Subject: [Buildroot] [PATCH v2 1/2] syslinux: bump version to 4.04 and fix build error in 4.04 In-Reply-To: <1314770813-12307-1-git-send-email-arnout@mind.be> References: <1314770813-12307-1-git-send-email-arnout@mind.be> Message-ID: <201109141045.36531.arnout@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Ping! On Wednesday 31 August 2011 08:06:52, Arnout Vandecappelle (Essensium/Mind) wrote: > From: "Arnout Vandecappelle (Essensium/Mind)" > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > 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..118807a 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 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 -- 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