Patchwork [4/4] gtk-immodules-cache.bbclass:fix support postrm at image creation time

login
register
mail settings
Submitter Hongxu Jia
Date Jan. 17, 2013, 7:07 a.m.
Message ID <0392b32826d8e307a1e2d2af187979f453279001.1358406049.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/42769/
State New
Headers show

Comments

Hongxu Jia - Jan. 17, 2013, 7:07 a.m.
Let gtk_immodule_cache_postrm exit with ok at image creation time

[YOCTO #3633]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/classes/gtk-immodules-cache.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Ross Burton - Jan. 17, 2013, 9:52 a.m.
On 17 January 2013 07:07, Hongxu Jia <hongxu.jia@windriver.com> wrote:
> Let gtk_immodule_cache_postrm exit with ok at image creation time
>
> [YOCTO #3633]
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>  meta/classes/gtk-immodules-cache.bbclass |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
> index 9ffb03b..6e1f5ef 100644
> --- a/meta/classes/gtk-immodules-cache.bbclass
> +++ b/meta/classes/gtk-immodules-cache.bbclass
> @@ -31,7 +31,7 @@ fi
>
>  gtk_immodule_cache_postrm() {
>  if [ "x$D" != "x" ]; then
> -    exit 1
> +    exit 0
>  fi
>  if [ ! -z `which gtk-query-immodules-2.0` ]; then
>      gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules

Surely you still want to run the postrm, and by exiting with 0 you're
not deferring it.  Can't this use the same logic as the postinst to
run on both build machine and target?

Ross
Hongxu Jia - Jan. 17, 2013, 10:38 a.m.
On 01/17/2013 05:52 PM, Burton, Ross wrote:
> On 17 January 2013 07:07, Hongxu Jia <hongxu.jia@windriver.com> wrote:
>> Let gtk_immodule_cache_postrm exit with ok at image creation time
>>
>> [YOCTO #3633]
>>
>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> ---
>>   meta/classes/gtk-immodules-cache.bbclass |    2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
>> index 9ffb03b..6e1f5ef 100644
>> --- a/meta/classes/gtk-immodules-cache.bbclass
>> +++ b/meta/classes/gtk-immodules-cache.bbclass
>> @@ -31,7 +31,7 @@ fi
>>
>>   gtk_immodule_cache_postrm() {
>>   if [ "x$D" != "x" ]; then
>> -    exit 1
>> +    exit 0
>>   fi
>>   if [ ! -z `which gtk-query-immodules-2.0` ]; then
>>       gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
> Surely you still want to run the postrm, and by exiting with 0 you're
> not deferring it.  Can't this use the same logic as the postinst to
> run on both build machine and target?
>
> Ross
No problem, I will use the same logic as the postinst to do that.

Thanks,
Hongxu

Patch

diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
index 9ffb03b..6e1f5ef 100644
--- a/meta/classes/gtk-immodules-cache.bbclass
+++ b/meta/classes/gtk-immodules-cache.bbclass
@@ -31,7 +31,7 @@  fi
 
 gtk_immodule_cache_postrm() {
 if [ "x$D" != "x" ]; then
-    exit 1
+    exit 0
 fi
 if [ ! -z `which gtk-query-immodules-2.0` ]; then
     gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules