diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-openembedded/meta-oe/recipes-support/tbb | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/tbb')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch | 30 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.3.bb (renamed from meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.2.bb) | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch new file mode 100644 index 000000000..91d10cb7a --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-support/tbb/tbb_2020.2.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.3.bb index 2f9fd7f58..8e0094b31 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.3.bb @@ -7,12 +7,13 @@ HOMEPAGE = "https://software.intel.com/en-us/tbb" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" BRANCH = "tbb_2020" -SRCREV = "60b7d0a78f8910976678ba63a19fdaee22c0ef65" +SRCREV = "eca91f16d7490a8abfdee652dadf457ec820cc37" SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ file://cross-compile.patch \ 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" |