]> code.ossystems Code Review - openembedded-core.git/commitdiff
image: Set COREBASE as the git directory for timestamp
authorAlex Kiernan <alex.kiernan@gmail.com>
Tue, 26 Jun 2018 12:08:55 +0000 (12:08 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 28 Jun 2018 08:22:30 +0000 (09:22 +0100)
When REPRODUCIBLE_TIMESTAMP_ROOTFS is unset and we want to parse one
from git, use COREBASE as the base for the git command so we have a
known repository which we're using. Without this the build may fail
if the current directory is not part of a git repository.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/image.bbclass

index 8ef06c0fb08409450f761cafa04d18ad170dd4d2..2e880242d797dba1634ccb633a3c6eefb8ff5ba8 100644 (file)
@@ -651,7 +651,7 @@ POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usr
 reproducible_final_image_task () {
     if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
         if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
-            REPRODUCIBLE_TIMESTAMP_ROOTFS=`git log -1 --pretty=%ct`
+            REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct`
         fi
         # Set mtime of all files to a reproducible value
         bbnote "reproducible_final_image_task: mtime set to $REPRODUCIBLE_TIMESTAMP_ROOTFS"