From: Chen Qi <Qi.Chen@windriver.com>
Date: Tue, 22 Jan 2013 08:44:05 +0000 (+0800)
Subject: rootfs_rpm.bbclass: fix the unexpected postinst error
X-Git-Tag: 2015-4~7916
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=202263aeca837dc7b6615a3dc34569c199163733;p=openembedded-core.git

rootfs_rpm.bbclass: fix the unexpected postinst error

If the /etc/rpm-postinsts/ directory was empty, the following error
would occur at system startup.

      ERROR: postinst /etc/rpm-postinsts/* failed

This patch fixes this issue.

[YOCTO #3767]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 7d789cc8fd..accd7d9c3c 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -108,7 +108,8 @@ fakeroot rootfs_rpm_do_rootfs () {
 	i=\$i
 	cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF
 #!/bin/sh
-for i in /etc/rpm-postinsts/*; do
+for i in `ls /etc/rpm-postinsts/`; do
+	i=/etc/rpm-postinsts/$i
 	echo "Running postinst $i..."
 	if [ -f $i ] && $i; then
 		rm $i