summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-12-01 13:02:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-01 12:18:32 +0000
commit3080f523dfe2da165dcb976676ac1dcfc77b0abc (patch)
tree9f8dbf4832a71febde217906d72a3bb56e3f1835
parent91b94f93edbff234b70723419bf4caf13a71777b (diff)
downloadopenembedded-core-3080f523dfe2da165dcb976676ac1dcfc77b0abc.tar.gz
openembedded-core-3080f523dfe2da165dcb976676ac1dcfc77b0abc.tar.bz2
openembedded-core-3080f523dfe2da165dcb976676ac1dcfc77b0abc.zip
shadow: use u-a for /usr/bin/groups
* otherwise coreutils upgrade fails with update-alternatives: Error: not linking //usr/bin/groups to groups.coreutils since //usr/bin/groups exists and is not a link Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/shadow/shadow_4.1.4.3.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 25330a4cef..dddac2ca62 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
-PR = "r5"
+PR = "r6"
SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
file://login_defs_pam.sed \
@@ -88,7 +88,7 @@ do_install_append() {
sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd
install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir}
- for i in passwd chfn newgrp chsh ; do
+ for i in passwd chfn newgrp chsh groups ; do
mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
done
@@ -123,6 +123,7 @@ pkg_postinst_${PN} () {
update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 200
update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200
update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 200
+ update-alternatives --install ${bindir}/groups groups groups.${PN} 200
update-alternatives --install ${base_bindir}/login login login.${PN} 200
update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 200
update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200