From d10d614d01fdf82fe2d641c4eb5c9a06ac17f8c0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 1 Dec 2011 13:02:08 +0100 Subject: 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 (From OE-Core rev: 3080f523dfe2da165dcb976676ac1dcfc77b0abc) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-extended/shadow') 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 -- cgit v1.2.3-54-g00ecf