diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-27 10:56:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-03 09:53:48 +0100 |
commit | 2a2d94c5ab32ab4014b4073225d247899451880b (patch) | |
tree | 1341adf5f3a0dccf10c8381aed62209a2e880b83 /meta | |
parent | 5c5a1f05a7bdb4786b9a1fb8ebe972f0fe7f44e4 (diff) | |
download | poky-2a2d94c5ab32ab4014b4073225d247899451880b.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)
(From OE-Core rev: 9c72ddb605f1f4fc98fa427e37b5ba8c8758c6cd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
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 a428d30641..ad5c5e9ef7 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -665,7 +665,7 @@ python do_package_rpm () { | |||
665 | cmd = rpmbuild | 665 | cmd = rpmbuild |
666 | cmd = cmd + " --noclean --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd | 666 | cmd = cmd + " --noclean --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd |
667 | cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" | 667 | cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" |
668 | cmd = cmd + " --define '_builddir " + d.getVar('S') + "'" | 668 | cmd = cmd + " --define '_builddir " + d.getVar('B') + "'" |
669 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" | 669 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" |
670 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" | 670 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" |
671 | cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" | 671 | cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" |