summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-07-26 17:14:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:26:34 +0100
commit9ed6b34541d904b9a297316790783c2c53997a44 (patch)
tree88b5c37b9a3f3679d4aa6528efdb505b1e2b88df
parenta260a6ed1b252244b68a29c73c312d81f30bfc4e (diff)
downloadpoky-9ed6b34541d904b9a297316790783c2c53997a44.tar.gz
shadow: cleanup update-alternatives deprecated code
(From OE-Core rev: 3c9361606e458ffe3fec1eef621998ab887894c2) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/shadow/shadow_4.1.4.3.bb18
1 files changed, 6 insertions, 12 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 de10f646cd..6794cc144e 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
10DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 10DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
11RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" 11RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
12PR = "r11" 12PR = "r12"
13 13
14SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ 14SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
15 file://login_defs_pam.sed \ 15 file://login_defs_pam.sed \
@@ -105,17 +105,11 @@ inherit update-alternatives
105 105
106ALTERNATIVE_PRIORITY = "200" 106ALTERNATIVE_PRIORITY = "200"
107 107
108bindir_progs = "passwd chfn newgrp chsh groups" 108ALTERNATIVE_${PN} = "passwd chfn newgrp chsh groups chpasswd login vipw vigr"
109ALTERNATIVE_LINKS += "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}" 109ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd"
110 110ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"
111sbindir_progs = "chpasswd" 111ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw"
112ALTERNATIVE_LINKS += "${sbindir}/${@' ${sbindir}/'.join((d.getVar('sbindir_progs', True)).split())}" 112ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
113
114base_bindir_progs = "login"
115ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
116
117base_sbindir_progs = "vipw vigr"
118ALTERNATIVE_LINKS += "${base_sbindir}/${@' ${base_sbindir}/'.join((d.getVar('base_sbindir_progs', True)).split())}"
119 113
120pkg_postinst_${PN} () { 114pkg_postinst_${PN} () {
121 if [ "x$D" != "x" ]; then 115 if [ "x$D" != "x" ]; then