diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-27 10:56:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-30 00:31:18 +0100 |
commit | 080a2138db88193b11d006d202eace23e2a1417f (patch) | |
tree | d4a08c180875b4b2d7c6a3b2828f46bb24b3c2e4 /meta | |
parent | 6b96d9ff7388087b70cdcd3f1fc566affc1de86c (diff) | |
download | poky-080a2138db88193b11d006d202eace23e2a1417f.tar.gz |
package_rpm: set _builddir to B not S
Recipes which use a shared workdir (e.g. gcc-runtine and libgcc) can
race over temporary files causing interesting build failures.
Using B instead of S avoids this problem.
[YOCTO #12605]
(From OE-Core rev: d6c13a5ff441f7076eb327c0d0b747bd7603db0f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index af64ef62c5..21ada348aa 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -670,7 +670,7 @@ python do_package_rpm () { | |||
670 | cmd = rpmbuild | 670 | cmd = rpmbuild |
671 | cmd = cmd + " --noclean --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd | 671 | cmd = cmd + " --noclean --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd |
672 | cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" | 672 | cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" |
673 | cmd = cmd + " --define '_builddir " + d.getVar('S') + "'" | 673 | cmd = cmd + " --define '_builddir " + d.getVar('B') + "'" |
674 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" | 674 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" |
675 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" | 675 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" |
676 | cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" | 676 | cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" |