Skip to contentSkip to conversation

package/qt5: simplify and cleanup _SITE variables

PATCH New Gaël PORTAY 2 participants 3 messages Nov 28, 2017 – Nov 29, 2017

lore
Share & tools
lore

Gaël PORTAY

author
#0 lore raw

PATCH v2 1/1 package/qt5: simplify and cleanup _SITE variables

The variable QT5_SNAPSHOTS_SITE was introduced in commit 9d5ac9698 to fetch sources of obsolete modules. It was used to download qt5webkit tarballs.

The variable is not referenced anymore since the qt5webkit tarballs are downloaded from the Qt community release site.

Since the introduction of qt-5.9 in aa1c40ba3, the QT5_SITE variable was duplicates for no good reason.

Signed-off-by Ga?l PORTAY <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>
---
 package/qt5/qt5.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/qt5/qt5.mk +1 -3
index 0e49c6b58b..5d63433666 100644
@@ -7,13 +7,11 @@
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 QT5_VERSION_MAJOR = 5.9
 QT5_VERSION = $(QT5_VERSION_MAJOR).2
-QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
 else
 QT5_VERSION_MAJOR = 5.6
 QT5_VERSION = $(QT5_VERSION_MAJOR).3
-QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
-QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
 endif
+QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
 
 include $(sort $(wildcard package/qt5/*/*.mk))
Signature · 1 line
2.15.0
author
#1 lore raw

PATCH v2 1/1 package/qt5: simplify and cleanup _SITE variables

With the missing changelog.

Quoted 7 lines · Ga?l PORTAY

The variable QT5_SNAPSHOTS_SITE was introduced in commit 9d5ac9698 to fetch sources of obsolete modules. It was used to download qt5webkit tarballs.

The variable is not referenced anymore since the qt5webkit tarballs are downloaded from the Qt community release site.

Quoted 6 lines

Since the introduction of qt-5.9 in aa1c40ba3, the QT5_SITE variable was duplicates for no good reason.

Signed-off-by Ga?l PORTAY <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

---

Changes since v1:
* reword asked by Yann to complete the commit message.
* add the acked-by of Yann.

Applied
#2 lore raw

PATCH v2 1/1 package/qt5: simplify and cleanup _SITE variables

In reply to Gaël PORTAY

Hello,

Quoted 7 lines · Ga?l PORTAY

The variable QT5_SNAPSHOTS_SITE was introduced in commit 9d5ac9698 to fetch sources of obsolete modules. It was used to download qt5webkit tarballs.

The variable is not referenced anymore since the qt5webkit tarballs are downloaded from the Qt community release site.

Quoted 8 lines

Since the introduction of qt-5.9 in aa1c40ba3, the QT5_SITE variable was duplicates for no good reason.

Signed-off-by Ga?l PORTAY <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>
---
 package/qt5/qt5.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Applied to next, thanks.

Thomas

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