aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid-John Willis <John.Willis@Distant-earth.com>2010-03-22 01:06:54 +0000
committerMarcin Juszkiewicz <marcin@buglabs.net>2010-03-23 10:57:39 +0100
commit376fff5adb863ad94c24677ea20da1c6af94d418 (patch)
tree91e792a25d5aa49b57a06bce3287a376a8b21329
parent7e95dc8021574b34325baf82353dc996537e388f (diff)
downloadopenembedded-376fff5adb863ad94c24677ea20da1c6af94d418.zip
openembedded-376fff5adb863ad94c24677ea20da1c6af94d418.tar.gz
openembedded-376fff5adb863ad94c24677ea20da1c6af94d418.tar.bz2
shadow: Fix issue that stopped shadow.inc from packaging /usr/bin/passwd correctly and bump INC_PR.
Signed-off-by: Chris Larson <clarson@mvista.com> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Philip Balister <philip@balister.org>
-rw-r--r--recipes/shadow/shadow.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/shadow/shadow.inc b/recipes/shadow/shadow.inc
index 68381f0..9da5845 100644
--- a/recipes/shadow/shadow.inc
+++ b/recipes/shadow/shadow.inc
@@ -11,7 +11,7 @@ LICENSE = "BSD"
SECTION = "base"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-INC_PR = "r8"
+INC_PR = "r9"
# Additional Policy files for PAM
PAM_SRC_URI = " \
@@ -79,8 +79,8 @@ do_install_append() {
sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs
sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs
+ mv ${D}${bindir}/passwd ${D}${bindir}/passwd.${PN}
mv ${D}${sbindir}/chpasswd ${D}${sbindir}/chpasswd.${PN}
- mv ${D}${bindir}/passwd ${D}${bindir}/chpasswd.${PN}
# Ensure we add a suitable securetty file to the package that has most common embedded TTYs defined.
install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty