[PATCH 0/1] systemd: fix SULOGIN path

[PATCH 0/1] systemd: fix SULOGIN path

[Chen Qi]

The following changes since commit d3fcfe346b3472170641d9194243c4bbe06b8585:

  systemd: fix firmware path to match linux-firmware (2015-03-23 11:27:13 +0000)

are available in the git repository at:

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

Chen Qi (1):
  systemd: fix SULOGIN path

 meta/recipes-core/systemd/systemd_219.bb | 1 +
 1 file changed, 1 insertion(+)

-- 
1.9.1

[PATCH 1/1] systemd: fix SULOGIN path

[Chen Qi]

Fix SULOGIN path so that rescue.service doesn't use `sulogin' from the sysroot
part of the build on host, which would lead to errors like below when booting
into rescue mode.

    /bin/sh: /buildarea2/chenqi/poky/build-systemd/tmp/sysroots/x86_64-linux/sbin/sulogin: not found

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/systemd/systemd_219.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index f2d3c13..843e30b 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -123,6 +123,7 @@ do_configure_prepend() {
 	export AR="${HOST_PREFIX}gcc-ar"
 	export RANLIB="${HOST_PREFIX}gcc-ranlib"
 	export KMOD="${base_bindir}/kmod"
+	export SULOGIN="${base_sbindir}/sulogin"
 	if [ -d ${S}/units.pre_sed ] ; then
 		cp -r ${S}/units.pre_sed ${S}/units
 	else
-- 
1.9.1

Re: [PATCH 1/1] systemd: fix SULOGIN path

[Jonathan Liu]

On 25/03/2015 5:03 PM, Chen Qi wrote:
> Fix SULOGIN path so that rescue.service doesn't use `sulogin' from the sysroot
> part of the build on host, which would lead to errors like below when booting
> into rescue mode.
>
>      /bin/sh: /buildarea2/chenqi/poky/build-systemd/tmp/sysroots/x86_64-linux/sbin/sulogin: not found
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>   meta/recipes-core/systemd/systemd_219.bb | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
> index f2d3c13..843e30b 100644
> --- a/meta/recipes-core/systemd/systemd_219.bb
> +++ b/meta/recipes-core/systemd/systemd_219.bb
> @@ -123,6 +123,7 @@ do_configure_prepend() {
>   	export AR="${HOST_PREFIX}gcc-ar"
>   	export RANLIB="${HOST_PREFIX}gcc-ranlib"
>   	export KMOD="${base_bindir}/kmod"
> +	export SULOGIN="${base_sbindir}/sulogin"
>   	if [ -d ${S}/units.pre_sed ] ; then
>   		cp -r ${S}/units.pre_sed ${S}/units
>   	else
Wasn't this already fixed by:
https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-core/systemd/systemd_219.bb?id=8e19349b696d4a3e8576ba64e935cf3a43bc7940 
?

Regards,
Jonathan

Re: [PATCH 1/1] systemd: fix SULOGIN path

[ChenQi]

On 03/25/2015 02:26 PM, Jonathan Liu wrote:
> On 25/03/2015 5:03 PM, Chen Qi wrote:
>> Fix SULOGIN path so that rescue.service doesn't use `sulogin' from 
>> the sysroot
>> part of the build on host, which would lead to errors like below when 
>> booting
>> into rescue mode.
>>
>>      /bin/sh: 
>> /buildarea2/chenqi/poky/build-systemd/tmp/sysroots/x86_64-linux/sbin/sulogin: 
>> not found
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>>   meta/recipes-core/systemd/systemd_219.bb | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/meta/recipes-core/systemd/systemd_219.bb 
>> b/meta/recipes-core/systemd/systemd_219.bb
>> index f2d3c13..843e30b 100644
>> --- a/meta/recipes-core/systemd/systemd_219.bb
>> +++ b/meta/recipes-core/systemd/systemd_219.bb
>> @@ -123,6 +123,7 @@ do_configure_prepend() {
>>       export AR="${HOST_PREFIX}gcc-ar"
>>       export RANLIB="${HOST_PREFIX}gcc-ranlib"
>>       export KMOD="${base_bindir}/kmod"
>> +    export SULOGIN="${base_sbindir}/sulogin"
>>       if [ -d ${S}/units.pre_sed ] ; then
>>           cp -r ${S}/units.pre_sed ${S}/units
>>       else
> Wasn't this already fixed by:
> https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-core/systemd/systemd_219.bb?id=8e19349b696d4a3e8576ba64e935cf3a43bc7940 
> ?
>
> Regards,
> Jonathan
>
>

Yes, you are right.
I didn't notice it.
Please ignore this patch.
I've updated my repo to the latest one.

Thanks,
Chen Qi