From 9af5e0ce68c1196bfd2f5b971792e80af79bbe69 Mon Sep 17 00:00:00 2001 From: Chris Dimich 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 ---------------------- ...isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch | 41 +++--------- 2 files changed, 8 insertions(+), 105 deletions(-) delete mode 100644 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 -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__< ---- - 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 : "< -Date: Mon, 13 Sep 2021 17:56:02 -0700 +From a48c605b9f3860ee7abaca1a37add444a1b4001a Mon Sep 17 00:00:00 2001 +From: Chris Dimich +Date: Tue, 8 Mar 2022 14:45:28 -0800 Subject: [PATCH 1/1] start_isp.sh: fix NR_DEVICE_TREE_BASLER variable -Also remove uneeded -lm option from run.sh script. +The NR_DEVICE_TREE_BASLER variable has the wrong path. -Signed-off-by: Chris Dimich +Signed-off-by: Chris Dimich --- - imx/start_isp.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + imx/start_isp.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imx/start_isp.sh b/imx/start_isp.sh -index 6daabc59c..250226935 100755 +index 6daabc59c..8a07acfed 100755 --- a/imx/start_isp.sh +++ b/imx/start_isp.sh @@ -7,7 +7,7 @@ @@ -23,31 +23,6 @@ index 6daabc59c..250226935 100755 NR_DEVICE_TREE_OV5640=$(grep ov5640 /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) # check if the basler device has been enabled in the device tree -@@ -21,13 +21,13 @@ if [ $NR_DEVICE_TREE_BASLER -eq 1 ]; then - - # Default configuration for Basler daA3840-30mc: basler_4k - # Available configurations: basler_4k, basler_1080p60, basler_4khdr, basler_1080p60hdr -- exec ./run.sh -c basler_4k -lm -+ exec ./run.sh -c basler_4k - - elif [ $NR_DEVICE_TREE_OV5640 -eq 1 ]; then - - # Default configuration for Basler daA3840-30mc: basler_1080p60 - # Available configurations: basler_1080p60, basler_1080p60hdr -- exec ./run.sh -c basler_1080p60 -lm -+ exec ./run.sh -c basler_1080p60 - - fi - -@@ -38,7 +38,7 @@ elif [ $NR_DEVICE_TREE_BASLER -eq 2 ]; then - cd $RUNTIME_DIR - # Default configuration for Basler daA3840-30mc: dual_basler_1080p60 - # Available configurations: dual_basler_1080p60, dual_basler_1080p60hdr, dual_basler_1080p25hdr -- exec ./run.sh -c dual_basler_1080p60 -lm -+ exec ./run.sh -c dual_basler_1080p60 - - else - # no device tree found exit with code no device or address -- 2.31.1 -- cgit v1.2.3-54-g00ecf