package/opencv3: fix OPENCV3_CLEAN_INSTALL_{DOC, CMAKE}
PATCH 1/1 package/opencv3: fix OPENCV3_CLEAN_INSTALL_{DOC, CMAKE}
opencv3 does not install anything in $(TARGET_DIR)/usr/share/OpenCV/doc so drop OPENCV3_CLEAN_INSTALL_DOC
However it installs its licence files in
$(TARGET_DIR)/usr/share/licenses/opencv3 so addOPENCV3_CLEAN_INSTALL_LICENSE
Moreover, the cmake hook does not catch all cmake files and missed the
valgrind files so update OPENCV3_CLEAN_INSTALL_CMAKE and addOPENCV3_CLEAN_INSTALL_VALGRIND to delete those files:
OpenCVConfig.cmake OpenCVConfig-version.cmake OpenCVModules.cmake OpenCVModules-release.cmake valgrind_3rdparty.supp valgrind.supp
--- package/opencv3/opencv3.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
package/opencv3/opencv3.mk +9 -4
@@ -345,16 +345,21 @@ OPENCV3_CONF_OPTS += \ endif # Installation hooks: -define OPENCV3_CLEAN_INSTALL_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc +define OPENCV3_CLEAN_INSTALL_LICENSE + $(RM) -fr $(TARGET_DIR)/usr/share/licenses/opencv3 endef -OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_DOC +OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_LICENSE define OPENCV3_CLEAN_INSTALL_CMAKE - $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake + $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCV*.cmake endef OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_CMAKE +define OPENCV3_CLEAN_INSTALL_VALGRIND + $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/valgrind* +endef +OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_VALGRIND + ifneq ($(BR2_PACKAGE_OPENCV3_INSTALL_DATA),y) define OPENCV3_CLEAN_INSTALL_DATA $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/haarcascades \
Signature · 1 line
2.28.0
Thomas Petazzoni
AppliedPATCH 1/1 package/opencv3: fix OPENCV3_CLEAN_INSTALL_{DOC, CMAKE}
Quoted 12 lines · On Sun, 1 Nov 2020 12:12:44 +0100 Fabrice Fontaine…
opencv3 does not install anything in $(TARGET_DIR)/usr/share/OpenCV/doc so drop
OPENCV3_CLEAN_INSTALL_DOCHowever it installs its licence files in
$(TARGET_DIR)/usr/share/licenses/opencv3 so addOPENCV3_CLEAN_INSTALL_LICENSEMoreover, the cmake hook does not catch all cmake files and missed the
valgrind files so updateOPENCV3_CLEAN_INSTALL_CMAKEand addOPENCV3_CLEAN_INSTALL_VALGRINDto delete those files:
OpenCVConfig.cmake OpenCVConfig-version.cmake OpenCVModules.cmake OpenCVModules-release.cmake valgrind_3rdparty.supp valgrind.supp
Quoted 4 lines
Signed-off-by Fabrice Fontaine <[email protected]>--- package/opencv3/opencv3.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/opencv3: fix OPENCV3_CLEAN_INSTALL_{DOC, CMAKE}
In reply to Fabrice FontaineQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
opencv3 does not install anything in $(TARGET_DIR)/usr/share/OpenCV/doc so drop
OPENCV3_CLEAN_INSTALL_DOCHowever it installs its licence files in
$(TARGET_DIR)/usr/share/licenses/opencv3 so addOPENCV3_CLEAN_INSTALL_LICENSE
Quoted 6 lines
Moreover, the cmake hook does not catch all cmake files and missed the
valgrind files so updateOPENCV3_CLEAN_INSTALL_CMAKEand addOPENCV3_CLEAN_INSTALL_VALGRINDto delete those files:
OpenCVConfig.cmake OpenCVConfig-version.cmake OpenCVModules.cmake OpenCVModules-release.cmake valgrind_3rdparty.supp valgrind.suppSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard