diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-07-26 17:14:13 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-15 14:18:41 +0100 |
| commit | 3c9361606e458ffe3fec1eef621998ab887894c2 (patch) | |
| tree | 1ab755e61c8ea6e0cad3c44b4d331617e84dc922 | |
| parent | a8ad6529b214c1c7b12dffb557d9f7afa3ee1f04 (diff) | |
| download | openembedded-core-3c9361606e458ffe3fec1eef621998ab887894c2.tar.gz openembedded-core-3c9361606e458ffe3fec1eef621998ab887894c2.tar.bz2 openembedded-core-3c9361606e458ffe3fec1eef621998ab887894c2.zip | |
shadow: cleanup update-alternatives deprecated code
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 18 |
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 \ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" -PR = "r11" +PR = "r12" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://login_defs_pam.sed \ @@ -105,17 +105,11 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "200" -bindir_progs = "passwd chfn newgrp chsh groups" -ALTERNATIVE_LINKS += "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}" - -sbindir_progs = "chpasswd" -ALTERNATIVE_LINKS += "${sbindir}/${@' ${sbindir}/'.join((d.getVar('sbindir_progs', True)).split())}" - -base_bindir_progs = "login" -ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}" - -base_sbindir_progs = "vipw vigr" -ALTERNATIVE_LINKS += "${base_sbindir}/${@' ${base_sbindir}/'.join((d.getVar('base_sbindir_progs', True)).split())}" +ALTERNATIVE_${PN} = "passwd chfn newgrp chsh groups chpasswd login vipw vigr" +ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" +ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" +ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" +ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" pkg_postinst_${PN} () { if [ "x$D" != "x" ]; then |