From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Tue, 26 Jun 2018 12:08:55 +0000 (+0000)
Subject: image: Set COREBASE as the git directory for timestamp
X-Git-Tag: uninative-2.2~261
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1c2197f96d69547e10b74dc722d9a569d9a2b2b6;p=openembedded-core.git

image: Set COREBASE as the git directory for timestamp

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>
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8ef06c0fb0..2e880242d7 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -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"