[oe-commits] Robert Yang : rootfs_rpm.bbclass: maybe no rpm postinst script

[git at git.openembedded.org]

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

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Wed Sep 26 17:22:16 2012 +0800

rootfs_rpm.bbclass: maybe no rpm postinst script

There maybe no rpm postinst script (e.g., core-image-minimal), then the
"*" is not expanded, and there would be error:

head: cannot open `rpm-postinsts/*' for reading: No such file or directory

Check whether it exists or not will fix the problem.

[YOCTO #3172]

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/rootfs_rpm.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index d95ccfa..c86cd09 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -81,7 +81,9 @@ fakeroot rootfs_rpm_do_rootfs () {
 
 	# Report delayed package scriptlets
 	for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*; do
-		echo "Delayed package scriptlet: `head -n 3 $i | tail -n 1`"
+		if [ -f $i ]; then
+			echo "Delayed package scriptlet: `head -n 3 $i | tail -n 1`"
+		fi
 	done
 
 	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d