package/qt5/qt5declarative: fix parallel install
PATCH v2 1/1 package/qt5/qt5declarative: fix parallel install
While installing qt5declarative examples on fast machine, example destination
directory will be installed twice, so it can break a parallel install, whereby two make jobs may run concurrently, trying to install the same files or creating the same directory.
Cannot touch [...]chapter5-listproperties/app.qml: No such file or directory Error copying [...]chapter2-methods/app.qml: Destination file exists
This is due to "target" and "qml" target creating the same directory in the generated Makefile:
install_target: first FORCE
@test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \
mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods
install_qml: first FORCE
@test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \
mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methodsAdd "target" in "qml" dependency to fixes the issue:
install_qml: first install_target FORCE
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/565470221
---
v2: Apply this fix each time where several install target are used in .po file:
INSTALLS += target [qml] [...]
(Peter)
---
.../0002-examples-fix-parallel-install.patch | 209 ++++++++++++++++++
1 file changed, 209 insertions(+)
create mode 100644 package/qt5/qt5declarative/0002-examples-fix-parallel-install.patchpackage/qt5/qt5declarative/0002-examples-fix-parallel-install.patch new file +209 -0
@@ -0,0 +1,209 @@ +From 533035c1de62548657d211421fc92b721cec52bb Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Mon, 25 May 2020 20:21:52 +0200 +Subject: [PATCH] examples: fix parallel install + +While installing qt5declarative examples on fast machine, example destination +directory will be installed twice, so it can break a parallel install, whereby +two make jobs may run concurrently, trying to install the same files or creating +the same directory. + +Cannot touch [...]chapter5-listproperties/app.qml: No such file or directory +Error copying [...]chapter2-methods/app.qml: Destination file exists + +This is due to "target" and "qml" target creating the same directory in the +generated Makefile: + + install_target: first FORCE + @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ + mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods + + install_qml: first FORCE + @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ + mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods + +Add "target" in "qml" dependency to fixes the issue: + + install_qml: first install_target FORCE + +Apply this fix each time where several install target are used in .po file: + INSTALLS += target [qml] [...] + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/565470221 + +Signed-off-by: Romain Naour <[email protected]> +--- + examples/qml/qmlextensionplugins/qmlextensionplugins.pro | 2 ++ + .../tutorials/extending-qml/chapter1-basics/chapter1-basics.pro | 1 + + .../extending-qml/chapter2-methods/chapter2-methods.pro | 1 + + .../extending-qml/chapter3-bindings/chapter3-bindings.pro | 1 + + .../chapter4-customPropertyTypes.pro | 1 + + .../chapter5-listproperties/chapter5-listproperties.pro | 1 + + .../tutorials/extending-qml/chapter6-plugins/import/import.pro | 2 ++ + examples/qmltest/qmltest/qmltest.pro | 1 + + examples/quick/customitems/painteditem/painteditem.pro | 1 + + examples/quick/imageprovider/imageprovider.pro | 2 ++ + examples/quick/imageresponseprovider/imageresponseprovider.pro | 2 ++ + examples/quick/scenegraph/simplematerial/simplematerial.pro | 1 + + tests/manual/highdpi/highdpi.pro | 2 ++ + 13 files changed, 18 insertions(+) + +diff --git a/examples/qml/qmlextensionplugins/qmlextensionplugins.pro b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro +index 946626cce7..c537effe64 100644 +--- a/examples/qml/qmlextensionplugins/qmlextensionplugins.pro ++++ b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro +@@ -17,8 +17,10 @@ pluginfiles.files += \ + + qml.files = plugins.qml + qml.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins ++qml.depends = install_target + target.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExample + pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExample ++pluginfiles.depends = install_qml + + INSTALLS += target qml pluginfiles + +diff --git a/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro +index 9911e02484..8f54cbc478 100644 +--- a/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro ++++ b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro +@@ -11,5 +11,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro +index 7fd850ce36..6433c333f8 100644 +--- a/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro ++++ b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro +@@ -11,5 +11,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro +index 1ae83f71eb..8c7bd415d0 100644 +--- a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro ++++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro +@@ -11,5 +11,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +index 12dfbd6280..75dd1aeaf3 100644 +--- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro ++++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +@@ -13,5 +13,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro +index 67d1cd35c3..676d623e2d 100644 +--- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro ++++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro +@@ -13,5 +13,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro +index 5cf4621420..9f663f0b05 100644 +--- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro ++++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro +@@ -18,6 +18,8 @@ DESTPATH=$$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter6-plugins/Ch + target.path=$$DESTPATH + qmldir.files=$$PWD/qmldir + qmldir.path=$$DESTPATH ++qmldir.depends = install_target ++ + INSTALLS += target qmldir + + CONFIG += install_ok # Do not cargo-cult this! +diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro +index b5893c5a1e..2e0d36fef3 100644 +--- a/examples/qmltest/qmltest/qmltest.pro ++++ b/examples/qmltest/qmltest/qmltest.pro +@@ -21,6 +21,7 @@ macx: CONFIG -= app_bundle + target.path = $$[QT_INSTALL_EXAMPLES]/qmltest/qmltest + qml.files = tst_basic.qml tst_item.qml + qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest/qmltest ++qml.depends = install_target + INSTALLS += target qml + + } +diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro +index bc7480ab9e..2185b3dd43 100644 +--- a/examples/quick/customitems/painteditem/painteditem.pro ++++ b/examples/quick/customitems/painteditem/painteditem.pro +@@ -16,6 +16,7 @@ DESTDIR = TextBalloonPlugin + target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin + qmldir.files = TextBalloonPlugin/qmldir + qmldir.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin ++qml.depends = install_target + + INSTALLS += qmldir target + +diff --git a/examples/quick/imageprovider/imageprovider.pro b/examples/quick/imageprovider/imageprovider.pro +index e54469b0d8..a49d55d254 100644 +--- a/examples/quick/imageprovider/imageprovider.pro ++++ b/examples/quick/imageprovider/imageprovider.pro +@@ -12,6 +12,8 @@ EXAMPLE_FILES = imageprovider-example.qml + target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore + qml.files = ImageProviderCore/qmldir + qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore ++qml.depends = install_target ++ + INSTALLS = target qml + + CONFIG += install_ok # Do not cargo-cult this! +diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.pro b/examples/quick/imageresponseprovider/imageresponseprovider.pro +index 8be4dbb658..e99a269602 100644 +--- a/examples/quick/imageresponseprovider/imageresponseprovider.pro ++++ b/examples/quick/imageresponseprovider/imageresponseprovider.pro +@@ -12,6 +12,8 @@ EXAMPLE_FILES = imageresponseprovider-example.qml + target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseProviderCore + qml.files = ImageResponseProviderCore/qmldir + qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseProviderCore ++qml.depends = install_target ++ + INSTALLS = target qml + + CONFIG += install_ok # Do not cargo-cult this! +diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.pro b/examples/quick/scenegraph/simplematerial/simplematerial.pro +index 6ae935f357..66a2d92ca8 100644 +--- a/examples/quick/scenegraph/simplematerial/simplematerial.pro ++++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro +@@ -8,5 +8,6 @@ RESOURCES += simplematerial.qrc + target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial + qml.files = main.qml + qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/tests/manual/highdpi/highdpi.pro b/tests/manual/highdpi/highdpi.pro +index a434f848ae..7a010896b3 100644 +--- a/tests/manual/highdpi/highdpi.pro ++++ b/tests/manual/highdpi/highdpi.pro +@@ -10,4 +10,6 @@ SOURCES += imageprovider.cpp + target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider + qml.files = ImageProvider/qmldir + qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider ++qml.depends = install_target ++ + INSTALLS = target qml +-- +2.25.4 +
Signature · 1 line
2.25.4
PATCH v2 1/1 package/qt5/qt5declarative: fix parallel install
Hello Romain,
Quoted 19 lines · Romain Naour
While installing qt5declarative examples on fast machine, example destination
directory will be installed twice, so it can break a parallel install, whereby two make jobs may run concurrently, trying to install the same files or creating the same directory.Cannot touch [...]chapter5-listproperties/app.qml: No such file or directory Error copying [...]chapter2-methods/app.qml: Destination file exists
This is due to "target" and "qml" target creating the same directory in the generated
Makefile:install_target: first FORCE @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods install_qml: first FORCE @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods
Quoted 3 lines
Add "target" in "qml" dependency to fixes the issue:
install_qml: firstinstall_targetFORCE
Still failing, e.g.:
Error copying /home/seiderer/Work/Buildroot/build_rpi4_update_001/build/qt5declarative-5.14.2/examples/qml/tutorials/extending-qml/chapter2-methods/app.qml to /home/seiderer/Work/Buildroot/build_rpi4_update_001/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods/app.qml: Cannot create /home/seiderer/Work/Buildroot/build_rpi4_update_001/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods/app.qml for output make[7]: *** [Makefile:691: install_qml] Error 3
make[7]: *** Waiting for unfinished jobs....
make[6]: *** [Makefile:89: sub-chapter2-methods-install_subtargets] Error 2
make[6]: *** Waiting for unfinished jobs....
make[5]: *** [Makefile:59: sub-extending-qml-install_subtargets] Error 2
make[4]: *** [Makefile:164: sub-tutorials-install_subtargets] Error 2
make[3]: *** [Makefile:86: sub-qml-install_subtargets] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [Makefile:113: sub-examples-install_subtargets] Error 2
make[1]: *** [package/pkg-generic.mk:310: /home/seiderer/Work/Buildroot/build_rpi4_update_001/build/qt5declarative-5.14.2/.stamp_staging_installed] Error 2
make: *** [Makefile:23: _all] Error 2
Did try another solution, instead of adding an extra dependency converted qml install targets into 'OTHER_FILES', e.g.:
examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro +3 -5
@@ -6,10 +6,8 @@ SOURCES += piechart.cpp \ RESOURCES += chapter2-methods.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter2-methods -target.path = $$DESTPATH +target.path = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter2-methods -qml.files = *.qml -qml.path = $$DESTPATH +OTHER_FILES += *.qml -INSTALLS += target qml +INSTALLS += target
Looks promising (survived 40 loops of the install test)...
Should I send a v3 (hijacking your patch) or send it as an new one?
Regards,
Peter
Quoted 232 lines
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/565470221Signed-off-by Romain Naour <[email protected]>Cc Ga?l Portay <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Peter Seiderer <[email protected]>---
v2: Apply this fix each time where several install target are used in .po file:INSTALLS += target [qml] [...] (Peter) --- .../0002-examples-fix-parallel-install.patch | 209 ++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100644 package/qt5/qt5declarative/0002-examples-fix-parallel-install.patchpackage/qt5/qt5declarative/0002-examples-fix-parallel-install.patch new file +209
-0@@ -0,0 +1,209 @@ +From 533035c1de62548657d211421fc92b721cec52bb Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Mon, 25 May 2020 20:21:52 +0200 +Subject: [PATCH] examples: fix parallel install + +While installing qt5declarative examples on fast machine, example destination +directory will be installed twice, so it can break a parallel install, whereby +two make jobs may run concurrently, trying to install the same files or creating +the same directory. + +Cannot touch [...]chapter5-listproperties/app.qml: No such file or directory +Error copying [...]chapter2-methods/app.qml: Destination file exists + +This is due to "target" and "qml" target creating the same directory in the +generated Makefile: + + install_target: first FORCE + @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ + mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods + + install_qml: first FORCE + @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ + mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods + +Add "target" in "qml" dependency to fixes the issue: + + install_qml: first install_target FORCE + +Apply this fix each time where several install target are used in .po file: + INSTALLS += target [qml] [...] + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/565470221 + +Signed-off-by: Romain Naour <[email protected]> +--- + examples/qml/qmlextensionplugins/qmlextensionplugins.pro | 2 ++ + .../tutorials/extending-qml/chapter1-basics/chapter1-basics.pro | 1 + + .../extending-qml/chapter2-methods/chapter2-methods.pro | 1 + + .../extending-qml/chapter3-bindings/chapter3-bindings.pro | 1 + + .../chapter4-customPropertyTypes.pro | 1 + + .../chapter5-listproperties/chapter5-listproperties.pro | 1 + + .../tutorials/extending-qml/chapter6-plugins/import/import.pro | 2 ++ + examples/qmltest/qmltest/qmltest.pro | 1 + + examples/quick/customitems/painteditem/painteditem.pro | 1 + + examples/quick/imageprovider/imageprovider.pro | 2 ++ + examples/quick/imageresponseprovider/imageresponseprovider.pro | 2 ++ + examples/quick/scenegraph/simplematerial/simplematerial.pro | 1 + + tests/manual/highdpi/highdpi.pro | 2 ++ + 13 files changed, 18 insertions(+) + +diff --git a/examples/qml/qmlextensionplugins/qmlextensionplugins.pro b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro +index 946626cce7..c537effe64 100644 +--- a/examples/qml/qmlextensionplugins/qmlextensionplugins.pro ++++ b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro +@@ -17,8 +17,10 @@ pluginfiles.files += \ + + qml.files = plugins.qml + qml.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins ++qml.depends = install_target + target.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExample + pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExample ++pluginfiles.depends = install_qml + + INSTALLS += target qml pluginfiles + +diff --git a/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro +index 9911e02484..8f54cbc478 100644 +--- a/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro ++++ b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro +@@ -11,5 +11,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro +index 7fd850ce36..6433c333f8 100644 +--- a/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro ++++ b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro +@@ -11,5 +11,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro +index 1ae83f71eb..8c7bd415d0 100644 +--- a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro ++++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro +@@ -11,5 +11,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +index 12dfbd6280..75dd1aeaf3 100644 +--- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro ++++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +@@ -13,5 +13,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro +index 67d1cd35c3..676d623e2d 100644 +--- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro ++++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro +@@ -13,5 +13,6 @@ target.path = $$DESTPATH + + qml.files = *.qml + qml.path = $$DESTPATH ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro +index 5cf4621420..9f663f0b05 100644 +--- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro ++++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro +@@ -18,6 +18,8 @@ DESTPATH=$$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter6-plugins/Ch + target.path=$$DESTPATH + qmldir.files=$$PWD/qmldir + qmldir.path=$$DESTPATH ++qmldir.depends = install_target ++ + INSTALLS += target qmldir + + CONFIG += install_ok # Do not cargo-cult this! +diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro +index b5893c5a1e..2e0d36fef3 100644 +--- a/examples/qmltest/qmltest/qmltest.pro ++++ b/examples/qmltest/qmltest/qmltest.pro +@@ -21,6 +21,7 @@ macx: CONFIG -= app_bundle + target.path = $$[QT_INSTALL_EXAMPLES]/qmltest/qmltest + qml.files = tst_basic.qml tst_item.qml + qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest/qmltest ++qml.depends = install_target + INSTALLS += target qml + + } +diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro +index bc7480ab9e..2185b3dd43 100644 +--- a/examples/quick/customitems/painteditem/painteditem.pro ++++ b/examples/quick/customitems/painteditem/painteditem.pro +@@ -16,6 +16,7 @@ DESTDIR = TextBalloonPlugin + target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin + qmldir.files = TextBalloonPlugin/qmldir + qmldir.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin ++qml.depends = install_target + + INSTALLS += qmldir target + +diff --git a/examples/quick/imageprovider/imageprovider.pro b/examples/quick/imageprovider/imageprovider.pro +index e54469b0d8..a49d55d254 100644 +--- a/examples/quick/imageprovider/imageprovider.pro ++++ b/examples/quick/imageprovider/imageprovider.pro +@@ -12,6 +12,8 @@ EXAMPLE_FILES = imageprovider-example.qml + target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore + qml.files = ImageProviderCore/qmldir + qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore ++qml.depends = install_target ++ + INSTALLS = target qml + + CONFIG += install_ok # Do not cargo-cult this! +diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.pro b/examples/quick/imageresponseprovider/imageresponseprovider.pro +index 8be4dbb658..e99a269602 100644 +--- a/examples/quick/imageresponseprovider/imageresponseprovider.pro ++++ b/examples/quick/imageresponseprovider/imageresponseprovider.pro +@@ -12,6 +12,8 @@ EXAMPLE_FILES = imageresponseprovider-example.qml + target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseProviderCore + qml.files = ImageResponseProviderCore/qmldir + qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseProviderCore ++qml.depends = install_target ++ + INSTALLS = target qml + + CONFIG += install_ok # Do not cargo-cult this! +diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.pro b/examples/quick/scenegraph/simplematerial/simplematerial.pro +index 6ae935f357..66a2d92ca8 100644 +--- a/examples/quick/scenegraph/simplematerial/simplematerial.pro ++++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro +@@ -8,5 +8,6 @@ RESOURCES += simplematerial.qrc + target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial + qml.files = main.qml + qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial ++qml.depends = install_target + + INSTALLS += target qml +diff --git a/tests/manual/highdpi/highdpi.pro b/tests/manual/highdpi/highdpi.pro +index a434f848ae..7a010896b3 100644 +--- a/tests/manual/highdpi/highdpi.pro ++++ b/tests/manual/highdpi/highdpi.pro +@@ -10,4 +10,6 @@ SOURCES += imageprovider.cpp + target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider + qml.files = ImageProvider/qmldir + qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider ++qml.depends = install_target ++ + INSTALLS = target qml +-- +2.25.4 +
PATCH v2 1/1 package/qt5/qt5declarative: fix parallel install
Hi Peter,
Le 26/05/2020 ? 21:03, Peter Seiderer a ?crit?:
Quoted 30 lines
Hello Romain,
Quoted 19 lines · Romain Naour
While installing qt5declarative examples on fast machine, example destination
directory will be installed twice, so it can break a parallel install, whereby two make jobs may run concurrently, trying to install the same files or creating the same directory.Cannot touch [...]chapter5-listproperties/app.qml: No such file or directory Error copying [...]chapter2-methods/app.qml: Destination file exists
This is due to "target" and "qml" target creating the same directory in the generated
Makefile:install_target: first FORCE @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods install_qml: first FORCE @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methodsQuoted 3 lines
Add "target" in "qml" dependency to fixes the issue:
install_qml: firstinstall_targetFORCEStill failing, e.g.:
Quoted 12 lines
Error copying
/home/seiderer/Work/Buildroot/build_rpi4_update_001/build/qt5declarative-5.14.2/examples/qml/tutorials/extending-qml/chapter2-methods/app.qmlto/home/seiderer/Work/Buildroot/build_rpi4_update_001/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods/app.qml: Cannot create/home/seiderer/Work/Buildroot/build_rpi4_update_001/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods/app.qmlfor output make[7]: *** [Makefile:691:install_qml] Error 3
make[7]: *** Waiting for unfinished jobs....
make[6]: *** [Makefile:89: sub-chapter2-methods-install_subtargets] Error 2
make[6]: *** Waiting for unfinished jobs....
make[5]: *** [Makefile:59: sub-extending-qml-install_subtargets] Error 2
make[4]: *** [Makefile:164: sub-tutorials-install_subtargets] Error 2
make[3]: *** [Makefile:86: sub-qml-install_subtargets] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [Makefile:113: sub-examples-install_subtargets] Error 2
make[1]: *** [package/pkg-generic.mk:310:/home/seiderer/Work/Buildroot/build_rpi4_update_001/build/qt5declarative-5.14.2/.stamp_staging_installed] Error 2
make: *** [Makefile:23:_all] Error 2
Just to check, did you clean the qt5decalrative package before testing ? You can check if the patch has been taken into account by looking at install_qml makefile target:
install_qml: first install_target FORCE
Quoted 25 lines
Did try another solution, instead of adding an extra dependency converted qml install targets into '
OTHER_FILES', e.g.:examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro +3
-5@@ -6,10 +6,8 @@ SOURCES += piechart.cpp \ RESOURCES += chapter2-methods.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter2-methods -target.path = $$DESTPATH +target.path = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter2-methods -qml.files = *.qml -qml.path = $$DESTPATH +OTHER_FILES += *.qml -INSTALLS += target qml +INSTALLS += target
Quoted 3 lines
Looks promising (survived 40 loops of the install test)...
Should I send a v3 (hijacking your patch) or send it as an new one?
Since it looks promising then feel free to send a new one that supersede my patch :) Maybe add a link in the commit log to our initial investigations :)
Thanks for the help!
Best regards,
Romain
Quoted 17 lines
Regards,
PeterQuoted 13 lines
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/565470221Signed-off-by Romain Naour <[email protected]>Cc Ga?l Portay <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Peter Seiderer <[email protected]>---
v2: Apply this fix each time where several install target are used in .po file:INSTALLS += target [qml] [...] (Peter)---
PATCH v2 1/1 package/qt5/qt5declarative: fix parallel install
Hello Romain,
Quoted 46 lines · Romain Naour
Hi Peter,
Le 26/05/2020 ? 21:03, Peter Seiderer a ?crit?:
Quoted 30 lines
Hello Romain,
Quoted 19 lines · Romain Naour
While installing qt5declarative examples on fast machine, example destination
directory will be installed twice, so it can break a parallel install, whereby two make jobs may run concurrently, trying to install the same files or creating the same directory.Cannot touch [...]chapter5-listproperties/app.qml: No such file or directory Error copying [...]chapter2-methods/app.qml: Destination file exists
This is due to "target" and "qml" target creating the same directory in the generated
Makefile:install_target: first FORCE @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods install_qml: first FORCE @test -d $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods || \ mkdir -p $(INSTALL_ROOT)/[...]/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methodsQuoted 3 lines
Add "target" in "qml" dependency to fixes the issue:
install_qml: firstinstall_targetFORCEStill failing, e.g.:
Quoted 12 lines
Error copying
/home/seiderer/Work/Buildroot/build_rpi4_update_001/build/qt5declarative-5.14.2/examples/qml/tutorials/extending-qml/chapter2-methods/app.qmlto/home/seiderer/Work/Buildroot/build_rpi4_update_001/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods/app.qml: Cannot create/home/seiderer/Work/Buildroot/build_rpi4_update_001/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/examples/qml/tutorials/extending-qml/chapter2-methods/app.qmlfor output make[7]: *** [Makefile:691:install_qml] Error 3
make[7]: *** Waiting for unfinished jobs....
make[6]: *** [Makefile:89: sub-chapter2-methods-install_subtargets] Error 2
make[6]: *** Waiting for unfinished jobs....
make[5]: *** [Makefile:59: sub-extending-qml-install_subtargets] Error 2
make[4]: *** [Makefile:164: sub-tutorials-install_subtargets] Error 2
make[3]: *** [Makefile:86: sub-qml-install_subtargets] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [Makefile:113: sub-examples-install_subtargets] Error 2
make[1]: *** [package/pkg-generic.mk:310:/home/seiderer/Work/Buildroot/build_rpi4_update_001/build/qt5declarative-5.14.2/.stamp_staging_installed] Error 2
make: *** [Makefile:23:_all] Error 2
Quoted 1 line
Just to check, did you clean the qt5decalrative package before testing ?
Yes, qt5declarative re-build via 'rm -rf build/qt5declarative-5.14.2'...
Quoted 5 lines
You can check if the patch has been taken into account by looking at
install_qmlmakefile target:
install_qml: firstinstall_targetFORCE
$ grep "^install_qml:" build/qt5declarative-5.14.2/examples/qml/tutorials/extending-qml/chapter2-methods/Makefile install_qml: first install_target FORCE
But in the case of app.qml it is not (only) the install_target dependency but although the install_source dependency (the second place where app.qml is mentioned in the Makefile)...
Quoted 25 lines
Quoted 25 lines
Did try another solution, instead of adding an extra dependency converted qml install targets into '
OTHER_FILES', e.g.:examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro +3
-5@@ -6,10 +6,8 @@ SOURCES += piechart.cpp \ RESOURCES += chapter2-methods.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter2-methods -target.path = $$DESTPATH +target.path = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter2-methods -qml.files = *.qml -qml.path = $$DESTPATH +OTHER_FILES += *.qml -INSTALLS += target qml +INSTALLS += target
Quoted 6 lines
Quoted 3 lines
Looks promising (survived 40 loops of the install test)...
Should I send a v3 (hijacking your patch) or send it as an new one?
Since it looks promising then feel free to send a new one that supersede my patch :) Maybe add a link in the commit log to our initial investigations :)
Will do...
Regards,
Peter
Quoted 27 lines
Thanks for the help!
Best regards,
RomainQuoted 17 lines
Regards,
PeterQuoted 13 lines
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/565470221Signed-off-by Romain Naour <[email protected]>Cc Ga?l Portay <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Peter Seiderer <[email protected]>---
v2: Apply this fix each time where several install target are used in .po file:INSTALLS += target [qml] [...] (Peter)---
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot