diff options
author | Daniel Gomez <daniel@qtec.com> | 2022-09-28 14:10:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-29 08:05:24 +0100 |
commit | e14a481661ba3db39fa9bb97902e0014c700f0b4 (patch) | |
tree | a385a84e5df7e4a2df8b16aa97504514f99daf28 | |
parent | 7d2f9023e3e598cdde1e6574ae065e4c60f70440 (diff) | |
download | poky-e14a481661ba3db39fa9bb97902e0014c700f0b4.tar.gz |
gtk-icon-cache: Fix GTKIC_CMD if-else condition
GTKIC_CMD variable gets the wrong assignation leading into a post
install script error. Fix if-else condition in GTKIC_CMD variable
to assign gtk4-update-icon-cache when GTKIC_VERSION is 4 but
gtk-update-icon-cache when is 3.
Also, rename gtk-update-icon-cache-3.0.0 to gtk-update-icon-cache-3.0
to match the gtk-update-icon-cache binary name deployed in
meta/recipes-gnome/gtk+/gtk+3.inc.
(From OE-Core rev: 95fc819fca11115623d0f1f7f0c11e9c46195b21)
Signed-off-by: Daniel Gomez <daniel@qtec.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-recipe/gtk-icon-cache.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/gtk-icon-cache.bbclass b/meta/classes-recipe/gtk-icon-cache.bbclass index 17c7eb7a33..9ecb49916c 100644 --- a/meta/classes-recipe/gtk-icon-cache.bbclass +++ b/meta/classes-recipe/gtk-icon-cache.bbclass | |||
@@ -9,7 +9,7 @@ FILES:${PN} += "${datadir}/icons/hicolor" | |||
9 | GTKIC_VERSION ??= '3' | 9 | GTKIC_VERSION ??= '3' |
10 | 10 | ||
11 | GTKPN = "${@ 'gtk4' if d.getVar('GTKIC_VERSION') == '4' else 'gtk+3' }" | 11 | GTKPN = "${@ 'gtk4' if d.getVar('GTKIC_VERSION') == '4' else 'gtk+3' }" |
12 | GTKIC_CMD = "${@ 'gtk-update-icon-cache-3.0.0' if d.getVar('GTKIC_VERSION') == '4' else 'gtk4-update-icon-cache' }" | 12 | GTKIC_CMD = "${@ 'gtk4-update-icon-cache' if d.getVar('GTKIC_VERSION') == '4' else 'gtk-update-icon-cache-3.0' }" |
13 | 13 | ||
14 | #gtk+3/gtk4 require GTK3DISTROFEATURES, DEPENDS on it make all the | 14 | #gtk+3/gtk4 require GTK3DISTROFEATURES, DEPENDS on it make all the |
15 | #recipes inherit this class require GTK3DISTROFEATURES | 15 | #recipes inherit this class require GTK3DISTROFEATURES |