diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2011-12-01 13:02:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 12:20:01 +0000 |
commit | d10d614d01fdf82fe2d641c4eb5c9a06ac17f8c0 (patch) | |
tree | f86cf80f353a614a73789768d4fe9bb10196effa | |
parent | 1c62040f894d159af750c9cb47a0b2d94c95c505 (diff) | |
download | poky-d10d614d01fdf82fe2d641c4eb5c9a06ac17f8c0.tar.gz |
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 <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.bb | 5 |
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 \ | |||
9 | 9 | ||
10 | DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 10 | DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
11 | RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" | 11 | RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" |
12 | PR = "r5" | 12 | PR = "r6" |
13 | 13 | ||
14 | SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ | 14 | SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ |
15 | file://login_defs_pam.sed \ | 15 | file://login_defs_pam.sed \ |
@@ -88,7 +88,7 @@ do_install_append() { | |||
88 | sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd | 88 | sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd |
89 | 89 | ||
90 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} | 90 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} |
91 | for i in passwd chfn newgrp chsh ; do | 91 | for i in passwd chfn newgrp chsh groups ; do |
92 | mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN} | 92 | mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN} |
93 | done | 93 | done |
94 | 94 | ||
@@ -123,6 +123,7 @@ pkg_postinst_${PN} () { | |||
123 | update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 200 | 123 | update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 200 |
124 | update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200 | 124 | update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200 |
125 | update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 200 | 125 | update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 200 |
126 | update-alternatives --install ${bindir}/groups groups groups.${PN} 200 | ||
126 | update-alternatives --install ${base_bindir}/login login login.${PN} 200 | 127 | update-alternatives --install ${base_bindir}/login login login.${PN} 200 |
127 | update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 200 | 128 | update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 200 |
128 | update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200 | 129 | update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200 |