* [PATCH 0/1] Fix for multilib rpm build failure
@ 2012-03-26 21:31 Jessica Zhang
2012-03-26 21:31 ` [PATCH 1/1] Fix empty file case that caused build error at do_rootfs Jessica Zhang
0 siblings, 1 reply; 3+ messages in thread
From: Jessica Zhang @ 2012-03-26 21:31 UTC (permalink / raw)
To: openembedded-core
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(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] Fix empty file case that caused build error at do_rootfs
2012-03-26 21:31 [PATCH 0/1] Fix for multilib rpm build failure Jessica Zhang
@ 2012-03-26 21:31 ` Jessica Zhang
2012-03-26 22:07 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Jessica Zhang @ 2012-03-26 21:31 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
---
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
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] Fix empty file case that caused build error at do_rootfs
2012-03-26 21:31 ` [PATCH 1/1] Fix empty file case that caused build error at do_rootfs Jessica Zhang
@ 2012-03-26 22:07 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2012-03-26 22:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-26 22:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-26 21:31 [PATCH 0/1] Fix for multilib rpm build failure Jessica Zhang
2012-03-26 21:31 ` [PATCH 1/1] Fix empty file case that caused build error at do_rootfs Jessica Zhang
2012-03-26 22:07 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox