From ea37a0bc987aa9484937ad68f762b4657c198617 Mon Sep 17 00:00:00 2001 From: Simon Aittamaa Date: Fri, 29 Jan 2016 09:23:30 +0100 Subject: [PATCH] qtbase: Fix installation of fonts and libraries This patch fixes three problems 1) Running on a case-sensitive system would result in an error due to invalid casing of pattern to install. 2) Using install on symlinks would cause multiple copies of the same file to be installed on the target-system, since install doesn't preserve symlinks. This wastes a lot of space and it causes ldconfig to complain about non-symlinked files. 3) Leakage of user-ids, i.e. cp -a would preserve the uid/gid of whoever built the files, which is usually not what you want. Signed-off-by: Simon Aittamaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3ef592311..62c0ab59a 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -229,10 +229,10 @@ do_install_append() { # install fonts manually if they are missing if [ ! -d ${D}/${OE_QMAKE_PATH_QT_FONTS} ]; then mkdir -p ${D}/${OE_QMAKE_PATH_QT_FONTS} - cp -a ${S}/lib/fonts/* ${D}/${OE_QMAKE_PATH_QT_FONTS} + cp -d ${S}/lib/fonts/* ${D}/${OE_QMAKE_PATH_QT_FONTS} chown -R root:root ${D}/${OE_QMAKE_PATH_QT_FONTS} fi - install -m 0644 ${B}/lib/libqt* ${D}${libdir} + cp -d ${B}/lib/libQt* ${D}${libdir} # Remove example.pro file as it is useless rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro