Skip to contentSkip to conversation

qt5quickcontrols: fix LTS (5.6) qml file install

PATCH New Peter Seiderer 3 participants 6 messages Feb 20, 2017 – Feb 21, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt5quickcontrols: fix LTS (5.6) qml file install

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

---
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 9 +++++++++
 1 file changed, 9 insertions(+)
package/qt5/qt5quickcontrols/qt5quickcontrols.mk +9 -0
index c2946bc75..8a63629c3 100644
@@ -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))
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 qt5quickcontrols: fix LTS (5.6) qml file install

Hello,

Quoted 5 lines · Peter Seiderer
package/qt5/qt5quickcontrols/qt5quickcontrols.mk +1 -0
+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

package/qt5/qt5quickcontrols/qt5quickcontrols.mk define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS · line 47

Quoted 10 lines
package/qt5/qt5quickcontrols/qt5quickcontrols.mk +8 -0
 	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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 qt5quickcontrols: fix LTS (5.6) qml file install

Quoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 7 lines · Peter Seiderer

+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

package/qt5/qt5quickcontrols/qt5quickcontrols.mk define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS · line 47

Quoted 8 lines
package/qt5/qt5quickcontrols/qt5quickcontrols.mk +8 -0
+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

Quoted 5 lines

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.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 qt5quickcontrols: fix LTS (5.6) qml file install

Hello,

Quoted 2 lines · Peter Korsgaard

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?

Quoted 2 lines

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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#4 lore raw

PATCH 1/1 qt5quickcontrols: fix LTS (5.6) qml file install

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 2 lines · Peter Korsgaard

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.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/1 qt5quickcontrols: fix LTS (5.6) qml file install

In reply to Peter Seiderer
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> 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

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard