Skip to contentSkip to conversation

Fix for multilib rpm build failure

PATCH Applied Jessica Zhang 2 participants 3 messages Mar 26, 2012

lore
Share & tools
lore
#0 lore raw

cover Fix for multilib rpm build failure

The following changes since commit db529f9f7d9015656c67c548975d918a1908de1a:
Scott Rifenbark (1):
documentation/poky-ref-manual/development.xml: another env var clarification

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib jzhang/multilib-rpm-fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jzhang/multilib-rpm-fix

Jessica Zhang (1):
Fix empty file case that caused build error at do_rootfs

 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
#1 lore raw

PATCH 1/1 Fix empty file case that caused build error at do_rootfs

---
 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/package_rpm.bbclass +1 -1
index e83fc55..8c8d967 100644
@@ -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
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 1/1] Fix empty file case that caused build error at do_rootfs

Quoted 4 lines · Jessica Zhang
---
 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard