From c458591b835dcc481f0fcc4127426bcc09ff444e Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Fri, 27 May 2016 14:19:35 -0700 Subject: gnome-menus: Fix QA warnings. WARNING: gnome-menus-2.30.5-r1 do_configure: Missing DEPENDS on intltool-native WARNING: gnome-menus-2.30.5-r1 do_package_qa: QA Issue: non -staticdev package contains static .a library: gnome-menus-python path 'work/i586-oe-linux/gnome-menus/2.30.5-r1/packages-split/gnome-menus-python/usr/lib/python2.7/site-packages/gmenu.a' [staticdev] WARNING: gnome-menus-2.30.5-r1 do_package_qa: QA Issue: /usr/bin/gmenu-simple-editor contained in package gnome-menus requires /home/akuster/oss/maint/mylayers/openembedded-core/build/tmp-glibc/sysroots/x86_64-linux/usr/bin/python-native/python, but no providers found in RDEPENDS_gnome-menus? [file-rdeps] Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa (cherry picked from commit ff41698c1d5aeecb9c33e9abd312fa9a0b7173a8) Signed-off-by: Armin Kuster --- .../recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb index 1b84a54c8b..1e31b56ff2 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" PR = "r1" -DEPENDS = "python libxml2 gconf popt gtk+" +DEPENDS = "python libxml2 gconf popt gtk+ intltool-native" inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection @@ -13,10 +13,15 @@ SRC_URI[archive.md5sum] = "caa6772e63ed5870cf43dc3d354e0624" SRC_URI[archive.sha256sum] = "6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa" GNOME_COMPRESS_TYPE="bz2" -PACKAGES += "${PN}-python" +do_configure_append () { + + # this expands to native-pthon which we don't want. + sed -i 's:\@PYTHON\@:/usr/bin/env python:' ${S}/simple-editor/gmenu-simple-editor.in + +} +PACKAGES += "${PN}-python ${PN}-python-staticdev" FILES_${PN} += "${datadir}/desktop-directories/" -FILES_${PN}-python = "${libdir}/python*" +FILES_${PN}-python-staticdev = "${PYTHON_SITEPACKAGES_DIR}/gmenu.a ${PYTHON_SITEPACKAGES_DIR}/gmenu.la" +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/gmenu.so ${PYTHON_SITEPACKAGES_DIR}/GMenuSimpleEditor " FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug" - - -- cgit 1.2.3-korg