Patchwork syslinux: fix packaging of ${PN} and ${PN}-staticdev

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 29, 2012, 6:03 a.m.
Message ID <1330495393-19751-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/22401/
State Accepted
Commit e83b2e25ebf0169371035483095a06b3ca5eb479
Headers show

Comments

Otavio Salvador - Feb. 29, 2012, 6:03 a.m.
- ${PN} where not being build due ordering;
 - ${PN}-staticdev lacked the ${libdir} files.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-devtools/syslinux/syslinux_4.03.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Richard Purdie - Feb. 29, 2012, 12:53 p.m.
On Wed, 2012-02-29 at 06:03 +0000, Otavio Salvador wrote:
> - ${PN} where not being build due ordering;
>  - ${PN}-staticdev lacked the ${libdir} files.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  meta/recipes-devtools/syslinux/syslinux_4.03.bb |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-devtools/syslinux/syslinux_4.03.bb b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
index 823465c..2ab6878 100644
--- a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
@@ -7,7 +7,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 # If you really want to run syslinux, you need mtools.  We just want the
 # ldlinux.* stuff for now, so skip mtools-native
 DEPENDS = "nasm-native"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/4.xx/syslinux-${PV}.tar.bz2 \
            file://cross-build.patch"
@@ -46,7 +46,7 @@  do_install() {
 	install -m 644 ${S}/core/ldlinux.bss ${D}${libdir}/syslinux/
 }
 
-PACKAGES =+ "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
+PACKAGES += "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
 
 RDEPENDS_${PN} += "mtools"
 
@@ -57,7 +57,7 @@  FILES_${PN}-chain = "${libdir}/${PN}/chain.c32"
 FILES_${PN}-isolinux = "${libdir}/${PN}/isolinux.bin"
 FILES_${PN}-pxelinux = "${libdir}/${PN}/pxelinux.0"
 FILES_${PN}-dev += "${datadir}/${PN}/com32/lib*${SOLIBS} ${datadir}/${PN}/com32/include ${datadir}/${PN}/com32/com32.ld"
-FILES_${PN}-staticdev += "${datadir}/${PN}/com32/lib*.a"
+FILES_${PN}-staticdev += "${datadir}/${PN}/com32/lib*.a ${libdir}/${PN}/com32/lib*.a"
 FILES_${PN}-misc = "${libdir}/${PN}/* ${bindir}/*"
 
 BBCLASSEXTEND = "native"