Message ID | 20221110020136.908205-1-pkj@axis.com |
---|---|
State | New |
Headers | show |
Series | pango: Make it build with ptest disabled | expand |
This snippet is going to be eliminated altogether, can you check that this patch addresses the problem? https://git.yoctoproject.org/poky-contrib/commit/?h=akanavin/package-version-updates&id=232607c0a781272e2d7f54f1a13980c109fd1d25 (if I force push, the commit is 'pango: replace a recipe fix with an upstream submitted patch') Alex On Thu, 10 Nov 2022 at 03:01, Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote: > > This avoids the following error: > > ERROR: pango-1.50.11-r0 do_package: QA Issue: pango: Files/directories > were installed but not shipped in any package: > /usr/libexec > /usr/libexec/installed-tests > /usr/libexec/installed-tests/pango > /usr/libexec/installed-tests/pango/nofonts > /usr/libexec/installed-tests/pango/nofonts/fonts.conf > > Also use tabs for indentation of shell code. > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > --- > meta/recipes-graphics/pango/pango_1.50.11.bb | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-graphics/pango/pango_1.50.11.bb b/meta/recipes-graphics/pango/pango_1.50.11.bb > index f545689811..f982d9a65b 100644 > --- a/meta/recipes-graphics/pango/pango_1.50.11.bb > +++ b/meta/recipes-graphics/pango/pango_1.50.11.bb > @@ -38,13 +38,15 @@ PACKAGECONFIG[thai] = ",,libthai" > GIR_MESON_OPTION = 'introspection' > > do_configure:prepend() { > - chmod +x ${S}/tests/*.py > + chmod +x ${S}/tests/*.py > } > > # https://gitlab.gnome.org/GNOME/pango/-/issues/713 > do_install:append() { > - mkdir -p ${D}/${libexecdir}/installed-tests/pango/nofonts/ > - install ${S}/tests/nofonts/fonts.conf ${D}/${libexecdir}/installed-tests/pango/nofonts/ > + if [ "${@bb.utils.filter('PACKAGECONFIG', 'tests', d)}" ]; then > + mkdir -p ${D}${libexecdir}/installed-tests/pango/nofonts > + install ${S}/tests/nofonts/fonts.conf ${D}${libexecdir}/installed-tests/pango/nofonts > + fi > } > > LEAD_SONAME = "libpango-1.0*" > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#173063): https://lists.openembedded.org/g/openembedded-core/message/173063 > Mute This Topic: https://lists.openembedded.org/mt/94928175/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
I checked locally, it does. Alex On Thu, 10 Nov 2022 at 09:43, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > > This snippet is going to be eliminated altogether, can you check that > this patch addresses the problem? > https://git.yoctoproject.org/poky-contrib/commit/?h=akanavin/package-version-updates&id=232607c0a781272e2d7f54f1a13980c109fd1d25 > (if I force push, the commit is 'pango: replace a recipe fix with an > upstream submitted patch') > > Alex > > On Thu, 10 Nov 2022 at 03:01, Peter Kjellerstedt > <peter.kjellerstedt@axis.com> wrote: > > > > This avoids the following error: > > > > ERROR: pango-1.50.11-r0 do_package: QA Issue: pango: Files/directories > > were installed but not shipped in any package: > > /usr/libexec > > /usr/libexec/installed-tests > > /usr/libexec/installed-tests/pango > > /usr/libexec/installed-tests/pango/nofonts > > /usr/libexec/installed-tests/pango/nofonts/fonts.conf > > > > Also use tabs for indentation of shell code. > > > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > > --- > > meta/recipes-graphics/pango/pango_1.50.11.bb | 8 +++++--- > > 1 file changed, 5 insertions(+), 3 deletions(-) > > > > diff --git a/meta/recipes-graphics/pango/pango_1.50.11.bb b/meta/recipes-graphics/pango/pango_1.50.11.bb > > index f545689811..f982d9a65b 100644 > > --- a/meta/recipes-graphics/pango/pango_1.50.11.bb > > +++ b/meta/recipes-graphics/pango/pango_1.50.11.bb > > @@ -38,13 +38,15 @@ PACKAGECONFIG[thai] = ",,libthai" > > GIR_MESON_OPTION = 'introspection' > > > > do_configure:prepend() { > > - chmod +x ${S}/tests/*.py > > + chmod +x ${S}/tests/*.py > > } > > > > # https://gitlab.gnome.org/GNOME/pango/-/issues/713 > > do_install:append() { > > - mkdir -p ${D}/${libexecdir}/installed-tests/pango/nofonts/ > > - install ${S}/tests/nofonts/fonts.conf ${D}/${libexecdir}/installed-tests/pango/nofonts/ > > + if [ "${@bb.utils.filter('PACKAGECONFIG', 'tests', d)}" ]; then > > + mkdir -p ${D}${libexecdir}/installed-tests/pango/nofonts > > + install ${S}/tests/nofonts/fonts.conf ${D}${libexecdir}/installed-tests/pango/nofonts > > + fi > > } > > > > LEAD_SONAME = "libpango-1.0*" > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#173070): https://lists.openembedded.org/g/openembedded-core/message/173070 > Mute This Topic: https://lists.openembedded.org/mt/94928175/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-graphics/pango/pango_1.50.11.bb b/meta/recipes-graphics/pango/pango_1.50.11.bb index f545689811..f982d9a65b 100644 --- a/meta/recipes-graphics/pango/pango_1.50.11.bb +++ b/meta/recipes-graphics/pango/pango_1.50.11.bb @@ -38,13 +38,15 @@ PACKAGECONFIG[thai] = ",,libthai" GIR_MESON_OPTION = 'introspection' do_configure:prepend() { - chmod +x ${S}/tests/*.py + chmod +x ${S}/tests/*.py } # https://gitlab.gnome.org/GNOME/pango/-/issues/713 do_install:append() { - mkdir -p ${D}/${libexecdir}/installed-tests/pango/nofonts/ - install ${S}/tests/nofonts/fonts.conf ${D}/${libexecdir}/installed-tests/pango/nofonts/ + if [ "${@bb.utils.filter('PACKAGECONFIG', 'tests', d)}" ]; then + mkdir -p ${D}${libexecdir}/installed-tests/pango/nofonts + install ${S}/tests/nofonts/fonts.conf ${D}${libexecdir}/installed-tests/pango/nofonts + fi } LEAD_SONAME = "libpango-1.0*"
This avoids the following error: ERROR: pango-1.50.11-r0 do_package: QA Issue: pango: Files/directories were installed but not shipped in any package: /usr/libexec /usr/libexec/installed-tests /usr/libexec/installed-tests/pango /usr/libexec/installed-tests/pango/nofonts /usr/libexec/installed-tests/pango/nofonts/fonts.conf Also use tabs for indentation of shell code. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> --- meta/recipes-graphics/pango/pango_1.50.11.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)