qtbase: fix Krogoth build regression from efa8aaf
PATCH 1/1 qtbase: fix Krogoth build regression from efa8aaf
From: Matt Hoosier <[email protected]>
With
commit efa8aaf82e580a7d32eaaab48eb92d436f2e222a
Author: Andreas Müller <[email protected]>
Date: Thu Feb 9 00:26:09 2017
qmake5_base.bbclass: set qt.conf by environment variable again
we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and instead directed it to a path which was intended not to exist.
The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase to build again after Qt 5.8 started paying attention to the contents of this file.
The change as done in efa8aaf works well enough for Morty and subsequent releases' copies of Bitbake, but fails on earlier releases because they lack the following change:
commit 2afcbfef2cd1ca568e5225884a8021df38ee3db0
Author: Ross Burton <[email protected]>
Date: 2016-07-14 13:56:22
bitbake: build: don't use $B as the default cwd for functions
The result is that when we build with Krogoth or prior, the body of do_generate_qt_config_file() runs with a cwd of ${B}, which was _not_ the intent of efa8aaf. Because the working directory is ${B}, ${OE_QMAKE_QTCONF_PATH} is written in there too. do_configure() -- whose cwd is by design also ${B} -- then finds the file 'foodummy', and the build breaks for the reasons outlined in efa8aaf.
This change simply shifts the implementation tactics to suppress the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely on unspecified behavior about the cwd of do_generate_qt_config_file().
(cherry picked from commit a17ff281aa8d99f770b0a049cb798235005fb93e at https://codereview.qt-project.org/yocto/meta-qt5.)
--- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
recipes-qt/qt5/nativesdk-qtbase_git.bb +1 -1
@@ -94,7 +94,7 @@ OE_QMAKE_PATH_HOST_LIBS = "${libdir}" # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { ${S}/configure -v \
recipes-qt/qt5/qtbase-native_git.bb +1 -1
@@ -79,7 +79,7 @@ PACKAGECONFIG_CONFARGS = " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure_prepend() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"
recipes-qt/qt5/qtbase_git.bb +1 -1
@@ -137,7 +137,7 @@ QT_CONFIG_FLAGS += " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration
Signature · 1 line
2.12.0
Quoted 87 lines · Matt Hoosier
From: Matt Hoosier <[email protected]>
With
commit
efa8aaf82e580a7d32eaaab48eb92d436f2e222a
Author: Andreas Müller <[email protected]>
Date: Thu Feb 9 00:26:09 2017qmake5_base.bbclass: set qt.conf by environment variable again
we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and instead directed it to a path which was intended not to exist.
The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase to build again after Qt 5.8 started paying attention to the contents of this file.
The change as done in efa8aaf works well enough for Morty and subsequent releases' copies of Bitbake, but fails on earlier releases because they lack the following change:
commit
2afcbfef2cd1ca568e5225884a8021df38ee3db0
Author: Ross Burton <[email protected]>
Date: 2016-07-14 13:56:22bitbake: build: don't use $B as the default cwd for functions
The result is that when we build with Krogoth or prior, the body of
do_generate_qt_config_file()runs with a cwd of ${B}, which was _not_ the intent of efa8aaf. Because the working directory is ${B}, ${OE_QMAKE_QTCONF_PATH} is written in there too.do_configure()-- whose cwd is by design also ${B} -- then finds the file 'foodummy', and the build breaks for the reasons outlined in efa8aaf.This change simply shifts the implementation tactics to suppress the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely on unspecified behavior about the cwd of
do_generate_qt_config_file().(cherry picked from commit
a17ff281aa8d99f770b0a049cb798235005fb93eat https://codereview.qt-project.org/yocto/meta-qt5.)--- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)recipes-qt/qt5/nativesdk-qtbase_git.bb +1
-1@@ -94,7 +94,7 @@ OE_QMAKE_PATH_HOST_LIBS = "${libdir}" # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { ${S}/configure -v \recipes-qt/qt5/qtbase-native_git.bb +1
-1@@ -79,7 +79,7 @@ PACKAGECONFIG_CONFARGS = " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure_prepend() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"recipes-qt/qt5/qtbase_git.bb +1
-2@@ -137,7 +137,7 @@ QT_CONFIG_FLAGS += " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration --
Quoted 2 lines
2.12.0
Any comments?
Nothing from me yet, it's included in master-next for my next bitbake world builds to test it, but first I need to resolve other issues in meta-qt5.
Quoted 98 lines · Matt Hoosier
recipes-qt/qt5/
Quoted 48 lines · Matt Hoosier
From: Matt Hoosier <[email protected]>
With
commit
efa8aaf82e580a7d32eaaab48eb92d436f2e222a
Author: Andreas Müller <[email protected]>
Date: Thu Feb 9 00:26:09 2017qmake5_base.bbclass: set qt.conf by environment variable again
we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and instead directed it to a path which was intended not to exist.
The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase to build again after Qt 5.8 started paying attention to the contents of this file.
The change as done in efa8aaf works well enough for Morty and subsequent releases' copies of Bitbake, but fails on earlier releases because they lack the following change:
commit
2afcbfef2cd1ca568e5225884a8021df38ee3db0
Author: Ross Burton <[email protected]>
Date: 2016-07-14 13:56:22bitbake: build: don't use $B as the default cwd for functions
The result is that when we build with Krogoth or prior, the body of
do_generate_qt_config_file()runs with a cwd of ${B}, which was _not_ the intent of efa8aaf. Because the working directory is ${B}, ${OE_QMAKE_QTCONF_PATH} is written in there too.do_configure()-- whose cwd is by design also ${B} -- then finds the file 'foodummy', and the build breaks for the reasons outlined in efa8aaf.This change simply shifts the implementation tactics to suppress the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely on unspecified behavior about the cwd of
do_generate_qt_config_file().(cherry picked from commit
a17ff281aa8d99f770b0a049cb798235005fb93eat https://codereview.qt-project.org/yocto/meta-qt5.)--- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)recipes-qt/qt5/ renamed from recipes-qt/qt5/nativesdk-qtbase_git.bb +0
-0nativesdk-qtbase_git.bb
recipes-qt/qt5/
Quoted 13 lines
index f2ff5f7..ffbb917 100644
recipes-qt/qt5/nativesdk-qtbase_git.bb +1
-1@@ -94,7 +94,7 @@ OE_QMAKE_PATH_HOST_LIBS = "${libdir}" # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { ${S}/configure -v \recipes-qt/qt5/ renamed from recipes-qt/qt5/qtbase-native_git.bb +0
-0qtbase-native_git.bb
recipes-qt/qt5/qtbase-native_git.bb PACKAGECONFIG_CONFARGS = " \ · line 85
Quoted 12 lines
index 98cbecc..0884a19 100644
recipes-qt/qt5/qtbase-native_git.bb +1
-1@@ -79,7 +79,7 @@ PACKAGECONFIG_CONFARGS = " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure_prepend() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri:No such file or directory"
recipes-qt/qt5/qtbase_git.bb QT_CONFIG_FLAGS += " \ · line 143
Quoted 13 lines
recipes-qt/qt5/qtbase_git.bb +1
-1@@ -137,7 +137,7 @@ QT_CONFIG_FLAGS += " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri:No such file or directory" during configuration
Quoted 3 lines
--
2.12.0Any comments?
I know it's not caused by this change, but it still creates "foodummy" file in ${TOPDIR} can we please get rid of it or at least move it somewhere else like ${WORKDIR}?
Quoted 108 lines · Martin Jansa
Nothing from me yet, it's included in master-next for my next bitbake world builds to test it, but first I need to resolve other issues in meta-qt5.
Quoted 99 lines · Matt Hoosier
recipes-qt/qt5/
Quoted 48 lines · Matt Hoosier
From: Matt Hoosier <[email protected]>
With
commit
efa8aaf82e580a7d32eaaab48eb92d436f2e222a
Author: Andreas Müller <[email protected]>
Date: Thu Feb 9 00:26:09 2017qmake5_base.bbclass: set qt.conf by environment variable again
we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and instead directed it to a path which was intended not to exist.
The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase to build again after Qt 5.8 started paying attention to the contents of this file.
The change as done in efa8aaf works well enough for Morty and subsequent releases' copies of Bitbake, but fails on earlier releases because they lack the following change:
commit
2afcbfef2cd1ca568e5225884a8021df38ee3db0
Author: Ross Burton <[email protected]>
Date: 2016-07-14 13:56:22bitbake: build: don't use $B as the default cwd for functions
The result is that when we build with Krogoth or prior, the body of
do_generate_qt_config_file()runs with a cwd of ${B}, which was _not_ the intent of efa8aaf. Because the working directory is ${B}, ${OE_QMAKE_QTCONF_PATH} is written in there too.do_configure()-- whose cwd is by design also ${B} -- then finds the file 'foodummy', and the build breaks for the reasons outlined in efa8aaf.This change simply shifts the implementation tactics to suppress the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely on unspecified behavior about the cwd of
do_generate_qt_config_file().(cherry picked from commit
a17ff281aa8d99f770b0a049cb798235005fb93eat https://codereview.qt-project.org/yocto/meta-qt5.)--- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)recipes-qt/qt5/ renamed from recipes-qt/qt5/nativesdk-qtbase_git.bb +0
-0nativesdk-qtbase_git.bb
recipes-qt/qt5/
Quoted 13 lines
index f2ff5f7..ffbb917 100644
recipes-qt/qt5/nativesdk-qtbase_git.bb +1
-1@@ -94,7 +94,7 @@ OE_QMAKE_PATH_HOST_LIBS = "${libdir}" # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { ${S}/configure -v \recipes-qt/qt5/ renamed from recipes-qt/qt5/qtbase-native_git.bb +0
-0qtbase-native_git.bb
recipes-qt/qt5/qtbase-native_git.bb PACKAGECONFIG_CONFARGS = " \ · line 85
Quoted 12 lines
index 98cbecc..0884a19 100644
recipes-qt/qt5/qtbase-native_git.bb +1
-1@@ -79,7 +79,7 @@ PACKAGECONFIG_CONFARGS = " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure_prepend() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri:No such file or directory"
recipes-qt/qt5/
Quoted 1 line
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtbase_git.bb +0
-0qtbase_git.bb
recipes-qt/qt5/qtbase_git.bb QT_CONFIG_FLAGS += " \ · line 143
Quoted 12 lines
index 5cfbcfa..a2e8917 100644
recipes-qt/qt5/qtbase_git.bb +1
-1@@ -137,7 +137,7 @@ QT_CONFIG_FLAGS += " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri:No such file or directory" during configuration
Quoted 3 lines
--
2.12.0Any comments?
Quoted 3 lines · Martin Jansa
I know it's not caused by this change, but it still creates "foodummy" file in ${TOPDIR} can we please get rid of it or at least move it somewhere else like ${WORKDIR}?
ah thats where it comes from, I was wondering if its some of my workspace tooling doing this. But thanks now I will less annoyed to see it.
Quoted 117 lines
Quoted 4 lines · Martin Jansa
Nothing from me yet, it's included in master-next for my next bitbake world builds to test it, but first I need to resolve other issues in meta-qt5.
Quoted 104 lines
Quoted 99 lines · Matt Hoosier
recipes-qt/qt5/
Quoted 48 lines · Matt Hoosier
From: Matt Hoosier <[email protected]>
With
commit
efa8aaf82e580a7d32eaaab48eb92d436f2e222a
Author: Andreas Müller <[email protected]>
Date: Thu Feb 9 00:26:09 2017qmake5_base.bbclass: set qt.conf by environment variable again
we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and instead directed it to a path which was intended not to exist.
The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase to build again after Qt 5.8 started paying attention to the contents of this file.
The change as done in efa8aaf works well enough for Morty and subsequent releases' copies of Bitbake, but fails on earlier releases because they lack the following change:
commit
2afcbfef2cd1ca568e5225884a8021df38ee3db0
Author: Ross Burton <[email protected]>
Date: 2016-07-14 13:56:22bitbake: build: don't use $B as the default cwd for functions
The result is that when we build with Krogoth or prior, the body of
do_generate_qt_config_file()runs with a cwd of ${B}, which was _not_ the intent of efa8aaf. Because the working directory is ${B}, ${OE_QMAKE_QTCONF_PATH} is written in there too.do_configure()-- whose cwd is by design also ${B} -- then finds the file 'foodummy', and the build breaks for the reasons outlined in efa8aaf.This change simply shifts the implementation tactics to suppress the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely on unspecified behavior about the cwd of
do_generate_qt_config_file().(cherry picked from commit
a17ff281aa8d99f770b0a049cb798235005fb93eat https://codereview.qt-project.org/yocto/meta-qt5.)--- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)recipes-qt/qt5/ renamed from recipes-qt/qt5/nativesdk-qtbase_git.bb +0
-0nativesdk-qtbase_git.bb
recipes-qt/qt5/
Quoted 13 lines
index f2ff5f7..ffbb917 100644
recipes-qt/qt5/nativesdk-qtbase_git.bb +1
-1@@ -94,7 +94,7 @@ OE_QMAKE_PATH_HOST_LIBS = "${libdir}" # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { ${S}/configure -v \recipes-qt/qt5/ renamed from recipes-qt/qt5/qtbase-native_git.bb +0
-0qtbase-native_git.bb
recipes-qt/qt5/qtbase-native_git.bb PACKAGECONFIG_CONFARGS = " \ · line 85
Quoted 12 lines
index 98cbecc..0884a19 100644
recipes-qt/qt5/qtbase-native_git.bb +1
-1@@ -79,7 +79,7 @@ PACKAGECONFIG_CONFARGS = " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure_prepend() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri:No such file or directory"
recipes-qt/qt5/
Quoted 1 line
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtbase_git.bb +0
-0qtbase_git.bb
recipes-qt/qt5/qtbase_git.bb QT_CONFIG_FLAGS += " \ · line 143
Quoted 12 lines
index 5cfbcfa..a2e8917 100644
recipes-qt/qt5/qtbase_git.bb +1
-1@@ -137,7 +137,7 @@ QT_CONFIG_FLAGS += " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri:No such file or directory" during configuration
Quoted 3 lines
--
2.12.0Any comments?
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 7 lines · Khem Raj
Quoted 3 lines · Martin Jansa
I know it's not caused by this change, but it still creates "foodummy" file in ${TOPDIR} can we please get rid of it or at least move it somewhere else like ${WORKDIR}?
ah thats where it comes from, I was wondering if its some of my workspace tooling doing this. But thanks now I will less annoyed to see it.
What branch of meta-qt5 is it that's getting built when you still see these build/foodummy files? There are no remaining occurences of the string 'foodummy' anywhere that I can see on jansa/master where my patch got applied:
$ git remote -v github git://github.com/meta-qt5/meta-qt5 (fetch github git://github.com/meta-qt5/meta-qt5 (push)
$ git checkout github/jansa/master $ git grep foodummy
-Matt