[oe-commits] Martin Jansa : shadow: use u-a for groups ( conflicts with groups from coreutils-8.5)

[git version control]

Module: openembedded.git
Branch: master
Commit: 54063cb976b06b50d0303e7ee71106d5aa45a338
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=54063cb976b06b50d0303e7ee71106d5aa45a338

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Oct 30 15:38:31 2010 +0200

shadow: use u-a for groups (conflicts with groups from coreutils-8.5)

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/shadow/shadow.inc |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes/shadow/shadow.inc b/recipes/shadow/shadow.inc
index f1476b7..1b105c5 100644
--- a/recipes/shadow/shadow.inc
+++ b/recipes/shadow/shadow.inc
@@ -13,7 +13,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 
-INC_PR = "r17"
+INC_PR = "r18"
 
 # Additional Policy files for PAM
 PAM_SRC_URI = " \
@@ -57,7 +57,7 @@ CFLAGS += "-I../include"
 PACKAGES =+ "${PN}-group"
 RDEPENDS_${PN} += "${PN}-group"
 
-FILES_${PN}-group = "${bindir}/gpasswd ${bindir}/newgrp.shadow ${bindir}/sg ${bindir}/groups"
+FILES_${PN}-group = "${bindir}/gpasswd ${bindir}/newgrp.shadow ${bindir}/sg ${bindir}/groups.shadow"
 
 do_configure_prepend () {
     export CONFIG_SITE="${CONFIG_SITE} ${B}/cachedpaths"
@@ -100,7 +100,7 @@ do_install_append() {
   sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs
 
   install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} 
-  for i in passwd chfn newgrp chsh ; do
+  for i in passwd chfn newgrp groups chsh ; do
     mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
   done
 
@@ -145,9 +145,11 @@ pkg_prerm_${PN} () {
 pkg_postinst_${PN}-group () {
    touch /etc/login.defs
    update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200
+   update-alternatives --install ${bindir}/groups groups groups.${PN} 200
 }
 
 pkg_prerm_${PN}-group () {
     update-alternatives --remove newgrp newgrp.${PN}
+    update-alternatives --remove groups groups.${PN}
 }