[PATCH 0/1] systemd: fix to use ${libdir}

[PATCH 0/1] systemd: fix to use ${libdir}

[Chen Qi]

The following changes since commit 10df0718d6a626d99beb68cde8d914ee0820d7eb:

  classes/populate_sdk_base: enable adding custom commands to SDK install script (2014-09-11 17:44:40 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd-libdir
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd-libdir

Chen Qi (1):
  systemd: fix to use ${libdir}

 meta/recipes-core/systemd/systemd_216.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
1.9.1

[PATCH 1/1] systemd: fix to use ${libdir}

[Chen Qi]

We need to user ${libdir} instead of ${exec_prefix}/lib.
Otherwise, we would neet do_install errors if multilib is enabled.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/systemd/systemd_216.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index bd52891..331da99 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -129,7 +129,7 @@ do_install() {
 	fi
 
 	# Move libgudev back to ${rootlibdir} to keep backward compatibility
-	[ ${rootlibdir} != ${exec_prefix}/lib ] && mv -t ${D}${rootlibdir} ${D}${exec_prefix}/lib/libgudev*
+	[ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
 
         # Delete journal README, as log can be symlinked inside volatile.
         rm -f ${D}/${localstatedir}/log/README
@@ -241,7 +241,7 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${rootlibexecdir}/systemd/* \
                 ${systemd_unitdir}/* \
                 ${base_libdir}/security/*.so \
-                ${exec_prefix}/lib/libnss_* \
+                ${libdir}/libnss_* \
                 /cgroup \
                 ${bindir}/systemd* \
                 ${bindir}/busctl \
-- 
1.9.1

Re: [PATCH 1/1] systemd: fix to use ${libdir}

[ChenQi]

On 09/14/2014 01:39 PM, Chen Qi wrote:
> We need to user ${libdir} instead of ${exec_prefix}/lib.
> Otherwise, we would neet do_install errors if multilib is enabled.

typo here.

Should be 'meet' instead of 'neet'.

V2 has been sent.

//Chen Qi

> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>   meta/recipes-core/systemd/systemd_216.bb | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
> index bd52891..331da99 100644
> --- a/meta/recipes-core/systemd/systemd_216.bb
> +++ b/meta/recipes-core/systemd/systemd_216.bb
> @@ -129,7 +129,7 @@ do_install() {
>   	fi
>   
>   	# Move libgudev back to ${rootlibdir} to keep backward compatibility
> -	[ ${rootlibdir} != ${exec_prefix}/lib ] && mv -t ${D}${rootlibdir} ${D}${exec_prefix}/lib/libgudev*
> +	[ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
>   
>           # Delete journal README, as log can be symlinked inside volatile.
>           rm -f ${D}/${localstatedir}/log/README
> @@ -241,7 +241,7 @@ FILES_${PN} = " ${base_bindir}/* \
>                   ${rootlibexecdir}/systemd/* \
>                   ${systemd_unitdir}/* \
>                   ${base_libdir}/security/*.so \
> -                ${exec_prefix}/lib/libnss_* \
> +                ${libdir}/libnss_* \
>                   /cgroup \
>                   ${bindir}/systemd* \
>                   ${bindir}/busctl \