diff options
Diffstat (limited to 'recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch')
-rw-r--r-- | recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch deleted file mode 100644 index c3ee088f..00000000 --- a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | From ea5ce303fa5bc7b6a17c522b4caf49d349adb12b Mon Sep 17 00:00:00 2001 | ||
2 | From: Max Krummenacher <max.krummenacher@toradex.com> | ||
3 | Date: Sat, 30 Oct 2021 17:26:42 +0200 | ||
4 | Subject: [PATCH] isp-imx: drop use of __TIME__, __DATE__ | ||
5 | |||
6 | With reproducible build enabled the compiler is configured to throw | ||
7 | an error if __TIME__, __DATE__ preprocessor macros are used. | ||
8 | |||
9 | | isp-imx-4.2.2.11.0/mediacontrol/daemon/main_v4l2.cpp:99:44: error: macro "__DATE__" might prevent reproducible builds [-Werror=date-time] | ||
10 | | 99 | std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl; | ||
11 | | | ^~~~~~~~ | ||
12 | |||
13 | Fix this by replacing __DATE__, __TIME__ with BUILD_DATE and setting | ||
14 | BUILD_DATE from CMakeLists.txt to either SOURCE_DATE_EPOCH if present | ||
15 | or the local time otherwise. | ||
16 | |||
17 | Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> | ||
18 | --- | ||
19 | mediacontrol/CMakeLists.txt | 3 +++ | ||
20 | mediacontrol/daemon/main_v4l2.cpp | 8 ++++---- | ||
21 | 2 files changed, 7 insertions(+), 4 deletions(-) | ||
22 | |||
23 | diff --git a/mediacontrol/CMakeLists.txt b/mediacontrol/CMakeLists.txt | ||
24 | index 5849c163e..8a8e1a4a0 100755 | ||
25 | --- a/mediacontrol/CMakeLists.txt | ||
26 | +++ b/mediacontrol/CMakeLists.txt | ||
27 | @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1.0) | ||
28 | |||
29 | project(ISP_MEDIA_CONTROL) | ||
30 | |||
31 | +string(TIMESTAMP BUILD_DATE "%b %d %Y" UTC) | ||
32 | +add_compile_definitions(BUILD_DATE="${BUILD_DATE}") | ||
33 | + | ||
34 | if( NOT DEFINED APPSHELL_TOP_COMPILE) | ||
35 | if(DEFINED PLATFORM) | ||
36 | if(${PLATFORM} STREQUAL ARM64) | ||
37 | diff --git a/mediacontrol/daemon/main_v4l2.cpp b/mediacontrol/daemon/main_v4l2.cpp | ||
38 | index d3d1c2423..dd0514358 100644 | ||
39 | --- a/mediacontrol/daemon/main_v4l2.cpp | ||
40 | +++ b/mediacontrol/daemon/main_v4l2.cpp | ||
41 | @@ -105,7 +105,7 @@ int main(int argc, char* argv[]) { | ||
42 | if(!(string2Version.find(argv[1])==string2Version.end())){ | ||
43 | std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl; | ||
44 | #ifndef ANDROID | ||
45 | - std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl; | ||
46 | + std::cout << "Build Time : "<<BUILD_DATE<<std::endl; | ||
47 | #endif | ||
48 | return 0; | ||
49 | } | ||
50 | @@ -116,8 +116,8 @@ int main(int argc, char* argv[]) { | ||
51 | { | ||
52 | ALOGI("******************************************************************"); | ||
53 | #ifndef ANDROID | ||
54 | - ALOGI("VIV ISP Media Control Framework V%s (%s, %s)", | ||
55 | - MEDIA_SERVER_VERSION, __DATE__, __TIME__); | ||
56 | + ALOGI("VIV ISP Media Control Framework V%s (%s)", | ||
57 | + MEDIA_SERVER_VERSION, BUILD_DATE); | ||
58 | #else | ||
59 | ALOGI("VIV ISP Media Control Framework V%s", MEDIA_SERVER_VERSION); | ||
60 | #endif | ||
61 | @@ -138,7 +138,7 @@ int main(int argc, char* argv[]) { | ||
62 | if(!(string2Version.find(argv[i])==string2Version.end())){ | ||
63 | std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl; | ||
64 | #ifndef ANDROID | ||
65 | - std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl; | ||
66 | + std::cout << "Build Time : "<<BUILD_DATE<<std::endl; | ||
67 | #endif | ||
68 | i++; | ||
69 | continue; | ||
70 | -- | ||
71 | 2.20.1 | ||
72 | |||