Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Arnout Vandecappelle <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 1/2] syslinux: bump version to 4.04 and fix build error in 4.04
Date: Wed, 14 Sep 2011 10:45:36 +0200	[thread overview]
Message-ID: <201109141045.36531.arnout@mind.be> (raw)
In-Reply-To: <1314770813-12307-1-git-send-email-arnout@mind.be>

 Ping!

On Wednesday 31 August 2011 08:06:52, Arnout Vandecappelle (Essensium/Mind) wrote:
> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
> 
> 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..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

      parent reply	other threads:[~2011-09-14  8:45 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-31  6:06 [Buildroot] [PATCH v2 1/2] syslinux: bump version to 4.04 and fix build error in 4.04 Arnout Vandecappelle
2011-08-31  6:06 ` [Buildroot] [PATCH v2 2/2] syslinux: add support for host-install Arnout Vandecappelle
2011-08-31  8:19   ` Thomas Petazzoni
2011-09-01 16:26     ` Arnout Vandecappelle
2011-09-02  8:21       ` [Buildroot] [PATCH v2 2/2] syslinux: add support forhost-install Will Moore
2011-09-02  8:14     ` [Buildroot] [PATCH v3] syslinux: add support for host-install Arnout Vandecappelle
2011-09-14  8:45 ` Arnout Vandecappelle [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201109141045.36531.arnout@mind.be \
    --to=arnout@mind.be \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox