* [Buildroot] [PATCH v2 1/2] syslinux: bump version to 4.04 and fix build error in 4.04
@ 2011-08-31 6:06 Arnout Vandecappelle
2011-08-31 6:06 ` [Buildroot] [PATCH v2 2/2] syslinux: add support for host-install Arnout Vandecappelle
2011-09-14 8:45 ` [Buildroot] [PATCH v2 1/2] syslinux: bump version to 4.04 and fix build error in 4.04 Arnout Vandecappelle
0 siblings, 2 replies; 7+ messages in thread
From: Arnout Vandecappelle @ 2011-08-31 6:06 UTC (permalink / raw)
To: buildroot
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
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 2/2] syslinux: add support for host-install
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 ` Arnout Vandecappelle
2011-08-31 8:19 ` Thomas Petazzoni
2011-09-14 8:45 ` [Buildroot] [PATCH v2 1/2] syslinux: bump version to 4.04 and fix build error in 4.04 Arnout Vandecappelle
1 sibling, 1 reply; 7+ messages in thread
From: Arnout Vandecappelle @ 2011-08-31 6:06 UTC (permalink / raw)
To: buildroot
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
boot/syslinux/syslinux.mk | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 118807a..2b4b5c0 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -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
+
+define HOST_SYSLINUX_CLEAN_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) clean
+endef
+
$(eval $(call GENTARGETS,boot,syslinux))
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 2/2] syslinux: add support for host-install
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:14 ` [Buildroot] [PATCH v3] syslinux: add support for host-install Arnout Vandecappelle
0 siblings, 2 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2011-08-31 8:19 UTC (permalink / raw)
To: buildroot
Hello,
Le Wed, 31 Aug 2011 08:06:53 +0200,
"Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be> a ?crit :
> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> boot/syslinux/syslinux.mk | 15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
> diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
> index 118807a..2b4b5c0 100644
> --- a/boot/syslinux/syslinux.mk
> +++ b/boot/syslinux/syslinux.mk
> @@ -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
> +
> +define HOST_SYSLINUX_CLEAN_CMDS
> + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) clean
> +endef
> +
> $(eval $(call GENTARGETS,boot,syslinux))
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.
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 2/2] syslinux: add support for host-install
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
1 sibling, 1 reply; 7+ messages in thread
From: Arnout Vandecappelle @ 2011-09-01 16:26 UTC (permalink / raw)
To: buildroot
On Wednesday 31 August 2011 10:19:35, Thomas Petazzoni wrote:
> 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.
Oops! Messed up rebase, and I didn't think it was necessary to test...
Patch v3 coming up.
> 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").
Indeed, manually running "make host-syslinux" in the script that creates a
USB image. I guess the host-grub support that was submitted a couple of days
ago had the same purpose.
> 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: make_rescue.sh
Type: application/x-shellscript
Size: 4508 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110901/69f22f82/attachment.bin>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 2/2] syslinux: add support forhost-install
2011-09-01 16:26 ` Arnout Vandecappelle
@ 2011-09-02 8:21 ` Will Moore
0 siblings, 0 replies; 7+ messages in thread
From: Will Moore @ 2011-09-02 8:21 UTC (permalink / raw)
To: buildroot
> -----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
>
snip
>
> > 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.
I use syslinux on an i486 target. I use host syslinux to make a bootable USB
flash drive of buildroot Linux. I then plug the USB flash drive into the target
and boot from it, then use target syslinux to make the target Disk on Module
(DoM) flash drive bootable and install buildroot Linux. The USB flash drive is
then unplugged and the target boots from the DoM evermore. I like having the
same version of syslinux on host and target. Thanks for your work Arnout.
>
>
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v3] syslinux: add support for host-install
2011-08-31 8:19 ` Thomas Petazzoni
2011-09-01 16:26 ` Arnout Vandecappelle
@ 2011-09-02 8:14 ` Arnout Vandecappelle
1 sibling, 0 replies; 7+ messages in thread
From: Arnout Vandecappelle @ 2011-09-02 8:14 UTC (permalink / raw)
To: buildroot
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
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 118807a..9bb51b5 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 1/2] syslinux: bump version to 4.04 and fix build error in 4.04
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-09-14 8:45 ` Arnout Vandecappelle
1 sibling, 0 replies; 7+ messages in thread
From: Arnout Vandecappelle @ 2011-09-14 8:45 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-09-14 8:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [Buildroot] [PATCH v2 1/2] syslinux: bump version to 4.04 and fix build error in 4.04 Arnout Vandecappelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox