[oe-commits] Zhai Edwin : shadow: Fix rpm failed dependencies when install

git version control git at git.openembedded.org
Wed Aug 31 19:02:45 UTC 2011


Module: openembedded-core.git
Branch: master
Commit: 48ec20d1331eb665d9fc1a06bdb1ea79e4513159
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=48ec20d1331eb665d9fc1a06bdb1ea79e4513159

Author: Zhai Edwin <edwin.zhai at intel.com>
Date:   Tue Aug 30 16:05:01 2011 +0800

shadow: Fix rpm failed dependencies when install

There are some links become invalid after rename, so that failed dependencies
detected when install rpm package. This commit update links to resolve it.

[YOCTO #1158] got fixed.

Signed-off-by: Zhai Edwin <edwin.zhai at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-extended/shadow/shadow_4.1.4.3.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 728b8e5..5bc4a61 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} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
            file://login_defs_pam.sed \
@@ -97,6 +97,11 @@ do_install_append() {
 	mv ${D}${sbindir}/vipw ${D}${base_sbindir}/vipw.${PN}
 	mv ${D}${bindir}/login ${D}${base_bindir}/login.${PN}
 
+	# Handle link properly after rename, otherwise missing files would
+	# lead rpm failed dependencies.
+	ln -sf vipw.${PN} ${D}${base_sbindir}/vigr.${PN}
+	ln -sf newgrp.${PN} ${D}${bindir}/sg
+
 	# Ensure we add a suitable securetty file to the package that has
 	# most common embedded TTYs defined.
 	if [ ! -z "${SERIAL_CONSOLE}" ]; then





More information about the Openembedded-commits mailing list