t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-06-21 08:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: fix umask for do_generate_qt_environment_file

Browse Source 
The custom task "do_generate_qt_environment_file" generates the
directory "environment-setup.d" with permission 775 instead of 755.
When other recipes populate the same directory with different
permissions, a package manager like RPM will report this as an error.

The solution is to either set the installation permissions explicitly
with "install -d [-m 755]", or specify the umask for the custom task.

This commit uses the latter approach and fixes errors like the following
when trying to generate an SDK:

  $ bitbake <image-with-qt5> -c populate_sdk
  [...]
  Error: Transaction check error:
    file /opt/poky/2.4.2/sysroots/x86_64-pokysdk-linux/environment-setup.d
    conflicts between attempted installs of
    nativesdk-cmake-3.8.2-r0.x86_64_nativesdk and
    nativesdk-qtbase-tools-5.9.4+git0+0d9208cecb-r0.x86_64_nativesdk

A detailed discussion about this problem can also be found here [1].

[1] https://stackoverflow.com/a/49003464

Signed-off-by: Dennis Menschel <menschel-d@posteo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Dennis Menschel
2018-04-15 09:44:33 +02:00
committed by Martin Jansa
parent 8124b3c768
commit d9001fc53d
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
recipes-qt/qt5/nativesdk-qtbase_git.bb
View File

@@ -209,6 +209,7 @@ fakeroot do_generate_qt_environment_file() {
sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script
}
do_generate_qt_environment_file[umask] = "022"
addtask generate_qt_environment_file after do_install before do_package
SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e"