summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2020-07-02 16:33:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-03 11:38:24 +0100
commit5672cb4c00bcf0cf72df25a3c89d4a7a58572aa9 (patch)
tree0f31c344d27d13d450fa5f8a3927ab51ef64c58d /meta
parent27b91efa828955b4d90a9b5322bcb3fe3f343942 (diff)
downloadpoky-5672cb4c00bcf0cf72df25a3c89d4a7a58572aa9.tar.gz
gtk-icon-cache.bbclass: add runtime dependency
fix error: + /usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache /var/tmp/rpm-tmp.mdYxY6: line 12: /usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders: No such file or directory %post(adwaita-icon-theme-3.36.1-r0.0.noarch): waitpid(2961) rc 2961 status 7f00 warning: %post(adwaita-icon-theme-3.36.1-r0.0.noarch) scriptlet failed, exit status 127 when install adwaita-icon-theme on target, which inherit gtk-icon-cache above error reported, fix by add runtime dependency to pkgs we don't use explicit RDEPENDS, so fix do_rootfs breaking by adding it into DEPENDS. Error: Problem: conflicting requests - nothing provides gdk-pixbuf needed by adwaita-icon-theme-3.36.1-r0.noarch - nothing provides gtk+3 needed by adwaita-icon-theme-3.36.1-r0.noarch (From OE-Core rev: 31e3d34c8a9c3e8481aa837aa0bf52adf095fe62) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/gtk-icon-cache.bbclass19
1 files changed, 16 insertions, 3 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 91cb4ad409..dd394af27c 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,6 +1,10 @@
1FILES_${PN} += "${datadir}/icons/hicolor" 1FILES_${PN} += "${datadir}/icons/hicolor"
2 2
3DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk+3-native" 3DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} \
4 ${@['gdk-pixbuf', '']['${BPN}' == 'gdk-pixbuf']} \
5 ${@['gtk+3', '']['${BPN}' == 'gtk+3']} \
6 gtk+3-native \
7"
4 8
5PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native" 9PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native"
6 10
@@ -48,9 +52,18 @@ python populate_packages_append () {
48 bb.note("adding hicolor-icon-theme dependency to %s" % pkg) 52 bb.note("adding hicolor-icon-theme dependency to %s" % pkg)
49 rdepends = ' ' + d.getVar('MLPREFIX', False) + "hicolor-icon-theme" 53 rdepends = ' ' + d.getVar('MLPREFIX', False) + "hicolor-icon-theme"
50 d.appendVar('RDEPENDS_%s' % pkg, rdepends) 54 d.appendVar('RDEPENDS_%s' % pkg, rdepends)
51 55
56 #gtk_icon_cache_postinst depend on gdk-pixbuf and gtk+3
57 bb.note("adding gdk-pixbuf dependency to %s" % pkg)
58 rdepends = ' ' + d.getVar('MLPREFIX', False) + "gdk-pixbuf"
59 d.appendVar('RDEPENDS_%s' % pkg, rdepends)
60
61 bb.note("adding gtk+3 dependency to %s" % pkg)
62 rdepends = ' ' + d.getVar('MLPREFIX', False) + "gtk+3"
63 d.appendVar('RDEPENDS_%s' % pkg, rdepends)
64
52 bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) 65 bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
53 66
54 postinst = d.getVar('pkg_postinst_%s' % pkg) 67 postinst = d.getVar('pkg_postinst_%s' % pkg)
55 if not postinst: 68 if not postinst:
56 postinst = '#!/bin/sh\n' 69 postinst = '#!/bin/sh\n'