Patchwork [1/1] Adding extlinux to sysliux binaries copied into target/images.

login
register
mail settings
Submitter Thomas Lundquist
Date Jan. 5, 2014, 12:20 p.m.
Message ID <20140105122039.GA4201@zelow.no>
Download mbox | patch
Permalink /patch/306958/
State New
Headers show

Comments

Thomas Lundquist - Jan. 5, 2014, 12:20 p.m.
Using the mail address I have on Github, which is the reason for the difference
in addresses.


Signed-off-by: Thomas Lundquist <thomasez@redpill-linpro.com>
---
 boot/syslinux/Config.in   | 4 ++++
 boot/syslinux/syslinux.mk | 7 +++++++
 2 files changed, 11 insertions(+)
Yann E. MORIN - Jan. 5, 2014, 3:16 p.m.
Thomas, All,

On 2014-01-05 13:20 +0100, Thomas Lundquist spake thusly:

Subject should be something like:
    syslinux: add option to install extlinux

> Using the mail address I have on Github, which is the reason for the difference
> in addresses.

This should not be part of the commit log. If you want to add somthing
like that, do it after the three-dash line, below...

> Signed-off-by: Thomas Lundquist <thomasez@redpill-linpro.com>
> ---

...here. That '---' line above tells git to ignore it and all that
follows, as not being part of the commit message itself.

>  boot/syslinux/Config.in   | 4 ++++
>  boot/syslinux/syslinux.mk | 7 +++++++
>  2 files changed, 11 insertions(+)
> 
> diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
> index 2c39e65..5773abb 100644
> --- a/boot/syslinux/Config.in
> +++ b/boot/syslinux/Config.in
> @@ -17,4 +17,8 @@ config BR2_TARGET_SYSLINUX_PXELINUX
>  	bool "Install pxelinux"
>  	default y
>  
> +config BR2_TARGET_SYSLINUX_EXTLINUX
> +	bool "Install extlinux"
> +	default y
> +
>  endif
> diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
> index eedc364..bfc2694 100644
> --- a/boot/syslinux/syslinux.mk
> +++ b/boot/syslinux/syslinux.mk
> @@ -26,10 +26,17 @@ endef
>  SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += isolinux.bin
>  SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += pxelinux.bin
>  
> +ifeq ($(BR2_TARGET_SYSLINUX_EXTLINUX),y)
> +define SYSLINUX_INSTALL_EXTLINUX
> +	$(INSTALL) -D -m 0755 $(@D)/extlinux/extlinux $(BINARIES_DIR)/extlinux;
> +endef
> +endif
> +
>  define SYSLINUX_INSTALL_IMAGES_CMDS
>  	for i in $(SYSLINUX_IMAGES-y); do \
>  		$(INSTALL) -D -m 0755 $(@D)/core/$$i $(BINARIES_DIR)/$$i; \
>  	done
> +    $(SYSLINUX_INSTALL_EXTLINUX)

Use leading tabs, not spaces.

However, I'd rather we use a generic command, such as:

SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += core/isolinux.bin
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += core/pxelinux.bin
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_EXTLINUX) += extlinux/extlinux

define SYSLINUX_INSTALL_IMAGES_CMDS
    for i in $(SYSLINUX_IMAGES-y); do \
        $(INSTALL) -D -m 0755 $(@D)/$$i $(BINARIES_DIR)/$${i##*/}; \
    done
endef

Regards,
Yann E. MORIN.
Yann E. MORIN - Jan. 5, 2014, 5:19 p.m.
Thomas, All,

On 2014-01-05 13:20 +0100, Thomas Lundquist spake thusly:
[--SNIP--]
> diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
> index 2c39e65..5773abb 100644
> --- a/boot/syslinux/Config.in
> +++ b/boot/syslinux/Config.in
> @@ -17,4 +17,8 @@ config BR2_TARGET_SYSLINUX_PXELINUX
>  	bool "Install pxelinux"
>  	default y
>  
> +config BR2_TARGET_SYSLINUX_EXTLINUX
> +	bool "Install extlinux"
> +	default y

While you are working on syslinux, would you also consider adding the
MBR bootcode as an option, please?

Regards,
Yann E. MORIN.

Patch

diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index 2c39e65..5773abb 100644
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -17,4 +17,8 @@  config BR2_TARGET_SYSLINUX_PXELINUX
 	bool "Install pxelinux"
 	default y
 
+config BR2_TARGET_SYSLINUX_EXTLINUX
+	bool "Install extlinux"
+	default y
+
 endif
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index eedc364..bfc2694 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -26,10 +26,17 @@  endef
 SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += isolinux.bin
 SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += pxelinux.bin
 
+ifeq ($(BR2_TARGET_SYSLINUX_EXTLINUX),y)
+define SYSLINUX_INSTALL_EXTLINUX
+	$(INSTALL) -D -m 0755 $(@D)/extlinux/extlinux $(BINARIES_DIR)/extlinux;
+endef
+endif
+
 define SYSLINUX_INSTALL_IMAGES_CMDS
 	for i in $(SYSLINUX_IMAGES-y); do \
 		$(INSTALL) -D -m 0755 $(@D)/core/$$i $(BINARIES_DIR)/$$i; \
 	done
+    $(SYSLINUX_INSTALL_EXTLINUX)
 endef