[PATCH 0/1] shadow: Fix rpm package install failure, Edwin, Aug30, 2011

[PATCH 0/1] shadow: Fix rpm package install failure, Edwin, Aug30, 2011

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

This patch fix rpm dependencies failure when install. Pls. help to reivew.

Thanks,
Edwin


The following changes since commit 94d0e2de269507aa0e64c64f691c8f507d178675:

  qemu: Make qemu buildable inside qemux86/qemuppc target (2011-08-16 13:15:27 +0800)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib gzhai/master2
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (1):
  shadow: Fix rpm failed dependencies when install

 meta/recipes-extended/shadow/shadow_4.1.4.3.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

[PATCH 1/1] shadow: Fix rpm failed dependencies when install

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

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@intel.com>
---
 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 70d4cbb..e34895e 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 = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${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
-- 
1.7.1

Re: [PATCH 1/1] shadow: Fix rpm failed dependencies when install

[Richard Purdie]

On Tue, 2011-08-30 at 16:05 +0800, edwin.zhai@intel.com wrote:
> From: Zhai Edwin <edwin.zhai@intel.com>
> 
> 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@intel.com>
> ---
>  meta/recipes-extended/shadow/shadow_4.1.4.3.bb |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard