Fix empty file case that caused build error at do_rootfs
authorJessica Zhang <jessica.zhang@intel.com>
Mon, 26 Mar 2012 21:31:12 +0000 (14:31 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 26 Mar 2012 22:08:19 +0000 (23:08 +0100)
(From OE-Core rev: 2035ce464cc41672c98f7efb8c4a966f93aa7bd0)

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/package_rpm.bbclass

index e83fc55..8c8d967 100644 (file)
@@ -446,7 +446,7 @@ package_install_internal_rpm () {
        outfile=${target_rootfs}/install/total_solution.manifest
        cat $infile | grep /base-passwd-[0-9] > $outfile || true
        cat $infile | grep /shadow-[0-9] >> $outfile || true
-       cat $infile | grep -v /shadow-[0-9] | grep -v /base-passwd-[0-9] >> $outfile
+       cat $infile | grep -v /shadow-[0-9] | grep -v /base-passwd-[0-9] >> $outfile || true
        cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest
 
        # Construct install scriptlet wrapper