Make tuningext a packageconfig as it no longer builds with latest
master (walnascar):
isp-imx contains the 3rd party cpp-netlib package. Compiling that
package against boost 1.87 results in build errors.
boost 1.87 is provided with latest master (walnascar).
Compare also with meta-oe commit a46de2745b30 ("cpp-netlib:
Skip recipe, not buildable with boost >= 1.87")
Drop patch. Fix now present in package sources.
Add jsoncpp to DEPENDS as the package no longer compiles its own
version thereoff and dynamically links against the OE provided one.
Sync CMake options with upstream recipe.
The binary blobs provided now link against libtinyxml2.so.10.
Drop the fix.
The binary blobs provided still link against libjsoncpp.so.25, but OE
provides libjsoncpp.so.26. Fixup the binaries.
The package now provides a Makefile with a install task. Use that.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
The basler-camera recipe/package provides the files for basler
cameras. Do not install them with the isp-imx package.
Prevents:
| * check_data_file_clashes: Package libdaa3840-30mc1 wants to install file .../rootfs/opt/imx8-isp/bin/dewarp_config/daA3840_30mc_1080P.json
| But that file is already provided by package * isp-imx
| ...
Fixes: 9f9b707 ("isp-imx: update to 4.2.2.24.0 used with lf-6.1.55-2.2.0")
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
The files provided by isp-imx are no longer part of the sources.
Drop the fixup to remove them.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Set CMake variable so that tinyxml2 can be found. Prevents:
| make[2]: *** No rule to make target '...isp-imx/4.2.2.24.0/recipe-sysrootlib/libtinyxml2.so', needed by 'generated/release/bin/tuningext'. Stop.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Latest master meta-oe updated tinyxml2 to version 10.0.0.
isp-imx packages a prebuilt library dynamically linked against
tinyxml2.so.9 which is no longer provided, thus:
| ERROR: isp-imx-4.2.2.22.0-r0 do_package_qa: QA Issue: /usr/lib/libcam_device.so contained in package isp-imx requires libtinyxml2.so.9()(64bit), but no providers found in RDEPENDS:isp-imx? [file-rdeps]
Fix the build by updating the dynamic section to require tinyxml2.so.10.
Note that I don't have a system to runtime test if that still works.
The tinyxml API doesn't look like it changed from 9 to 10.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
The binary blob providing basler-camera files now (4.2.2.21) contains
configuration files for the Omnivion OS08A20 as used on NXP's
camera module [1].
Those files have been and still are provided by isp-imx. The content is
identical.
Delete them to prevent the following error during do_rootfs if the
basler-camera package is installed into a image:
| * check_data_file_clashes: Package libdaa3840-30mc1 wants to install file
| .../rootfs/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_1080P_config.json
| But that file is already provided by package * isp-imx
| * check_data_file_clashes: Package libdaa3840-30mc1 wants to install file
| .../rootfs/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_4K_config.json
| But that file is already provided by package * isp-imx
[1] https://www.nxp.com/part/IMX-OS08A20#/
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
- NXP decided to change the binaries without updating the version [1]
- Here is NXP changelog:
[LF-8298] Fix intermittent build break "Error copying file ...
isi_common.h".
[1] https://github.com/nxp-imx/meta-imx/commit/43c0642e
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
Update to the version used in lf5.15.52_2.1.0.
License was updated to NXP EULA v39 August 2022.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
As the recipe installs the file 'by hand' rather than using `make install`
make sure that the binaries get their final RPATH set during do_compile
rather than relying on the CMake produced RPATH magic in `make install`.
| WARNING: isp-imx-4.2.2.19.0-r0 do_package_qa: QA Issue: File /usr/lib/libmedia_server.so in package isp-imx contains reference to TMPDIR
| File /opt/imx8-isp/bin/isp_media_server in package isp-imx contains reference to TMPDIR [buildpaths]
With this the 'INSANE_SKIP:${PN} = "rpaths"' is also no longer
needed as the following error is also gone:
| ERROR: isp-imx-4.2.2.19.0-r0 do_package_qa: QA Issue: package isp-imx contains bad RPATH $ORIGIN:/.../isp-imx-4.2.2.19.0/dewarp/proprietories/hal/lib: in file .../packages-split/isp-imx/usr/lib/libmedia_server.so
| package isp-imx contains bad RPATH $ORIGIN/.../isp-imx-4.2.2.19.0/dewarp/proprietories/hal/lib in file .../packages-split/isp-imx/opt/imx8-isp/bin/isp_media_server [rpaths]
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Update to the version used in lf5.15.52_2.1.0.
License was updated to NXP EULA v39 August 2022.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Includes a missing runtime dependency on isp-imx.
Fixes:
724d343 MA-19817 On Android, align isp-4.2.2p16 with Linux
9445d63 Update Release from Basler p18 v5.1.0 based on VSI p18
999478f Update Release from Basler P17 v5.0.2 based on VSI P17 temp
e3dc9c5 modify the README.TXT
9f29687 Update Release from Basler P17 temp based on VSI P17 temp
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
- Drop the dependency on Python
- Incorporate the patch 0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch (ca1cc9966)
- Update to libtinyxml2 9
Fixes:
ca1cc9966 LF-6283: Fix isp startup is incorrect for third-party boards
f20917e56 LF-6262-2: Delete nodes in os08a20 4k xml files that lead android crash
44e4e5486 LF-6262-1: Fix the os08a20 4k work abnormally
dfa4b6671 LF-5970: Add the support for sensor os08a20 in the i.mx865
b92bd279e LF-6200: isp: remove isp-imx includes 4 GPL files
5501b5a2e remove the mode 4 for basler camera
b07f11f7c M865SW-978: media-server stop need sync
3fb6a58ff New partial build partial_release_20220408_4.2.2_p18
197077ee7 Update Release P18 from Verisilicon
e116968e3 update the build script to include OS08A20 things
ea5f3e9a3 update calibration XML file for OS08A20
0f8e04791 remove drm_test and isp_tpg_test from the isp build
a7740c028 update the xml file name as basler updates
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
The source and build directories are usually ${WORKDIR}/build and
${WORKDIR}/${BP} but not always. For example when using devtool they are
different, leading to install failures such as:
cp: cannot stat '.../tmp/work/.../isp-imx/4.2.2.16.0-r0/build/generated/release/bin/*_test': No such file or directory
Fix by using the S and B variables which always point to the correct
directory.
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
When ld-is-gold is defined as a DISTRO_FEATURE, the gold linker is used
by default, which causes the following do_compile errors to arise:
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_buffer_interface'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_surface_interface'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_seat_interface'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_output_interface'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_proxy_marshal'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_proxy_add_listener'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_proxy_destroy'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_display_flush'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_display_disconnect'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_proxy_marshal_constructor_versioned'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_compositor_interface'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_display_dispatch'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_proxy_marshal_constructor'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_display_roundtrip'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_display_connect'
| ../../generated/release/lib/libvvdisplay_shared.so: error: undefined
reference to 'wl_registry_interface'
so use bfd linker instead.
Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com>
Essentially, we extend the overrides to a generic-bsp, nxp-bsp, and
mainline-bsp.
So, for example, the mx8mq override is split into:
- imx-generic-bsp: compatible with every i.MX SoC and both BSP variants
- imx-nxp-bsp: compatible with every i.MX SoC but specific to NXP BSP
- imx-mainline-bsp: compatible with every i.MX SoC but specific to Mainline BSP
- mx8-generic-bsp: compatible with every i.MX8 SoC and both BSP variants
- mx8-nxp-bsp: compatible with every i.MX8 SoC but specific to NXP BSP
- mx8-mainline-bsp: compatible with every i.MX8 SoC but specific to Mainline BSP
- mx8m-generic-bsp: compatible with every i.MX8M SoC and both BSP variants
- mx8m-nxp-bsp: compatible with every i.MX8M SoC but specific to NXP BSP
- mx8m-mainline-bsp: compatible with every i.MX8M SoC but specific to Mainline BSP
- mx8mq-generic-bsp: compatible with every i.MX8MQ SoC and both BSP variants
- mx8mq-nxp-bsp: compatible with every i.MX8MQ SoC8 but specific to NXP BSP
- mx8mq-mainline-bsp: compatible with every i.MX8MQ SoC but specific to Mainline BSP
The extender mechanism is responsible for extending the override list to
include the generic overrides. We can then use the three different
variants to handle the metadata correctly.
Generically speaking, the conversion mainly was automated (with a lot of
back and forth until getting it right).
To convert an existing layer, the following script can be used:
```sh
git ls-files classes recipes-* \
| xargs sed -i \
-e 's,:\(mx[6-8]\w*\),:\1-nxp-bsp,g' \
-e 's,(\(mx[6-8]\w*\)),(\1-nxp-bsp),g' \
-e 's,\(mx[6-8]\w*\)|,\1-nxp-bsp|,g' \
-e 's,|\(mx[6-8]\w*\)),|\1-nxp-bsp),g' \
\
-e 's,:\(mx[5s]\w*\),:\1-generic-bsp,g' \
-e 's,(\(mx[5s]\w*\)),(\1-generic-bsp),g' \
-e 's,\(mx[5s]\w*\)|,\1-generic-bsp|,g' \
-e 's,|\(mx[5s]\w*\)),|\1-generic-bsp),g' \
\
-e 's,:\(vf\w*\),:\1-generic-bsp,g' \
-e 's,:\(vf[56]0\w*\),:\1-generic-bsp,g' \
-e 's,\(vf\w*\)|,\1-generic-bsp|,g' \
-e 's,|\(vf\w*\)),|\1-generic-bsp),g' \
-e 's,\(vf[56]0\w*\)|,\1-generic-bsp|,g' \
-e 's,|\(vf[56]0\w*\)),|\1-generic-bsp),g' \
\
-e 's,:\(imx\) ,:\1-nxp-bsp ,g' \
-e 's,(\(imx\)),(\1-nxp-bsp),g' \
-e 's,\(imx\)|,\1-nxp-bsp|,g' \
-e 's,|\(imx\)),|\1-nxp-bsp),g'
for d in $(find -type d | egrep '/mx[6-8]w*'); do
git mv $d $d-nxp-bsp
done
for d in $(find -type d | egrep '/imx$'); do
git mv $d $d-nxp-bsp
done
for d in $(find -type d | egrep '/mx[5s]w*'); do
git mv $d $d-generic-bsp
done
```
Fixes: #791.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
The files from dewarp/ are now provided from recipe basler-camera_4.2.2.15.0.
Fixes the following doing do_rootfs:
| * check_data_file_clashes: Package isp-imx wants to install file ...rootfs/opt/imx8-isp/bin/dewarp_config/sensor_dwe_1080P_config.json
| But that file is already provided by package * libdaa3840-30mc1
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
isp-imx has precompiled binaries linked against that libtinyxml2 version.
Remove files which are also provided by the 'current' recipe version
of libtinyxml so that they don't clash during image/SDK creation.
Since the isp-imx does do a link step against libtinyxml2 create the
the unversioned symlink libtinyxml2.so in do_compile.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Upgrade both isp-imx and basler-camera packages to revision 4.2.2.15.0,
which is included in NXP release 5.10.52-2.1.0.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
a52c0446d change version number to p13
800e0f8d8 Fix M865SW-753:copy sensor init txt just for native
a4210be47 remove unused VVCAM_PARAMS
ad8728441 add dual basler camera mode 4 for 1080p25hdr
eea1908b8 cleanup the build script
da5bd492b remove vvnative which is only for local test
c725c6266 Revert "cleanup for unused config file"
a399dbd70 cleanup for unused config file
1bd986e2d Remove basler binary driver from source build
98ef8c98a New partial build partial_release_20210430_4.2.2_p12
31d26c84d Update Release P12 from Verisilicon
c82e5b9bb limit basler camera resolution to 1080p when ov5640 is also used
8c9825a6d add a trailing '/' for file search in directory
f101a6a64 Update Release form Verisilicon
fbfe4fda0 add a blank line for good readability
91663d97c enlarge the StartLimitBurst
0c3dc6a6e add explanatory to the tunning example for video_test
365e7f8f5 BSLRM865-124: improve the running example for video_test
253818b3f Segment error caused by DTS modification
a8a906d4d M865SW-703 Use reversed memory only for tuning tool
7c40835b2 Remove basler binary driver from source build
9bf7ff1ba BSLRM865-131 fix crop seems scale
aee50d3d0 imx8-isp.service: do not prevent restart of service
3232149ac run.sh: fix bashism
5fbf584d2 Removing action for copying run-imx.sh as it's gone
860346a5d Update Release form Verisilicon
f5b3c8783 MLK-25354 add user description for dual basler cameras
85ab6c183 update run script to work with P10/P11
19fb6591b update run script to same as P6
daba60f02 update Release form Verisilicon
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
With reproducible build enabled the compiler is configured to throw
an error if __TIME__, __DATE__ preprocessor macros are used,
replace them.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Rework the packaging section of the recipe, reducing the packaging
overrides to a minimum to handle a) installation to /opt, and b) the
mix of versioned and unversioned libraries.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
The source folder of the recipe is adjusted to the appshell sub-folder
to facilitate building of that folder. This causes complicated adjustments
for the license and patch files.
Restore the source folder to the default and use OECMAKE_SOURCEPATH to direct the
build to the appshell sub-folder.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Drop upstreamed patches:
- 0001-BufferManager.h-add-missing-header-file.patch
- 0001-imx8-isp.service-do-not-prevent-restart-of-service.patch
- 0001-run.sh-fix-bashism.patch
Rework patch 0001-start_isp.sh-fix-test-to-be-generic.patch. Let the
startup use the default device tree-based implementation as-is, and
failing that, try the generic dmesg-based implementation.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
