diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-09 10:39:31 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-13 12:38:19 +0200 |
commit | 9ff0a36249205d36bb44cc34a26cb6201180a89f (patch) | |
tree | 2c391d09df5986a748662be1fad89175e30d266b | |
parent | 6776ec35cf9b31a2fac8057f540d65ea09373a7f (diff) | |
download | meta-qt5-9ff0a36249205d36bb44cc34a26cb6201180a89f.tar.gz |
coin: update poky to 3.1_M1 from master
Change-Id: I2c4d5ce647db56ffbdee816910654609a742254a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | coin/module_config.yaml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 1da8e1ba..e467be40 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml | |||
@@ -17,10 +17,10 @@ environment: &environment | |||
17 | instructions: | 17 | instructions: |
18 | - type: EnvironmentVariable | 18 | - type: EnvironmentVariable |
19 | variableName: POKY_SHA1 | 19 | variableName: POKY_SHA1 |
20 | variableValue: 835f7eac0610325e906591cd81890bebe8627580 | 20 | variableValue: 1abffc542a0571f0d1512b92c1a59d138cf3ea6a |
21 | - type: EnvironmentVariable | 21 | - type: EnvironmentVariable |
22 | variableName: OE_SHA1 | 22 | variableName: OE_SHA1 |
23 | variableValue: 4e0538516b1e0ef42dc79bd08f7895f0052063ac | 23 | variableValue: b2baaae2711d098c06423858662e29a8375fe6b8 |
24 | - type: EnvironmentVariable | 24 | - type: EnvironmentVariable |
25 | variableName: MACHINE | 25 | variableName: MACHINE |
26 | variableValue: qemuarm64 | 26 | variableValue: qemuarm64 |
@@ -155,6 +155,7 @@ build_instructions: | |||
155 | 155 | ||
156 | # EXCLUDE_FROM_WORLD | 156 | # EXCLUDE_FROM_WORLD |
157 | rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb | 157 | rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb |
158 | rm -r ${SOURCE_DIR}/recipes-python/pyqt5/python-pyqt5_5.13.2.bb | ||
158 | 159 | ||
159 | bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/') | 160 | bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/') |
160 | filename: "{{.BuildDir}}/start-build" | 161 | filename: "{{.BuildDir}}/start-build" |