summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-06-26 12:29:09 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-07-08 13:34:42 +0300
commit86c0596edecdac628a4ca65016040819323468e8 (patch)
tree07404af0702c6ea959eeff16c82995b66456edff
parentb18d39f2a9258dab8587e563086cdc7de08257c1 (diff)
downloadmeta-qt5-86c0596edecdac628a4ca65016040819323468e8.tar.gz
coin: update yocto to 3.1.1 (dunfell)
- update poky to 3.1.1 tag in dunfell branch - update meta-openembedded & meta-python2 to latest commits in their corresponding dunfell branches - remove unneeded USE_RUBY variable from .yaml Change-Id: Ibc2f595f75659901f473089251de96c13d599097 Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
-rw-r--r--coin/module_config.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 9b08b179..4454aa43 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -17,13 +17,13 @@ environment: &environment
17 instructions: 17 instructions:
18 - type: EnvironmentVariable 18 - type: EnvironmentVariable
19 variableName: POKY_SHA1 19 variableName: POKY_SHA1
20 variableValue: 1adc7478a0548e1ebd75d96d2b938c5852c78365 20 variableValue: febbe2944c0c4a04b85fa98fdc261186115954d8
21 - type: EnvironmentVariable 21 - type: EnvironmentVariable
22 variableName: OE_SHA1 22 variableName: OE_SHA1
23 variableValue: daa50331352c1f75da3a8ef6458ae3ddf94ef863 23 variableValue: 8a72d29e0876830ffd96b85d7d0308302eb07a5d
24 - type: EnvironmentVariable 24 - type: EnvironmentVariable
25 variableName: PYTHON2_SHA1 25 variableName: PYTHON2_SHA1
26 variableValue: 8fc9be701d430388b4c5234c97e623debd26a1df 26 variableValue: e2ef0dd8fa13d6b96e44773b09d07e4817d0a44d
27 - type: EnvironmentVariable 27 - type: EnvironmentVariable
28 variableName: MACHINE 28 variableName: MACHINE
29 variableValue: qemuarm64 29 variableValue: qemuarm64
@@ -57,6 +57,8 @@ build_instructions:
57 fileContents: | 57 fileContents: |
58 # https://github.com/shr-project/jenkins-jobs/blob/master/jenkins-job.sh 58 # https://github.com/shr-project/jenkins-jobs/blob/master/jenkins-job.sh
59 INHERIT += "reproducible_build_simple" 59 INHERIT += "reproducible_build_simple"
60 # need space for dunfell build
61 INHERIT += "rm_work"
60 # We want musl and glibc to share the same tmpfs, so instead of appending default "-${TCLIBC}" we append "fs" 62 # We want musl and glibc to share the same tmpfs, so instead of appending default "-${TCLIBC}" we append "fs"
61 TCLIBCAPPEND = "fs" 63 TCLIBCAPPEND = "fs"
62 PREFERRED_PROVIDER_udev = "systemd" 64 PREFERRED_PROVIDER_udev = "systemd"
@@ -95,8 +97,6 @@ build_instructions:
95 RDEPENDS_${PN}-dbg_pn-x11-common = "" 97 RDEPENDS_${PN}-dbg_pn-x11-common = ""
96 # to fix apm, fso-apm conflict in shr-image-all 98 # to fix apm, fso-apm conflict in shr-image-all
97 VIRTUAL-RUNTIME_apm = "fso-apm" 99 VIRTUAL-RUNTIME_apm = "fso-apm"
98 # remove qtwebkit-dev
99 USE_RUBY = ""
100 # require conf/distro/include/qt5-versions.inc 100 # require conf/distro/include/qt5-versions.inc
101 # QT5_VERSION = "5.4.0+git%" 101 # QT5_VERSION = "5.4.0+git%"
102 # for qtwebkit etc 102 # for qtwebkit etc