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

[Koen Kooi <koen.kooi@linaro.org>]

On 01/21/2014 02:01 PM, Martin Jansa wrote:
> 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()

And I did especially pay attention to use tabs after all the meta-oe 
patches I did :)