summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-01-22 16:44:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-22 15:54:34 +0000
commitbd10a6d257ab5ce2fc961788c278af7c43637404 (patch)
tree4446f27c9e75d2f7d8ee2c08b6b542f06e7ae51e
parenta789dc9175017efcf46f868e27a16c21114cfcff (diff)
downloadpoky-bd10a6d257ab5ce2fc961788c278af7c43637404.tar.gz
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] (From OE-Core rev: 202263aeca837dc7b6615a3dc34569c199163733) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs_rpm.bbclass3
1 files changed, 2 insertions, 1 deletions
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 () {
108 i=\$i 108 i=\$i
109 cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF 109 cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF
110#!/bin/sh 110#!/bin/sh
111for i in /etc/rpm-postinsts/*; do 111for i in `ls /etc/rpm-postinsts/`; do
112 i=/etc/rpm-postinsts/$i
112 echo "Running postinst $i..." 113 echo "Running postinst $i..."
113 if [ -f $i ] && $i; then 114 if [ -f $i ] && $i; then
114 rm $i 115 rm $i