From 9af5e0ce68c1196bfd2f5b971792e80af79bbe69 Mon Sep 17 00:00:00 2001
From: Chris Dimich <chris.dimich@boundarydevices.com>
Date: Tue, 8 Mar 2022 14:46:51 -0800
Subject: isp-imx: start_isp.sh: fix NR_DEVICE_TREE_BASLER variable

The NR_DEVICE_TREE_BASLER variable has the wrong path.

(cherry picked from commit e7e0d992ec6d8882c8a996a61fb0757f79bfe7f3)
---
 ...001-isp-imx-drop-use-of-__TIME__-__DATE__.patch | 72 ----------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch

(limited to 'recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch')

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 @@
-From ea5ce303fa5bc7b6a17c522b4caf49d349adb12b Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Sat, 30 Oct 2021 17:26:42 +0200
-Subject: [PATCH] isp-imx: drop use of __TIME__, __DATE__
-
-With reproducible build enabled the compiler is configured to throw
-an error if __TIME__, __DATE__ preprocessor macros are used.
-
-| isp-imx-4.2.2.11.0/mediacontrol/daemon/main_v4l2.cpp:99:44: error: macro "__DATE__" might prevent reproducible builds [-Werror=date-time]
-|    99 |              std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
-|       |                                            ^~~~~~~~
-
-Fix this by replacing __DATE__, __TIME__ with BUILD_DATE and setting
-BUILD_DATE from CMakeLists.txt to either SOURCE_DATE_EPOCH if present
-or the local time otherwise.
-
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
----
- mediacontrol/CMakeLists.txt       | 3 +++
- mediacontrol/daemon/main_v4l2.cpp | 8 ++++----
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/mediacontrol/CMakeLists.txt b/mediacontrol/CMakeLists.txt
-index 5849c163e..8a8e1a4a0 100755
---- a/mediacontrol/CMakeLists.txt
-+++ b/mediacontrol/CMakeLists.txt
-@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1.0)
- 
- project(ISP_MEDIA_CONTROL)
- 
-+string(TIMESTAMP BUILD_DATE "%b %d %Y" UTC)
-+add_compile_definitions(BUILD_DATE="${BUILD_DATE}")
-+
- if( NOT DEFINED APPSHELL_TOP_COMPILE)
-     if(DEFINED PLATFORM)
-         if(${PLATFORM} STREQUAL ARM64)
-diff --git a/mediacontrol/daemon/main_v4l2.cpp b/mediacontrol/daemon/main_v4l2.cpp
-index d3d1c2423..dd0514358 100644
---- a/mediacontrol/daemon/main_v4l2.cpp
-+++ b/mediacontrol/daemon/main_v4l2.cpp
-@@ -105,7 +105,7 @@ int main(int argc, char* argv[]) {
-          if(!(string2Version.find(argv[1])==string2Version.end())){
-              std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl;
- #ifndef ANDROID
--             std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
-+             std::cout << "Build Time : "<<BUILD_DATE<<std::endl;
- #endif
-              return 0;
-          }
-@@ -116,8 +116,8 @@ int main(int argc, char* argv[]) {
-     {
-         ALOGI("******************************************************************");
- #ifndef ANDROID
--        ALOGI("VIV ISP Media Control Framework V%s (%s, %s)",
--              MEDIA_SERVER_VERSION, __DATE__, __TIME__);
-+        ALOGI("VIV ISP Media Control Framework V%s (%s)",
-+              MEDIA_SERVER_VERSION, BUILD_DATE);
- #else
-         ALOGI("VIV ISP Media Control Framework V%s", MEDIA_SERVER_VERSION);
- #endif
-@@ -138,7 +138,7 @@ int main(int argc, char* argv[]) {
-                 if(!(string2Version.find(argv[i])==string2Version.end())){
-                     std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl;
- #ifndef ANDROID
--                    std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
-+                    std::cout << "Build Time : "<<BUILD_DATE<<std::endl;
- #endif
-                     i++;
-                     continue;
--- 
-2.20.1
-
-- 
cgit v1.2.3-54-g00ecf