diff options
| author |   Alex Kiernan <alex.kiernan@gmail.com> | 2020-01-18 05:41:07 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-19 23:49:15 +0000 |
| commit | bbf28ea9100a4f86b052c5cd53c77f9e1c03fb09 (patch) | |
| tree | 7e3d53f656c3e3570a96a0e49b2571ab0a3a2655 /meta/classes | |
| parent | bfffb32611c6d61286171af7f4b1b2edb227f186 (diff) | |
| download | openembedded-core-contrib-bbf28ea9100a4f86b052c5cd53c77f9e1c03fb09.tar.gz | |
rootfs: Make BUILDNAME a weak default in reproducible_build_simple
11e45082ad00 ("rootfs-postcommands.bbclass: improve binary
reproducibility") fixed binary reproducibility of /etc/version, but with
the move to reproducibilty in all builds, setting /etc/version to
anything other than the default fixed timestamp is tricky because
rootfs_reproducible() runs very late.
rootfs.py uses BUILDNAME if set for /etc/version, so introduce a weak
default for BUILDNAME of "REPRODUCIBLE_TIMESTAMP_ROOTFS", when enabling
reproducible builds hence allowing BUILDNAME to be overridden elsewhere.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/reproducible_build_simple.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass index d0842f0f90..153a076072 100644 --- a/meta/classes/reproducible_build_simple.bbclass +++ b/meta/classes/reproducible_build_simple.bbclass @@ -7,5 +7,6 @@ export PERL_HASH_SEED = "0" export SOURCE_DATE_EPOCH ??= "1520598896" REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" +BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" inherit podfix diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2f171836fa..e40097444d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -356,11 +356,6 @@ 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' |