summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_rpm.bbclass9
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 4647116eed..70170d19ef 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -777,16 +777,10 @@ python do_package_rpm () {
777 cmd = cmd + " --define 'debug_package %{nil}'" 777 cmd = cmd + " --define 'debug_package %{nil}'"
778 cmd = cmd + " -bb " + outspecfile 778 cmd = cmd + " -bb " + outspecfile
779 779
780 # Take a shared lock, we can write multiple packages at the same time...
781 # but we need to stop the rootfs/solver from running while we do...
782 lf = bb.utils.lockfile(bb.data.expand("${DEPLOY_DIR_RPM}/rpm.lock", d), True)
783
784 # Build the rpm package! 780 # Build the rpm package!
785 bb.data.setVar('BUILDSPEC', cmd + "\n", d) 781 bb.data.setVar('BUILDSPEC', cmd + "\n", d)
786 bb.data.setVarFlag('BUILDSPEC', 'func', '1', d) 782 bb.data.setVarFlag('BUILDSPEC', 'func', '1', d)
787 bb.build.exec_func('BUILDSPEC', d) 783 bb.build.exec_func('BUILDSPEC', d)
788
789 bb.utils.unlockfile(lf)
790} 784}
791 785
792python () { 786python () {
@@ -803,6 +797,9 @@ SSTATETASKS += "do_package_write_rpm"
803do_package_write_rpm[sstate-name] = "deploy-rpm" 797do_package_write_rpm[sstate-name] = "deploy-rpm"
804do_package_write_rpm[sstate-inputdirs] = "${PKGWRITEDIRRPM}" 798do_package_write_rpm[sstate-inputdirs] = "${PKGWRITEDIRRPM}"
805do_package_write_rpm[sstate-outputdirs] = "${DEPLOY_DIR_RPM}" 799do_package_write_rpm[sstate-outputdirs] = "${DEPLOY_DIR_RPM}"
800# Take a shared lock, we can write multiple packages at the same time...
801# but we need to stop the rootfs/solver from running while we do...
802do_package_write_rpm[sstate-lockfile-shared] += "${DEPLOY_DIR_RPM}/rpm.lock"
806 803
807python do_package_write_rpm_setscene () { 804python do_package_write_rpm_setscene () {
808 sstate_setscene(d) 805 sstate_setscene(d)