[oe-commits] [openembedded-core] 23/28: Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple"

[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 dcd1fbe153369634c73370cbe22e1dbdac080146
Author: Peter Kjellerstedt <pkj at axis.com>
AuthorDate: Sun Feb 9 07:06:58 2020 +0100

    Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple"
    
    This reverts commit 8380df6566db49ef184b837432558750f77f592f.
    
    Giving BUILDNAME a static default in reproducible_build_simple.bbclass
    to have /etc/version be generated with that name lead to other users
    of BUILDNAME no longer working as expected. E.g., buildstats.bcclass
    would now write its information in a single directory, overwriting the
    statistics for each build.
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/reproducible_build_simple.bbclass | 1 -
 meta/classes/rootfs-postcommands.bbclass       | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass
index 3e5fd82..3933729 100644
--- a/meta/classes/reproducible_build_simple.bbclass
+++ b/meta/classes/reproducible_build_simple.bbclass
@@ -7,4 +7,3 @@ export PERL_HASH_SEED = "0"
 export SOURCE_DATE_EPOCH ??= "1520598896"
 
 REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896"
-BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}"
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index e400974..2f17183 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -356,6 +356,11 @@ python rootfs_log_check_recommends() {
 # Perform any additional adjustments needed to make rootf binary reproducible
 rootfs_reproducible () {
 	if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" != "" ]; then
+		# Convert UTC into %4Y%2m%2d%2H%2M%2S
+		sformatted=`date -u -d @${REPRODUCIBLE_TIMESTAMP_ROOTFS} +%4Y%2m%2d%2H%2M%2S`
+		echo $sformatted > ${IMAGE_ROOTFS}/etc/version
+		bbnote "rootfs_reproducible: set /etc/version to $sformatted"
+
 		if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then
 			find ${IMAGE_ROOTFS}${sysconfdir}/gconf -name '%gconf.xml' -print0 | xargs -0r \
 			sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g'

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