Skip to contentSkip to conversation

pango: Make it build with ptest disabled

PATCH In review Peter Kjellerstedt 2 participants 3 messages Nov 10, 2022 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pango: Make it build with ptest disabled

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.

---
 meta/recipes-graphics/pango/pango_1.50.11.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
meta/recipes-graphics/pango/pango_1.50.11.bb +5 -3
index f545689811..f982d9a65b 100644
@@ -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*"
#1 lore raw

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

Quoted 50 lines · Peter Kjellerstedt

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.

---
 meta/recipes-graphics/pango/pango_1.50.11.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
meta/recipes-graphics/pango/pango_1.50.11.bb +5 -4
index f545689811..f982d9a65b 100644
@@ -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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

I checked locally, it does.

Alex

Quoted 64 lines · Alexander Kanavin via lists.openembedded.org

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

Quoted 34 lines · Peter Kjellerstedt

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.

---
 meta/recipes-graphics/pango/pango_1.50.11.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
meta/recipes-graphics/pango/pango_1.50.11.bb +1 -1
index f545689811..f982d9a65b 100644
@@ -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

meta/recipes-graphics/pango/pango_1.50.11.bb PACKAGECONFIG[thai] = ",,libthai" · line 52

Quoted 10 lines
meta/recipes-graphics/pango/pango_1.50.11.bb +4 -2
 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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-