From: Bian Naimeng <biannm@cn.fujitsu.com>
Date: Tue, 9 Jul 2013 08:27:43 +0000 (+0000)
Subject: package_rpm.bbclass: remove xx.spec before doing rpmbuild xx.src.rpm
X-Git-Tag: 2015-4~5865
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=760af902a98b350a2f1f3203fa0096965924a83d;p=openembedded-core.git

package_rpm.bbclass: remove xx.spec before doing rpmbuild xx.src.rpm

If the spec file already exist, and has not been stored into pseudo's files.db,
it maybe cause rpmbuild src.rpm fail, so remove it before doing rpmbuild src.rpm.

Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
---

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index fa928ce042..1537079bb0 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -1079,8 +1079,13 @@ python do_package_rpm () {
         return
 
     # Construct the spec file...
+    # If the spec file already exist, and has not been stored into 
+    # pseudo's files.db, it maybe cause rpmbuild src.rpm fail,
+    # so remove it before doing rpmbuild src.rpm.
     srcname    = strip_multilib(d.getVar('PN', True), d)
     outspecfile = workdir + "/" + srcname + ".spec"
+    if os.path.isfile(outspecfile):
+        os.remove(outspecfile)
     d.setVar('OUTSPECFILE', outspecfile)
     bb.build.exec_func('write_specfile', d)