Skip to contentSkip to conversation

syslinux: add syslinux-nomtools to PACKAGES

PATCH In review Robert Yang 2 participants 5 messages Apr 13, 2015 – Apr 15, 2015

lore
Share & tools
lore
#0 lore raw

cover syslinux: add syslinux-nomtools to PACKAGES

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(-)
Signature · 1 line
1.7.9.5
#1 lore raw

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

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

---
 meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-devtools/syslinux/syslinux_6.03.bb +4 -1
index 33dd776..ddb8744 100644
@@ -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"
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 13 lines · Robert Yang

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

---
  meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-devtools/syslinux/syslinux_6.03.bb +0 -0
index 33dd776..ddb8744 100644

meta/recipes-devtools/syslinux/syslinux_6.03.bb do_install() { · line 69

Quoted 4 lines
meta/recipes-devtools/syslinux/syslinux_6.03.bb +1 -0
@@ -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

Quoted 15 lines
meta/recipes-devtools/syslinux/syslinux_6.03.bb +3 -1
  }
 
-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"
#3 lore raw
Quoted 22 lines · Robert Yang
Quoted 13 lines · Robert Yang

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

---
  meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-devtools/syslinux/syslinux_6.03.bb +0 -0
index 33dd776..ddb8744 100644

meta/recipes-devtools/syslinux/syslinux_6.03.bb do_install() { · line 69

Quoted 4 lines
meta/recipes-devtools/syslinux/syslinux_6.03.bb +1 -0
@@ -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:

Quoted 5 lines

-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

#4 lore raw
Quoted 25 lines · Richard Purdie
Quoted 24 lines · Robert Yang
Quoted 13 lines · Robert Yang

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

---
   meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
   1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-devtools/syslinux/syslinux_6.03.bb +0 -0
index 33dd776..ddb8744 100644

meta/recipes-devtools/syslinux/syslinux_6.03.bb do_install() { · line 69

Quoted 4 lines
meta/recipes-devtools/syslinux/syslinux_6.03.bb +1 -0
@@ -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.

Quoted 7 lines
Quoted 3 lines

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

Quoted 7 lines

Cheers,

Richard