[PATCH 0/1] syslinux: add syslinux-nomtools to PACKAGES

[PATCH 0/1] syslinux: add syslinux-nomtools to PACKAGES

[Robert Yang]

The following changes since commit a7d8eaef04c9dd6ede8d4efd8c4b776efbe3c767:

  shadow: split files needed for PAM use into separate package (2015-04-09 19:48:04 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/syslinux
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/syslinux

Robert Yang (1):
  syslinux: add syslinux-nomtools to PACKAGES

 meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
1.7.9.5

[PATCH 1/1] syslinux: add syslinux-nomtools to PACKAGES

[Robert Yang]

The default installed syslinux depends on mtools, we install
syslinux-nomtools too, which has the ext2/3/4 support.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
index 33dd776..ddb8744 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
@@ -66,14 +66,17 @@ do_install() {
 	install -d ${D}${datadir}/syslinux/
 	install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/
 	install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/
+	install -m 644 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/
 }
 
-PACKAGES += "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
+PACKAGES += "${PN}-nomtools ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
 
 RDEPENDS_${PN} += "mtools"
+RDEPENDS_${PN}-nomtools += "libext2fs"
 RDEPENDS_${PN}-misc += "perl"
 
 FILES_${PN} = "${bindir}/syslinux"
+FILES_${PN}-nomtools = "${bindir}/syslinux-nomtools"
 FILES_${PN}-extlinux = "${sbindir}/extlinux"
 FILES_${PN}-mbr = "${datadir}/${BPN}/mbr.bin"
 FILES_${PN}-chain = "${datadir}/${BPN}/chain.c32"
-- 
1.7.9.5

Re: [PATCH 1/1] syslinux: add syslinux-nomtools to PACKAGES

[Robert Yang]

On 04/13/2015 05:05 PM, Robert Yang wrote:
> The default installed syslinux depends on mtools, we install
> syslinux-nomtools too, which has the ext2/3/4 support.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> index 33dd776..ddb8744 100644
> --- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> @@ -66,14 +66,17 @@ do_install() {
>   	install -d ${D}${datadir}/syslinux/
>   	install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/
>   	install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/
> +	install -m 644 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/

Sorry, I updated this patch a little, it should be:

-m 0755, not 0644.

   git://git.openembedded.org/openembedded-core-contrib rbt/syslinux

Thanks to Adrian.

// Robert

>   }
>
> -PACKAGES += "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
> +PACKAGES += "${PN}-nomtools ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
>
>   RDEPENDS_${PN} += "mtools"
> +RDEPENDS_${PN}-nomtools += "libext2fs"
>   RDEPENDS_${PN}-misc += "perl"
>
>   FILES_${PN} = "${bindir}/syslinux"
> +FILES_${PN}-nomtools = "${bindir}/syslinux-nomtools"
>   FILES_${PN}-extlinux = "${sbindir}/extlinux"
>   FILES_${PN}-mbr = "${datadir}/${BPN}/mbr.bin"
>   FILES_${PN}-chain = "${datadir}/${BPN}/chain.c32"
>

Re: [PATCH 1/1] syslinux: add syslinux-nomtools to PACKAGES

[Richard Purdie]

On Wed, 2015-04-15 at 10:04 +0800, Robert Yang wrote:
> 
> On 04/13/2015 05:05 PM, Robert Yang wrote:
> > The default installed syslinux depends on mtools, we install
> > syslinux-nomtools too, which has the ext2/3/4 support.
> >
> > Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> > ---
> >   meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
> >   1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> > index 33dd776..ddb8744 100644
> > --- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> > +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> > @@ -66,14 +66,17 @@ do_install() {
> >   	install -d ${D}${datadir}/syslinux/
> >   	install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/
> >   	install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/
> > +	install -m 644 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/
> 
> Sorry, I updated this patch a little, it should be:
> 
> -m 0755, not 0644.
> 
>    git://git.openembedded.org/openembedded-core-contrib rbt/syslinux
> 
> Thanks to Adrian.

I merged master-next which contained this patch before seeing this. I've
created a fix for master-next. With this tweak in it. This is the
downside to tweaking branches already in master-next though :(.

Cheers,

Richard

Re: [PATCH 1/1] syslinux: add syslinux-nomtools to PACKAGES

[Robert Yang]

On 04/15/2015 09:35 PM, Richard Purdie wrote:
> On Wed, 2015-04-15 at 10:04 +0800, Robert Yang wrote:
>>
>> On 04/13/2015 05:05 PM, Robert Yang wrote:
>>> The default installed syslinux depends on mtools, we install
>>> syslinux-nomtools too, which has the ext2/3/4 support.
>>>
>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>> ---
>>>    meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
>>>    1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
>>> index 33dd776..ddb8744 100644
>>> --- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
>>> +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
>>> @@ -66,14 +66,17 @@ do_install() {
>>>    	install -d ${D}${datadir}/syslinux/
>>>    	install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/
>>>    	install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/
>>> +	install -m 644 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/
>>
>> Sorry, I updated this patch a little, it should be:
>>
>> -m 0755, not 0644.
>>
>>     git://git.openembedded.org/openembedded-core-contrib rbt/syslinux
>>
>> Thanks to Adrian.
>
> I merged master-next which contained this patch before seeing this. I've
> created a fix for master-next. With this tweak in it. This is the
> downside to tweaking branches already in master-next though :(.

Thanks, I'm sorry about this.

// Robert

>
> Cheers,
>
> Richard
>
>
>