diff options
author | Dennis Menschel <menschel-d@posteo.de> | 2018-04-15 09:44:33 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-18 11:34:21 +0000 |
commit | d9001fc53d340544356b2bfb5c7c5f3c7f831319 (patch) | |
tree | 914d827e9ad9e84417cbe9d2f70e18020cca90dc | |
parent | 8124b3c768f8e539d6cbe670d6caca132415f435 (diff) | |
download | meta-qt5-d9001fc53d340544356b2bfb5c7c5f3c7f831319.tar.gz |
qtbase: fix umask for do_generate_qt_environment_file
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>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index efcb82c3..87da66e4 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -209,6 +209,7 @@ fakeroot do_generate_qt_environment_file() { | |||
209 | sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script | 209 | sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script |
210 | } | 210 | } |
211 | 211 | ||
212 | do_generate_qt_environment_file[umask] = "022" | ||
212 | addtask generate_qt_environment_file after do_install before do_package | 213 | addtask generate_qt_environment_file after do_install before do_package |
213 | 214 | ||
214 | SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" | 215 | SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" |