Skip to contentSkip to conversation

sysvinit: use ALTERNATIVE to manage sulogin

PATCH In review [email protected] 2 participants 4 messages Nov 15, 2013 – Nov 16, 2013

lore
Share & tools
lore
#0 lore raw

cover sysvinit: use ALTERNATIVE to manage sulogin

From: Chen Qi <[email protected]>

The following changes since commit ea92671d9823e3667d6ced7ac2af20f991da404d:

bitbake: cooker: replace "w" file opening mode with "a" mode (2013-11-12 17:01:37 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/sysvinit-sulogin
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/sysvinit-sulogin

Chen Qi (1):
sysvinit: use ALTERNATIVE to manage sulogin

 meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 sysvinit: use ALTERNATIVE to manage sulogin

From: Chen Qi <[email protected]>

Busybox also provides sulogin command, so we need to use the ALTERNATIVE mechanism to manage it.

---
 meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +4 -1
index 50842e2..f2d5659 100644
@@ -44,6 +44,9 @@ ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
 ALTERNATIVE_${PN}-pidof = "pidof"
 ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof"
 
+ALTERNATIVE_${PN}-sulogin = "sulogin"
+ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
+
 ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
 
 ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
@@ -56,7 +59,7 @@ ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
 PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
 FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
 FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5"
-FILES_sysvinit-sulogin = "${base_sbindir}/sulogin"
+FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit"
 
 RDEPENDS_${PN} += "sysvinit-pidof"
 
Signature · 1 line
1.7.9.5
#2 lore raw

meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" · line 62

Quoted 2 lines · On Fri, 2013-11-15 at 18:45 +0800, [email protected] wrote:
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +1 -1
-FILES_sysvinit-sulogin = "${base_sbindir}/sulogin"
+FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit"

At the risk of seeming dim, how does ${base_sbindir}/sulogin.sysvinit get installed in the first place?

p.

author
#3 lore raw
Quoted 11 lines · Phil Blundell

meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" · line 62

Quoted 2 lines · On Fri, 2013-11-15 at 18:45 +0800, [email protected] wrote:
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +1 -1
-FILES_sysvinit-sulogin = "${base_sbindir}/sulogin"
+FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit"

At the risk of seeming dim, how does ${base_sbindir}/sulogin.sysvinit get installed in the first place?

p.

It's handled in the update-alternative.bbclass.

# We need to do the rename after the image creation step, but before

# the split and strip steps..  packagecopy seems to be the earliest reasonable
# place.
python perform_packagecopy_append () {
.....
}

Best Regards,
Chen Qi