[oe-commits] [openembedded-core] 10/10: package_rpm: set _builddir to B not S

git at git.openembedded.org git at git.openembedded.org
Thu Mar 29 23:32:14 UTC 2018


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit d6c13a5ff441f7076eb327c0d0b747bd7603db0f
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Mar 27 10:56:06 2018 +0100

    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]
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package_rpm.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index af64ef6..21ada34 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -670,7 +670,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'"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list