diff options
| author |   Lee Chee Yang <chee.yang.lee@intel.com> | 2020-09-30 18:19:40 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-09-30 11:28:18 -0700 |
| commit | 39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f (patch) | |
| tree | 0e772d2dca501707b4167041ce06b8cd8b92ad9f /meta-oe/recipes-support/tbb | |
| parent | 5dbeb9298ebb0b61b83473fe24ee2e058dbb351b (diff) | |
| download | meta-openembedded-contrib-39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f.tar.gz | |
tbb: improve reproducibility
remove WORKDIR from generated version_string.ver and
use SOURCE_DATE_EPOCH as DATETIME wherever possible to
improve reproducibility
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/tbb')
| -rw-r--r-- | meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/tbb/tbb_2020.3.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch b/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch new file mode 100644 index 0000000000..91d10cb7ab --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch @@ -0,0 +1,30 @@ +From f56eeb18a07df139864a99e1967d450cc5c8c0bb Mon Sep 17 00:00:00 2001 +From: Lee Chee Yang <chee.yang.lee@intel.com> +Date: Wed, 30 Sep 2020 16:18:35 +0800 +Subject: [PATCH] improve reproducibility + +remove the WORKDIR info from BUILD_COMMAND to improve reproducibility. +also use SOURCE_DATE_EPOCH as DATETIME wherever possible. + +Upstream-Status: Inappropriate [sed WORKDIR does not applies to upstream] +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> +--- + build/version_info_linux.sh | 4 +- + 1 file changed, 2 insertion(+), 2 deletion(-) + +diff --git a/build/version_info_linux.sh b/build/version_info_linux.sh +index 793cad11..ed6f4b2a 100644 +--- a/build/version_info_linux.sh ++++ b/build/version_info_linux.sh +@@ -25,6 +25,6 @@ echo '#N": BUILD_GCC'"\t\t"`g++ --version </dev/null 2>&1 | grep 'g++'`'" ENDL \ + echo '#N": BUILD_LIBC'"\t"`getconf GNU_LIBC_VERSION | grep glibc | sed -e 's/^glibc //'`'" ENDL \' + echo '#N": BUILD_LD'"\t\t"`ld -v 2>&1 | grep 'version'`'" ENDL \' + echo '#N": BUILD_TARGET'"\t$arch on $runtime"'" ENDL \' +-echo '#N": BUILD_COMMAND'"\t"$*'" ENDL \' ++echo '#N": BUILD_COMMAND'"\t"$(echo $* | sed 's#'$WORKDIR'#/workdir#g')'" ENDL \' + echo "" +-echo "#define __TBB_DATETIME \""`date -u`"\"" ++echo "#define __TBB_DATETIME \""`$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null || date -u )`"\"" +-- +2.25.1 + diff --git a/meta-oe/recipes-support/tbb/tbb_2020.3.bb b/meta-oe/recipes-support/tbb/tbb_2020.3.bb index e66d23f0b8..8e0094b318 100644 --- a/meta-oe/recipes-support/tbb/tbb_2020.3.bb +++ b/meta-oe/recipes-support/tbb/tbb_2020.3.bb @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ file://GLIBC-PREREQ-is-not-defined-on-musl.patch \ file://tbb.pc \ + file://improve-reproducibility.patch \ " S = "${WORKDIR}/git" |