[oe,meta-oe,2/2] libhugetlbfs: fix packaging

Message ID 1405327294-4030-2-git-send-email-koen.kooi@linaro.org
State New
Headers show

Commit Message

Koen Kooi July 14, 2014, 8:41 a.m.
Libhugetlbs doesn't generate proper .so.X libs, only two .so files. Package those in ${PN} and silence the resulting QA warning. This fixes:

 ERROR: QA Issue: libhugetlbfs-tests rdepends on libhugetlbfs-dev

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
---
 meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Martin Jansa July 14, 2014, 2:54 p.m. | #1
On Mon, Jul 14, 2014 at 10:41:34AM +0200, Koen Kooi wrote:
> Libhugetlbs doesn't generate proper .so.X libs, only two .so files. Package those in ${PN} and silence the resulting QA warning. This fixes:
> 
>  ERROR: QA Issue: libhugetlbfs-tests rdepends on libhugetlbfs-dev
> 
> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
> ---
>  meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> index af7ed3e..d3b64bf 100644
> --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> @@ -25,6 +25,7 @@ COMPATIBLE_HOST = "(x86_64|powerpc|powerpc64|aarch64).*-linux*"
>  
>  LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
>  EXTRA_OEMAKE = "'ARCH=${TARGET_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} V=1"
> +PARALLEL_MAKE_pn-${PN} = ""

Is _pn override really needed?

>  CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0"
>  
>  TARGET_CC_ARCH += "${LDFLAGS}"
> @@ -46,12 +47,15 @@ do_install() {
>            install-tests
>  }
>  
> -PARALLEL_MAKE_pn-${PN} = ""
>  
>  PACKAGES =+ "${PN}-perl ${PN}-tests "
> +FILES_${PN} += "${libdir}/*.so"
> +FILES_${PN}-dev = "${includedir}"
>  FILES_${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug"
>  FILES_${PN}-perl = "${libdir}/perl"
>  FILES_${PN}-tests += "${libdir}/libhugetlbfs/tests"
>  
> +INSANE_SKIP_${PN} = "dev-so"
> +
>  INHIBIT_PACKAGE_STRIP = "1"
>  INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
> -- 
> 1.9.3
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Koen Kooi July 14, 2014, 3:04 p.m. | #2
On 14 July 2014 16:54, Martin Jansa <martin.jansa@gmail.com> wrote:

> On Mon, Jul 14, 2014 at 10:41:34AM +0200, Koen Kooi wrote:
> > Libhugetlbs doesn't generate proper .so.X libs, only two .so files.
> Package those in ${PN} and silence the resulting QA warning. This fixes:
> >
> >  ERROR: QA Issue: libhugetlbfs-tests rdepends on libhugetlbfs-dev
> >
> > Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
> > ---
> >  meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> > index af7ed3e..d3b64bf 100644
> > --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> > +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> > @@ -25,6 +25,7 @@ COMPATIBLE_HOST =
> "(x86_64|powerpc|powerpc64|aarch64).*-linux*"
> >
> >  LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
> >  EXTRA_OEMAKE = "'ARCH=${TARGET_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}'
> ${LIBARGS} V=1"
> > +PARALLEL_MAKE_pn-${PN} = ""
>
> Is _pn override really needed?
>

It isn't, I only moved the line without noticing the override. Do you want
me to respin?
Martin Jansa July 14, 2014, 3:50 p.m. | #3
On Mon, Jul 14, 2014 at 05:04:48PM +0200, Koen Kooi wrote:
> On 14 July 2014 16:54, Martin Jansa <martin.jansa@gmail.com> wrote:
> 
> > On Mon, Jul 14, 2014 at 10:41:34AM +0200, Koen Kooi wrote:
> > > Libhugetlbs doesn't generate proper .so.X libs, only two .so files.
> > Package those in ${PN} and silence the resulting QA warning. This fixes:
> > >
> > >  ERROR: QA Issue: libhugetlbfs-tests rdepends on libhugetlbfs-dev
> > >
> > > Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
> > > ---
> > >  meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 6 +++++-
> > >  1 file changed, 5 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> > b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> > > index af7ed3e..d3b64bf 100644
> > > --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> > > +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> > > @@ -25,6 +25,7 @@ COMPATIBLE_HOST =
> > "(x86_64|powerpc|powerpc64|aarch64).*-linux*"
> > >
> > >  LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
> > >  EXTRA_OEMAKE = "'ARCH=${TARGET_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}'
> > ${LIBARGS} V=1"
> > > +PARALLEL_MAKE_pn-${PN} = ""
> >
> > Is _pn override really needed?
> >
> 
> It isn't, I only moved the line without noticing the override. Do you want
> me to respin?

Please do, thanks

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index af7ed3e..d3b64bf 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -25,6 +25,7 @@  COMPATIBLE_HOST = "(x86_64|powerpc|powerpc64|aarch64).*-linux*"
 
 LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
 EXTRA_OEMAKE = "'ARCH=${TARGET_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} V=1"
+PARALLEL_MAKE_pn-${PN} = ""
 CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
@@ -46,12 +47,15 @@  do_install() {
           install-tests
 }
 
-PARALLEL_MAKE_pn-${PN} = ""
 
 PACKAGES =+ "${PN}-perl ${PN}-tests "
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dev = "${includedir}"
 FILES_${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug"
 FILES_${PN}-perl = "${libdir}/perl"
 FILES_${PN}-tests += "${libdir}/libhugetlbfs/tests"
 
+INSANE_SKIP_${PN} = "dev-so"
+
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"