[oe-commits] Jessica Zhang : Fix empty file case that caused build error at do_rootfs
git at git.openembedded.org
git at git.openembedded.org
Mon Mar 26 22:12:34 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 2035ce464cc41672c98f7efb8c4a966f93aa7bd0
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2035ce464cc41672c98f7efb8c4a966f93aa7bd0
Author: Jessica Zhang <jessica.zhang at intel.com>
Date: Mon Mar 26 14:31:12 2012 -0700
Fix empty file case that caused build error at do_rootfs
Signed-off-by: Jessica Zhang <jessica.zhang at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/package_rpm.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index e83fc55..8c8d967 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -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
More information about the Openembedded-commits
mailing list