This is the ${W}/package directory which may be reused in subsequent builds.
Also clean up various default directories rpm 4 creates.
Signed-off-by: Alexander Kanavin <alexander.kana...@linux.intel.com>
---
meta/classes/package_rpm.bbclass | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index a972f0bb7d5..bebc7a6a1eb 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -708,7 +708,7 @@ export MAGIC=%s
""" %(oe.path.join(d.getVar('STAGING_LIBDIR_NATIVE'),
"rpm"),d.getVar('STAGING_DIR_NATIVE'), magicfile)
cmd = rpmbuild
- cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + "
--buildroot " + pkgd
+ cmd = cmd + " --noclean --nodeps --short-circuit --target " + pkgarch + "
--buildroot " + pkgd
cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " +
pkgwritedir + "'"
cmd = cmd + " --define '_builddir " + d.getVar('S') + "'"
cmd = cmd + " --define '_build_name_fmt
%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
@@ -732,8 +732,11 @@ export MAGIC=%s
bb.build.exec_func('SBUILDSPEC', d)
cmd = cmd + " -bb " + outspecfile
+ # rpm 4 creates various empty directories in _topdir, let's clean them up
+ cleanupcmd = "rm -rf %s/BUILDROOT %s/SOURCES %s/SPECS %s/SRPMS" %
(workdir, workdir, workdir, workdir)
+
# Build the rpm package!
- d.setVar('BUILDSPEC', export_cmd + "\n" + cmd + "\n")
+ d.setVar('BUILDSPEC', export_cmd + "\n" + cmd + "\n" + cleanupcmd + "\n")
d.setVarFlag('BUILDSPEC', 'func', '1')
bb.build.exec_func('BUILDSPEC', d)
--
2.11.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
