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

PATCH New Bian Naimeng 1 participant 1 message Jul 10, 2013

Share & tools

Bian Naimeng

author

2013-07-10 03:13 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 meta/classes/package_rpm.bbclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

meta/classes/package_rpm.bbclass +5 -0

index c654cdb..217ddcb 100644
@@ -1069,8 +1069,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)

-- 1.7.1