Skip to contentSkip to conversation

systemd: fix SULOGIN path

PATCH In review Chen Qi 2 participants 4 messages Mar 25, 2015 – Mar 26, 2015

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover systemd: fix SULOGIN path

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(+)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 systemd: fix SULOGIN path

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

---
 meta/recipes-core/systemd/systemd_219.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/systemd/systemd_219.bb +1 -0
index f2d3c13..843e30b 100644
@@ -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
Signature · 1 line
1.9.1
#2 lore raw
Quoted 16 lines · 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

---
  meta/recipes-core/systemd/systemd_219.bb | 1 +
  1 file changed, 1 insertion(+)
meta/recipes-core/systemd/systemd_219.bb +0 -0
index f2d3c13..843e30b 100644

meta/recipes-core/systemd/systemd_219.bb do_configure_prepend() { · line 129

Quoted 7 lines
meta/recipes-core/systemd/systemd_219.bb +1 -0
@@ -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

author
#3 lore raw
Quoted 28 lines · Jonathan Liu
Quoted 17 lines · 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

---
  meta/recipes-core/systemd/systemd_219.bb | 1 +
  1 file changed, 1 insertion(+)
meta/recipes-core/systemd/systemd_219.bb +0 -0
index f2d3c13..843e30b 100644

meta/recipes-core/systemd/systemd_219.bb do_configure_prepend() { · line 129

Quoted 7 lines
meta/recipes-core/systemd/systemd_219.bb +1 -0
@@ -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 ?

Quoted 4 lines

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