From 1be55c59e37674b90b7192bdff4c5fd8310eae74f1d2e68c01a888250ed58e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 24 Aug 2018 08:20:04 +0000 Subject: [PATCH] Accepting request 631209 from home:bmwiedemann:branches:devel:libraries:c_c++ Extend reproducible.patch to not capture build kernel version (boo#1101107). Also filed upstream https://github.com/01org/tbb/pull/82 OBS-URL: https://build.opensuse.org/request/show/631209 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tbb?expand=0&rev=47 --- reproducible.patch | 19 ++++++++++++++++--- tbb.changes | 5 +++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/reproducible.patch b/reproducible.patch index 4c7e2e6..ec11b56 100644 --- a/reproducible.patch +++ b/reproducible.patch @@ -1,7 +1,7 @@ -Index: tbb-2018/build/version_info_linux.sh +Index: tbb-2018_U2/build/version_info_linux.sh =================================================================== ---- tbb-2018.orig/build/version_info_linux.sh -+++ tbb-2018/build/version_info_linux.sh +--- tbb-2018_U2.orig/build/version_info_linux.sh ++++ tbb-2018_U2/build/version_info_linux.sh @@ -20,10 +20,10 @@ # Script used to generate version info string @@ -21,3 +21,16 @@ Index: tbb-2018/build/version_info_linux.sh echo "" -echo "#define __TBB_DATETIME \""`date -u`"\"" +echo "#define __TBB_DATETIME \""`date -u -r $(dirname $0)/../CHANGES`"\"" +Index: tbb-2018_U2/build/linux.inc +=================================================================== +--- tbb-2018_U2.orig/build/linux.inc ++++ tbb-2018_U2/build/linux.inc +@@ -61,7 +61,7 @@ endif + ifndef runtime + export gcc_version:=$(shell gcc -dumpversion) + os_version:=$(shell uname -r) +- os_kernel_version:=$(shell uname -r | sed -e 's/-.*$$//') ++ os_kernel_version:=4.0 + export os_glibc_version_full:=$(shell getconf GNU_LIBC_VERSION | grep glibc | sed -e 's/^glibc //') + os_glibc_version:=$(shell echo "$(os_glibc_version_full)" | sed -e '2,$$d' -e 's/-.*$$//') + export runtime:=cc$(gcc_version)_libc$(os_glibc_version)_kernel$(os_kernel_version) diff --git a/tbb.changes b/tbb.changes index 8633372..6d23a59 100644 --- a/tbb.changes +++ b/tbb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 24 04:10:21 UTC 2018 - bwiedemann@suse.com + +- Extend reproducible.patch to not capture build kernel version (boo#1101107) + ------------------------------------------------------------------- Wed Aug 1 04:32:27 UTC 2018 - bwiedemann@suse.com