diff options
author | Simon Aittamaa <simon.aittamaa@gmail.com> | 2016-01-29 09:23:30 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-25 16:19:27 -0300 |
commit | ea37a0bc987aa9484937ad68f762b4657c198617 (patch) | |
tree | 8ac8f342b45e9cc7143a35e9efc009ec5b90b658 | |
parent | 9bfcf79fcd824efb9f2a9bd72ecbedfee1315c96 (diff) |
qtbase: Fix installation of fonts and librariesupstream/jethro
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 <simon.aittamaa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3ef59231..62c0ab59 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 |