summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-01-24 16:07:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 11:35:20 +0000
commit6a2e06e5d4b1d3288de4542a0929426b43fbab12 (patch)
treeb3aedc5a8e77f8d895f2d3e6cdc7f39c6bb5ddda
parentf808bce13f27e1013b283117621a192c83571919 (diff)
downloadpoky-6a2e06e5d4b1d3288de4542a0929426b43fbab12.tar.gz
util-linux,shadow: Make 'nologin' alternative command
Both shadow and util-linux packages provides 'nologin' binary in ${base_sbindir} and ${sbindir} respectively, this leads to conflict when 'usrmerge' feature is enabled, where ${sbindir} == ${base_sbindir}. Hance, handle this to alternative system to resolve the conflict. (From OE-Core rev: 07d6d0fb4dc689008bb0022d7d2ecc890c9159e5) Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc5
-rw-r--r--meta/recipes-extended/shadow/shadow.inc3
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index ccc808a2f2..63302a9fe1 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -151,7 +151,7 @@ do_install () {
151 mkdir -p ${D}${base_bindir} 151 mkdir -p ${D}${base_bindir}
152 152
153 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" 153 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
154 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root" 154 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin"
155 binprogs_a="dmesg getopt kill more umount mount login reset su mountpoint" 155 binprogs_a="dmesg getopt kill more umount mount login reset su mountpoint"
156 156
157 if [ "${base_sbindir}" != "${sbindir}" ]; then 157 if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -194,7 +194,7 @@ ALTERNATIVE_PRIORITY = "80"
194 194
195ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" 195ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
196ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall" 196ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall"
197ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject" 197ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin"
198 198
199ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 199ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
200ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 200ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -204,6 +204,7 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
204ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 204ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
205ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" 205ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
206ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 206ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
207ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
207 208
208ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" 209ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1"
209 210
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 25283a9741..70ff68ee87 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -172,10 +172,11 @@ inherit update-alternatives
172 172
173ALTERNATIVE_PRIORITY = "200" 173ALTERNATIVE_PRIORITY = "200"
174 174
175ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr" 175ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr nologin"
176ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" 176ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd"
177ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" 177ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw"
178ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" 178ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
179ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
179 180
180ALTERNATIVE_${PN}-base = "newgrp groups login su" 181ALTERNATIVE_${PN}-base = "newgrp groups login su"
181ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" 182ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"