diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-17 13:35:23 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-17 13:35:23 +0300 |
| commit | 7df742a2bacf7ad93f766910871271ca1496072c (patch) | |
| tree | 27b38bde1065b7e95a699eb5529e66ca31df973f /recipes-qt | |
| parent | 90c3cf671a82bfc7e3c8d3071692650ed6bbe8e8 (diff) | |
| parent | c04cc5996405bf648b69e39aba285a5fad39b3d3 (diff) | |
| download | meta-boot2qt-7df742a2bacf7ad93f766910871271ca1496072c.tar.gz | |
Merge remote-tracking branch 'origin/morty' into pyro
* origin/morty:
qtivi: don't use dlt by default
poky, meta layers: update morty branches to latest version
Remove all *.ci.local network addresses
Conflicts:
scripts/manifest.xml
Change-Id: I7918561f735604be2fd7e532bd3dfb8aec1d068d
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/automotive/qtivi_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5-addons/installer-framework_2.0.3.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 3dbf07e..6b364d3 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb | |||
| @@ -54,7 +54,7 @@ SRCREV_qface = "b1d96d85a7c43ac74335b9a1a99a68507047f5bc" | |||
| 54 | SRCREV = "${SRCREV_qtivi}" | 54 | SRCREV = "${SRCREV_qtivi}" |
| 55 | SRCREV_FORMAT = "qtivi_qface" | 55 | SRCREV_FORMAT = "qtivi_qface" |
| 56 | 56 | ||
| 57 | PACKAGECONFIG ?= "taglib dlt ivigenerator" | 57 | PACKAGECONFIG ?= "taglib ivigenerator" |
| 58 | PACKAGECONFIG[taglib] = "QMAKE_EXTRA_ARGS+=-feature-taglib,QMAKE_EXTRA_ARGS+=-no-feature-taglib,taglib" | 58 | PACKAGECONFIG[taglib] = "QMAKE_EXTRA_ARGS+=-feature-taglib,QMAKE_EXTRA_ARGS+=-no-feature-taglib,taglib" |
| 59 | PACKAGECONFIG[dlt] = "QMAKE_EXTRA_ARGS+=-feature-dlt,QMAKE_EXTRA_ARGS+=-no-feature-dlt,dlt-daemon" | 59 | PACKAGECONFIG[dlt] = "QMAKE_EXTRA_ARGS+=-feature-dlt,QMAKE_EXTRA_ARGS+=-no-feature-dlt,dlt-daemon" |
| 60 | PACKAGECONFIG[geniviextras-only] = "QMAKE_EXTRA_ARGS+=--geniviextras-only" | 60 | PACKAGECONFIG[geniviextras-only] = "QMAKE_EXTRA_ARGS+=--geniviextras-only" |
diff --git a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb b/recipes-qt/qt5-addons/installer-framework_2.0.3.bb index 03cba46..0ea0ec4 100644 --- a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb +++ b/recipes-qt/qt5-addons/installer-framework_2.0.3.bb | |||
| @@ -33,7 +33,7 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" | |||
| 33 | 33 | ||
| 34 | inherit bin_package native | 34 | inherit bin_package native |
| 35 | 35 | ||
| 36 | SRC_URI = "http://ci-files02-hki.ci.local/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z" | 36 | SRC_URI = "http://ci-files02-hki.intra.qt.io/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z" |
| 37 | 37 | ||
| 38 | SRC_URI[md5sum] = "08beb5450c3938fcfd1b380f6aaec75d" | 38 | SRC_URI[md5sum] = "08beb5450c3938fcfd1b380f6aaec75d" |
| 39 | SRC_URI[sha256sum] = "91bfef896db58f28e4c2c6db437b958101a59e87aa880c38b6ddc40ebe6c38e6" | 39 | SRC_URI[sha256sum] = "91bfef896db58f28e4c2c6db437b958101a59e87aa880c38b6ddc40ebe6c38e6" |