Re: [PATCH] systemd 208: move stray /usr/lib/systemd/* into /lib/systemd

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

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

On Tue, Jan 21, 2014 at 12:01:21PM +0100, Koen Kooi wrote:
> From: Koen Kooi <koen@dominion.thruhere.net>
> 
> Apps testing for systemd config get confused when both /usr/lib/systemd and /lib/systemd exist. This fixes (among other things) dracut systemd detections.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-core/systemd/systemd_208.bb | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb
> index 6590235..710624c 100644
> --- a/meta/recipes-core/systemd/systemd_208.bb
> +++ b/meta/recipes-core/systemd/systemd_208.bb
> @@ -113,6 +113,12 @@ do_install() {
>  
>          # Delete journal README, as log can be symlinked inside volatile.
>          rm -f ${D}/${localstatedir}/log/README
> +
> +	# fix up libdir confusion
> +	if [ -d ${D}${libdir}/systemd ] ; then
> +		cp -a ${D}${libdir}/systemd/* ${D}${systemd_unitdir}
> +		rm -rf ${D}${libdir}/systemd
> +	fi

It's not your fault, but the indentation looks inconsistent with rest of
do_install()

>  }
>  
>  do_install_ptest () {
> -- 
> 1.8.4.2
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

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

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