Patchwork [1/1] Fix empty file case that caused build error at do_rootfs

login
register
mail settings
Submitter Jessica Zhang
Date March 26, 2012, 9:31 p.m.
Message ID <9869c8a2ce084da47f0e24a38c086ba006aca9ba.1332796964.git.jessica.zhang@intel.com>
Download mbox | patch
Permalink /patch/24573/
State Accepted
Commit 2035ce464cc41672c98f7efb8c4a966f93aa7bd0
Headers show

Comments

Jessica Zhang - March 26, 2012, 9:31 p.m.
Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
---
 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Richard Purdie - March 26, 2012, 10:07 p.m.
On Mon, 2012-03-26 at 14:31 -0700, Jessica Zhang wrote:
> Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
> ---
>  meta/classes/package_rpm.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard

Patch

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