diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-08-19 12:11:31 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-08-19 12:11:54 +0300 |
| commit | 0a6afb4a58f329ffe05ff28c05fc36bb97537b22 (patch) | |
| tree | fc3b468c0e0e2267268e08ff05d31167f9b5c1eb | |
| parent | 82d54484a66e4912a03bb6605457fde62b9f9bcd (diff) | |
| parent | 79005827c3eba2f8f60f7d3b59dbdcfcb0bcbfe0 (diff) | |
Merge remote-tracking branch 'origin/stable' into releaseQtEE_v3.1.1
* origin/stable:
New sha1 for meta-fsl-arm-extra
Fix c_rehash problem on ca-certificates
Change-Id: I5b31f97686f18562dd926d3b4c1ebefe72390265
| -rwxr-xr-x | b2qt-init-build-env | 2 | ||||
| -rw-r--r-- | recipes/ca-certificates/ca-certificates_20130610.bbappend | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index bc747b85..91b41f09 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -56,7 +56,7 @@ checkout git://git.yoctoproject.org/poky "daisy:b0ce70ffa820c8b40 checkout git://git.openembedded.org/meta-openembedded "daisy:a6dcf6265822ca1484d991d10a3042e04a960cdb" checkout git://git.yoctoproject.org/meta-ti "daisy:5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66" checkout git://git.yoctoproject.org/meta-fsl-arm "daisy:f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b" -checkout git://github.com/Freescale/meta-fsl-arm-extra "daisy:029f535cfbc5746288c6129babb2d7679927a183" +checkout git://github.com/Freescale/meta-fsl-arm-extra "daisy:6c3871ea5b0ec358e978814b5b38cef40d8dcbbc" checkout git://git.yoctoproject.org/meta-raspberrypi "daisy:cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55" checkout git://git.toradex.com/meta-toradex "V2.2:371ea626f29a2a12294ab6ea30e36743a9e2f78f" diff --git a/recipes/ca-certificates/ca-certificates_20130610.bbappend b/recipes/ca-certificates/ca-certificates_20130610.bbappend index 0964c850..723a9000 100644 --- a/recipes/ca-certificates/ca-certificates_20130610.bbappend +++ b/recipes/ca-certificates/ca-certificates_20130610.bbappend @@ -21,3 +21,4 @@ ############################################################################# SRC_URI_remove = "file://0001-update-ca-certificates-remove-c-rehash.patch" +DEPENDS_class-native = "coreutils-native" |