Re: [meta-oe][PATCH] polkit: fix an incomplete patch

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3664 bytes --]

On Wed, Oct 14, 2015 at 10:51:31AM +0800, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> The patch 0001-do-not-hardcoded-libdir.patch to fix
> libprivdir is incomplete, it missed to fix the one
> in data/Makefile.am, and causes failure:
> 
> systemd[676]: polkit.service: Failed at step EXEC spawning /usr/lib/polkit-1/polkitd: No such file or directory
> 
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>  .../polkit/0001-do-not-hardcoded-libdir.patch      | 31 ++++++++++++++++------
>  1 file changed, 23 insertions(+), 8 deletions(-)

error:
meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch:
does not exist in index

It was removed in:
commit f86ba9a5583d3b493651134bf710d28dd6509765
Author: Reinette Chatre <reinette.chatre@intel.com>
Date:   Thu Sep 24 15:03:01 2015 -0700

    polkit: fix relocation of polkit binaries

> 
> diff --git a/meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch b/meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch
> index e605e30..21ef578 100644
> --- a/meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch
> +++ b/meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch
> @@ -1,6 +1,6 @@
> -From c9e09d9b101109832b1dcb050f0c8b588e276686 Mon Sep 17 00:00:00 2001
> -From: Zhenhua Luo <zhenhua.luo@freescale.com>
> -Date: Mon, 4 May 2015 04:11:27 -0500
> +From fd07fbf131e31124094d9123091604dd32726750 Mon Sep 17 00:00:00 2001
> +From: Jackie Huang <jackie.huang@windriver.com>
> +Date: Wed, 14 Oct 2015 10:30:12 +0800
>  Subject: [PATCH] do not hardcoded libdir
>  
>  Upstream-Status: Pending
> @@ -8,13 +8,28 @@ Upstream-Status: Pending
>  libdir is hardcoded to ${prefix}/lib, but we want it to support multilib
>  
>  Signed-off-by: Chunrong Guo <B40290@freescale.com>
> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
>  ---
> - polkitagent/Makefile.am   | 2 +-
> - polkitbackend/Makefile.am | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> + data/Makefile.am              | 2 +-
> + src/polkitagent/Makefile.am   | 2 +-
> + src/polkitbackend/Makefile.am | 2 +-
> + 3 files changed, 3 insertions(+), 3 deletions(-)
>  
> +diff --git a/data/Makefile.am b/data/Makefile.am
> +index fe0f1d5..52cb4b4 100644
> +--- a/data/Makefile.am
> ++++ b/data/Makefile.am
> +@@ -2,7 +2,7 @@
> + 
> + NULL =
> + 
> +-libprivdir = $(prefix)/lib/polkit-1
> ++libprivdir = $(libdir)/polkit-1
> + 
> + # ----------------------------------------------------------------------------------------------------
> + 
>  diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
> -index 3bc364e..7d1ac0e 100644
> +index 58a55bd..1b6156b 100644
>  --- a/src/polkitagent/Makefile.am
>  +++ b/src/polkitagent/Makefile.am
>  @@ -78,7 +78,7 @@ libpolkit_agent_1_la_LIBADD =                               		\
> @@ -27,7 +42,7 @@ index 3bc364e..7d1ac0e 100644
>   
>   polkit_agent_helper_1_SOURCES = 					\
>  diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am
> -index 9f430d0..1f7610b 100644
> +index 547ca82..78ed934 100644
>  --- a/src/polkitbackend/Makefile.am
>  +++ b/src/polkitbackend/Makefile.am
>  @@ -67,7 +67,7 @@ rules_DATA = 50-default.rules
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]