* [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04
@ 2012-01-21 21:39 Arnout Vandecappelle
2012-01-21 21:39 ` [Buildroot] [PATCH 2/2] syslinux: add support for host-install Arnout Vandecappelle
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Arnout Vandecappelle @ 2012-01-21 21:39 UTC (permalink / raw)
To: buildroot
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
---
boot/syslinux/syslinux-3.85-makefile.patch | 17 -----------------
boot/syslinux/syslinux.mk | 4 ++--
2 files changed, 2 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 fa5af07..da30d5a 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -4,9 +4,9 @@
#
#############################################################
-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
--
1.7.8.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 2/2] syslinux: add support for host-install
2012-01-21 21:39 [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04 Arnout Vandecappelle
@ 2012-01-21 21:39 ` Arnout Vandecappelle
2012-01-22 21:57 ` Peter Korsgaard
2012-01-22 3:38 ` [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04 Baruch Siach
2012-01-22 21:57 ` Peter Korsgaard
2 siblings, 1 reply; 9+ messages in thread
From: Arnout Vandecappelle @ 2012-01-21 21:39 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 | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index da30d5a..3e89bdf 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -26,4 +26,18 @@ define SYSLINUX_INSTALL_IMAGES_CMDS
done
endef
+
+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))
+$(eval $(call GENTARGETS,host))
--
1.7.8.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] syslinux: add support for host-install
2012-01-21 21:39 ` [Buildroot] [PATCH 2/2] syslinux: add support for host-install Arnout Vandecappelle
@ 2012-01-22 21:57 ` Peter Korsgaard
2012-01-23 20:19 ` [Buildroot] [PATCH v2] " Arnout Vandecappelle
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2012-01-22 21:57 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Arnout> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
What was the reason for this again (please document in commit message)?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2] syslinux: add support for host-install
2012-01-22 21:57 ` Peter Korsgaard
@ 2012-01-23 20:19 ` Arnout Vandecappelle
2012-01-24 12:00 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: Arnout Vandecappelle @ 2012-01-23 20:19 UTC (permalink / raw)
To: buildroot
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
This makes it possible to build the syslinux/extlinux installer, so a
bootable USB drive, CompactFlash or SD card can be created by a user
script.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
v2: more verbose commit message
---
boot/syslinux/syslinux.mk | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index da30d5a..3e89bdf 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -26,4 +26,18 @@ define SYSLINUX_INSTALL_IMAGES_CMDS
done
endef
+
+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))
+$(eval $(call GENTARGETS,host))
--
1.7.8.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2] syslinux: add support for host-install
2012-01-23 20:19 ` [Buildroot] [PATCH v2] " Arnout Vandecappelle
@ 2012-01-24 12:00 ` Peter Korsgaard
0 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2012-01-24 12:00 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Arnout> This makes it possible to build the syslinux/extlinux installer, so a
Arnout> bootable USB drive, CompactFlash or SD card can be created by a user
Arnout> script.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04
2012-01-21 21:39 [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04 Arnout Vandecappelle
2012-01-21 21:39 ` [Buildroot] [PATCH 2/2] syslinux: add support for host-install Arnout Vandecappelle
@ 2012-01-22 3:38 ` Baruch Siach
2012-01-22 13:49 ` Arnout Vandecappelle
2012-01-22 21:57 ` Peter Korsgaard
2 siblings, 1 reply; 9+ messages in thread
From: Baruch Siach @ 2012-01-22 3:38 UTC (permalink / raw)
To: buildroot
Hi Arnout,
On Sat, Jan 21, 2012 at 10:39:34PM +0100, Arnout Vandecappelle (Essensium/Mind) wrote:
> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
> -SYSLINUX_VERSION = 3.85
> +SYSLINUX_VERSION = 4.04
Version 4.05 is present in
http://www.kernel.org/pub/linux/utils/boot/syslinux/4.xx/.
baruch
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04
2012-01-22 3:38 ` [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04 Baruch Siach
@ 2012-01-22 13:49 ` Arnout Vandecappelle
0 siblings, 0 replies; 9+ messages in thread
From: Arnout Vandecappelle @ 2012-01-22 13:49 UTC (permalink / raw)
To: buildroot
On Sunday 22 January 2012 04:38:48 Baruch Siach wrote:
> Hi Arnout,
>
> On Sat, Jan 21, 2012 at 10:39:34PM +0100, Arnout Vandecappelle (Essensium/Mind) wrote:
> > From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
> > -SYSLINUX_VERSION = 3.85
> > +SYSLINUX_VERSION = 4.04
>
> Version 4.05 is present in
> http://www.kernel.org/pub/linux/utils/boot/syslinux/4.xx/.
Sorry, too much work. The isohybrid installer requires uuid.h in 4.05.
The current syslinux mk file builds everything, not just the pxelinux.bin
and isolinux.bin that we really want, so you would need to depend on
util-linux's libuuid. However, syslinux is compiled with HOST_CC instead
of TARGET_CC, so you don't get access to libuuid... It's all kind of
messy and difficult to understand, and probably requires patching
syslinux's Makefile to support proper cross-compiling to start with.
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: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04
2012-01-21 21:39 [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04 Arnout Vandecappelle
2012-01-21 21:39 ` [Buildroot] [PATCH 2/2] syslinux: add support for host-install Arnout Vandecappelle
2012-01-22 3:38 ` [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04 Baruch Siach
@ 2012-01-22 21:57 ` Peter Korsgaard
2 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2012-01-22 21:57 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] syslinux: bump version and fix build
@ 2011-08-30 16:28 Arnout Vandecappelle
2011-08-30 16:28 ` [Buildroot] [PATCH 2/2] syslinux: add support for host-install Arnout Vandecappelle
0 siblings, 1 reply; 9+ messages in thread
From: Arnout Vandecappelle @ 2011-08-30 16:28 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] syslinux: add support for host-install
2011-08-30 16:28 [Buildroot] [PATCH 1/2] syslinux: bump version and fix build Arnout Vandecappelle
@ 2011-08-30 16:28 ` Arnout Vandecappelle
0 siblings, 0 replies; 9+ messages in thread
From: Arnout Vandecappelle @ 2011-08-30 16:28 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-01-24 12:00 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-21 21:39 [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04 Arnout Vandecappelle
2012-01-21 21:39 ` [Buildroot] [PATCH 2/2] syslinux: add support for host-install Arnout Vandecappelle
2012-01-22 21:57 ` Peter Korsgaard
2012-01-23 20:19 ` [Buildroot] [PATCH v2] " Arnout Vandecappelle
2012-01-24 12:00 ` Peter Korsgaard
2012-01-22 3:38 ` [Buildroot] [PATCH 1/2] syslinux: bump to version 4.04 Baruch Siach
2012-01-22 13:49 ` Arnout Vandecappelle
2012-01-22 21:57 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2011-08-30 16:28 [Buildroot] [PATCH 1/2] syslinux: bump version and fix build Arnout Vandecappelle
2011-08-30 16:28 ` [Buildroot] [PATCH 2/2] syslinux: add support for host-install Arnout Vandecappelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox