* [Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install
@ 2017-02-20 21:41 Peter Seiderer
2017-02-20 22:23 ` Thomas Petazzoni
2017-02-20 22:32 ` Peter Korsgaard
0 siblings, 2 replies; 6+ messages in thread
From: Peter Seiderer @ 2017-02-20 21:41 UTC (permalink / raw)
To: buildroot
Fixes [1]:
cp -dpfr .../host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/qml/QtQuick/PrivateWidgets .../target/usr/qml/QtQuick
cp: cannot stat ?.../host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/qml/QtQuick/PrivateWidgets?: No such file or directory
[1] https://bugs.busybox.net/show_bug.cgi?id=9666
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index c2946bc75..8a63629c3 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -30,11 +30,20 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
endef
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
endef
+else
+define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
+ cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
+ cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
+ cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
+ cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
+endef
+endif
$(eval $(generic-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install
2017-02-20 21:41 [Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install Peter Seiderer
@ 2017-02-20 22:23 ` Thomas Petazzoni
2017-02-20 22:37 ` Peter Korsgaard
2017-02-20 22:32 ` Peter Korsgaard
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2017-02-20 22:23 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 20 Feb 2017 22:41:05 +0100, Peter Seiderer wrote:
> +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
> define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
> endef
> +else
> +define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
> +endef
> +endif
Perhaps it's time to:
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5QUICKCONTROLS_INSTALL_QML_DIRS = Controls Dialogs Extras PrivateWidgets
else
QT5QUICKCONTROLS_INSTALL_QML_DIRS = Controls Dialogs Extras Layouts
endif
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
$(foreach d,$(QT5QUICKCONTROLS_INSTALL_QML_DIRS), \
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/$(d) $(TARGET_DIR)/usr/qml/QtQuick
)
endef
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install
2017-02-20 21:41 [Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install Peter Seiderer
2017-02-20 22:23 ` Thomas Petazzoni
@ 2017-02-20 22:32 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-02-20 22:32 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:
> Fixes [1]:
> cp -dpfr .../host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/qml/QtQuick/PrivateWidgets .../target/usr/qml/QtQuick
> cp: cannot stat ?.../host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/qml/QtQuick/PrivateWidgets?: No such file or directory
> [1] https://bugs.busybox.net/show_bug.cgi?id=9666
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install
2017-02-20 22:23 ` Thomas Petazzoni
@ 2017-02-20 22:37 ` Peter Korsgaard
2017-02-21 8:12 ` Thomas Petazzoni
0 siblings, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2017-02-20 22:37 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> Hello,
> On Mon, 20 Feb 2017 22:41:05 +0100, Peter Seiderer wrote:
>> +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
>> define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
>> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
>> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
>> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
>> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
>> endef
>> +else
>> +define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
>> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
>> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
>> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
>> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
>> +endef
>> +endif
> Perhaps it's time to:
> ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
> QT5QUICKCONTROLS_INSTALL_QML_DIRS = Controls Dialogs Extras PrivateWidgets
> else
> QT5QUICKCONTROLS_INSTALL_QML_DIRS = Controls Dialogs Extras Layouts
> endif
> define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
> $(foreach d,$(QT5QUICKCONTROLS_INSTALL_QML_DIRS), \
> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/$(d) $(TARGET_DIR)/usr/qml/QtQuick
> )
> endef
Yeah, I also didn't really like the repeated lines - But this way is
atleast very minimal/safe.
Alternatively the loop could be extended to check if the directory
exists and otherwise skip it, then we wouldn't need the version check.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install
2017-02-20 22:37 ` Peter Korsgaard
@ 2017-02-21 8:12 ` Thomas Petazzoni
2017-02-21 8:20 ` Peter Korsgaard
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2017-02-21 8:12 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 20 Feb 2017 23:37:00 +0100, Peter Korsgaard wrote:
> Yeah, I also didn't really like the repeated lines - But this way is
> atleast very minimal/safe.
Agreed. So will you apply Peter's patch?
> Alternatively the loop could be extended to check if the directory
> exists and otherwise skip it, then we wouldn't need the version check.
That's an option. It has the drawback of not failing if a directory
supposed to be there isn't, but OK.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install
2017-02-21 8:12 ` Thomas Petazzoni
@ 2017-02-21 8:20 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-02-21 8:20 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> Hello,
> On Mon, 20 Feb 2017 23:37:00 +0100, Peter Korsgaard wrote:
>> Yeah, I also didn't really like the repeated lines - But this way is
>> atleast very minimal/safe.
> Agreed. So will you apply Peter's patch?
I already did yesterday.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-02-21 8:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-20 21:41 [Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install Peter Seiderer
2017-02-20 22:23 ` Thomas Petazzoni
2017-02-20 22:37 ` Peter Korsgaard
2017-02-21 8:12 ` Thomas Petazzoni
2017-02-21 8:20 ` Peter Korsgaard
2017-02-20 22:32 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.