diff options
-rw-r--r-- | meta/classes/package_rpm.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 9b634e583b..ff86dc8798 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -697,7 +697,7 @@ python do_package_rpm () { | |||
697 | os.chmod(pkgwritedir, 0o755) | 697 | os.chmod(pkgwritedir, 0o755) |
698 | 698 | ||
699 | cmd = rpmbuild | 699 | cmd = rpmbuild |
700 | cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd | 700 | cmd = cmd + " --noclean --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd |
701 | cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" | 701 | cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" |
702 | cmd = cmd + " --define '_builddir " + d.getVar('S') + "'" | 702 | cmd = cmd + " --define '_builddir " + d.getVar('S') + "'" |
703 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" | 703 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" |
@@ -721,8 +721,11 @@ python do_package_rpm () { | |||
721 | bb.build.exec_func('SBUILDSPEC', d) | 721 | bb.build.exec_func('SBUILDSPEC', d) |
722 | cmd = cmd + " -bb " + outspecfile | 722 | cmd = cmd + " -bb " + outspecfile |
723 | 723 | ||
724 | # rpm 4 creates various empty directories in _topdir, let's clean them up | ||
725 | cleanupcmd = "rm -rf %s/BUILDROOT %s/SOURCES %s/SPECS %s/SRPMS" % (workdir, workdir, workdir, workdir) | ||
726 | |||
724 | # Build the rpm package! | 727 | # Build the rpm package! |
725 | d.setVar('BUILDSPEC', cmd + "\n") | 728 | d.setVar('BUILDSPEC', cmd + "\n" + cleanupcmd + "\n") |
726 | d.setVarFlag('BUILDSPEC', 'func', '1') | 729 | d.setVarFlag('BUILDSPEC', 'func', '1') |
727 | bb.build.exec_func('BUILDSPEC', d) | 730 | bb.build.exec_func('BUILDSPEC', d) |
728 | 731 | ||