[oe-commits] [openembedded-core] 24/34: classes/reproducible_build: Move SDE deploy to another directory

[git at git.openembedded.org]

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

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

commit ac27d12fe5480e9b8cc93de6a32bf9631c52d7f4
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Thu Sep 26 12:57:51 2019 -0500

    classes/reproducible_build: Move SDE deploy to another directory
    
    The deployment of the source date epoch file had a race condition where
    any task attempting to read from the file would race with creation of
    the sstate archive for the do_deploy_source_date_epoch task. The
    creation of the sstate archive requires moving the directory to a
    temporary location, then moving it back. This means that the file
    disappears for a short period of time, which will cause a failure if any
    other task is running and trying to open the file to get the current
    source date epoch.
    
    The solution is to copy the source date epoch file to a separate
    directory when deploying so the file never disappears. When the file is
    restored from sstate, it is moved to the correct location after being
    extracted.
    
    [YOCTO #13501]
    
    Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/reproducible_build.bbclass | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass
index 8788ad7..99b749a 100644
--- a/meta/classes/reproducible_build.bbclass
+++ b/meta/classes/reproducible_build.bbclass
@@ -39,19 +39,27 @@ inherit ${@oe.utils.ifelse(d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1', 'repr
 
 SDE_DIR ="${WORKDIR}/source-date-epoch"
 SDE_FILE = "${SDE_DIR}/__source_date_epoch.txt"
+SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch"
 
 SSTATETASKS += "do_deploy_source_date_epoch"
 
 do_deploy_source_date_epoch () {
     echo "Deploying SDE to ${SDE_DIR}."
+    mkdir -p ${SDE_DEPLOYDIR}
+    if [ -e ${SDE_FILE} ]; then
+        cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt
+    fi
 }
 
 python do_deploy_source_date_epoch_setscene () {
     sstate_setscene(d)
+    sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt')
+    if os.path.exists(sde_file):
+        os.rename(sde_file, d.getVar('SDE_FILE'))
 }
 
-do_deploy_source_date_epoch[dirs] = "${SDE_DIR}"
-do_deploy_source_date_epoch[sstate-plaindirs] = "${SDE_DIR}"
+do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}"
+do_deploy_source_date_epoch[sstate-plaindirs] = "${SDE_DEPLOYDIR}"
 addtask do_deploy_source_date_epoch_setscene
 addtask do_deploy_source_date_epoch before do_configure after do_patch
 

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