* [PATCH 0/1] gdk-pixbuf: fix the postinstall script failure when no icon is installed
@ 2012-08-09 2:30 jackie.huang
2012-08-09 2:30 ` [PATCH 1/1] " jackie.huang
2012-08-16 18:26 ` [PATCH 0/1] " Saul Wold
0 siblings, 2 replies; 4+ messages in thread
From: jackie.huang @ 2012-08-09 2:30 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
If gtk+ is added to core-image-minimal, postinstall script failed on boot:
Running postinst /etc/rpm-postinsts/104...
gtk-update-icon-cache: No theme index file.
ERROR: postinst /etc/rpm-postinsts/104 failed.
This patch fixed the postinstall script to check for the icon
file first and not run the gtk-update-icon-cache if no icon
is installed.
[YOCTO #2905]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
The following changes since commit 1e873271362b770381903098d46c4aec164d81de:
automake: Fix version reference in path substitutions (2012-08-07 23:35:54 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/bug2905_gdk_0809
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/bug2905_gdk_0809
Jackie Huang (1):
gdk-pixbuf: fix the postinstall script failure when no icon is
installed
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
--
1.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/1] gdk-pixbuf: fix the postinstall script failure when no icon is installed
2012-08-09 2:30 [PATCH 0/1] gdk-pixbuf: fix the postinstall script failure when no icon is installed jackie.huang
@ 2012-08-09 2:30 ` jackie.huang
2012-08-10 9:06 ` Andreas Müller
2012-08-16 18:26 ` [PATCH 0/1] " Saul Wold
1 sibling, 1 reply; 4+ messages in thread
From: jackie.huang @ 2012-08-09 2:30 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
If gtk+ is added to core-image-minimal, postinstall script failed on boot:
Running postinst /etc/rpm-postinsts/104...
gtk-update-icon-cache: No theme index file.
ERROR: postinst /etc/rpm-postinsts/104 failed.
This patch fixed the postinstall script to check for the icon
file first and not run the gtk-update-icon-cache if no icon
is installed.
[YOCTO #2905]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index 484fb12..159bdae 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -21,7 +21,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
-PR = "r4"
+PR = "r5"
inherit autotools pkgconfig gettext
@@ -62,7 +62,13 @@ fi
GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache
-test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor
+if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
+ for icondir in /usr/share/icons/*; do
+ if [ -d ${icondir} ]; then
+ gtk-update-icon-cache -q ${icondir}
+ fi
+ done
+fi
}
PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"
--
1.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/1] gdk-pixbuf: fix the postinstall script failure when no icon is installed
2012-08-09 2:30 ` [PATCH 1/1] " jackie.huang
@ 2012-08-10 9:06 ` Andreas Müller
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Müller @ 2012-08-10 9:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, Aug 9, 2012 at 4:30 AM, <jackie.huang@windriver.com> wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> If gtk+ is added to core-image-minimal, postinstall script failed on boot:
>
> Running postinst /etc/rpm-postinsts/104...
> gtk-update-icon-cache: No theme index file.
> ERROR: postinst /etc/rpm-postinsts/104 failed.
>
> This patch fixed the postinstall script to check for the icon
> file first and not run the gtk-update-icon-cache if no icon
> is installed.
>
> [YOCTO #2905]
>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> index 484fb12..159bdae 100644
> --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> @@ -21,7 +21,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
> SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
> SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
>
> -PR = "r4"
> +PR = "r5"
>
> inherit autotools pkgconfig gettext
>
> @@ -62,7 +62,13 @@ fi
>
> GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache
>
> -test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor
> +if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
> + for icondir in /usr/share/icons/*; do
> + if [ -d ${icondir} ]; then
> + gtk-update-icon-cache -q ${icondir}
> + fi
> + done
> +fi
> }
>
> PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"
> --
> 1.7.4
>
Maybe I missed something: Wouldn't it be better to remove inherit
gtk-update-icon-cache for those recipes failing?
Andreas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/1] gdk-pixbuf: fix the postinstall script failure when no icon is installed
2012-08-09 2:30 [PATCH 0/1] gdk-pixbuf: fix the postinstall script failure when no icon is installed jackie.huang
2012-08-09 2:30 ` [PATCH 1/1] " jackie.huang
@ 2012-08-16 18:26 ` Saul Wold
1 sibling, 0 replies; 4+ messages in thread
From: Saul Wold @ 2012-08-16 18:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/08/2012 07:30 PM, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> If gtk+ is added to core-image-minimal, postinstall script failed on boot:
>
> Running postinst /etc/rpm-postinsts/104...
> gtk-update-icon-cache: No theme index file.
> ERROR: postinst /etc/rpm-postinsts/104 failed.
>
> This patch fixed the postinstall script to check for the icon
> file first and not run the gtk-update-icon-cache if no icon
> is installed.
>
> [YOCTO #2905]
>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
> The following changes since commit 1e873271362b770381903098d46c4aec164d81de:
>
> automake: Fix version reference in path substitutions (2012-08-07 23:35:54 +0100)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib jhuang0/bug2905_gdk_0809
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/bug2905_gdk_0809
>
> Jackie Huang (1):
> gdk-pixbuf: fix the postinstall script failure when no icon is
> installed
>
> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-16 18:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-09 2:30 [PATCH 0/1] gdk-pixbuf: fix the postinstall script failure when no icon is installed jackie.huang
2012-08-09 2:30 ` [PATCH 1/1] " jackie.huang
2012-08-10 9:06 ` Andreas Müller
2012-08-16 18:26 ` [PATCH 0/1] " Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox