Skip to content

Commit

Permalink
qtbase: Fix installation of fonts and libraries
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
simait authored and otavio committed Apr 25, 2016
1 parent 9bfcf79 commit ea37a0b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions recipes-qt/qt5/qtbase_git.bb
Expand Up @@ -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

Expand Down

0 comments on commit ea37a0b

Please sign in to comment.