]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_rpm: set _builddir to B not S
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 27 Mar 2018 09:56:06 +0000 (10:56 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 3 May 2018 08:52:09 +0000 (09:52 +0100)
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/classes/package_rpm.bbclass

index a428d306411bcd138a487ddcc43cd24a3ab7fdb4..ad5c5e9ef7ea12530bebc8f740525602957973cf 100644 (file)
@@ -665,7 +665,7 @@ python do_package_rpm () {
     cmd = rpmbuild
     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 '_builddir " + d.getVar('B') + "'"
     cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
     cmd = cmd + " --define '_use_internal_dependency_generator 0'"
     cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'"