diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-12-07 08:49:47 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-12-07 08:49:47 +0200 |
| commit | 85e2dbf78e6ba044fea744367f16ccd1808c1810 (patch) | |
| tree | 87b31ac6c770274cf7e219c312b32d9d25af8b40 /scripts | |
| parent | 3587c4fb32e5046729608513bf4c189e846fefd4 (diff) | |
| parent | c97f13c28d29bd71c98043f709a5875606300142 (diff) | |
| download | meta-boot2qt-85e2dbf78e6ba044fea744367f16ccd1808c1810.tar.gz | |
Merge remote-tracking branch 'origin/dizzy' into dev
* origin/dizzy:
Use openembedded mirror from github
nitrogen6x: add u-boot binary back to the image
ostree: Add TLS support
ostree: patch upstream project
ostree: Add GNUPG to runtime dependencies.
Revert "Build nativesdk-ostree"
Remove unused b2qt-update-framework
Conflicts:
conf/distro/include/nitrogen6x.conf
recipes/ostree/ostree.bb
scripts/manifest.xml
scripts/manifest_fido.xml
Change-Id: Ie3884fa026fc8b8d7d05a9bff4b2beb124e4fd03
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 3 | ||||
| -rw-r--r-- | scripts/manifest_fido.xml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 6e356ab..927a2f3 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
| @@ -11,13 +11,14 @@ | |||
| 11 | <remote fetch="git://github.com/architech-boards" name="architech"/> | 11 | <remote fetch="git://github.com/architech-boards" name="architech"/> |
| 12 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> | 12 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> |
| 13 | <remote fetch="git://git.yoctoproject.org" name="intel"/> | 13 | <remote fetch="git://git.yoctoproject.org" name="intel"/> |
| 14 | <remote fetch="git://github.com/openembedded" name="oe-mirror"/> | ||
| 14 | 15 | ||
| 15 | <project name="poky" | 16 | <project name="poky" |
| 16 | remote="yocto" | 17 | remote="yocto" |
| 17 | revision="57eb677f0efe9a4060c764e8e9dfe2440d4e5eb2" | 18 | revision="57eb677f0efe9a4060c764e8e9dfe2440d4e5eb2" |
| 18 | path="sources/poky"/> | 19 | path="sources/poky"/> |
| 19 | <project name="meta-openembedded" | 20 | <project name="meta-openembedded" |
| 20 | remote="oe" | 21 | remote="oe-mirror" |
| 21 | revision="214e1801d0efc38d3b6142bdc0d8e58ca593e34c" | 22 | revision="214e1801d0efc38d3b6142bdc0d8e58ca593e34c" |
| 22 | path="sources/meta-openembedded"/> | 23 | path="sources/meta-openembedded"/> |
| 23 | <project name="meta-qt5" | 24 | <project name="meta-qt5" |
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml index 9bd0510..2a1c78e 100644 --- a/scripts/manifest_fido.xml +++ b/scripts/manifest_fido.xml | |||
| @@ -11,13 +11,14 @@ | |||
| 11 | <remote fetch="git://github.com/architech-boards" name="architech"/> | 11 | <remote fetch="git://github.com/architech-boards" name="architech"/> |
| 12 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> | 12 | <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> |
| 13 | <remote fetch="git://git.yoctoproject.org" name="intel"/> | 13 | <remote fetch="git://git.yoctoproject.org" name="intel"/> |
| 14 | <remote fetch="git://github.com/openembedded" name="oe-mirror"/> | ||
| 14 | 15 | ||
| 15 | <project name="poky" | 16 | <project name="poky" |
| 16 | remote="yocto" | 17 | remote="yocto" |
| 17 | revision="fido" | 18 | revision="fido" |
| 18 | path="sources/poky"/> | 19 | path="sources/poky"/> |
| 19 | <project name="meta-openembedded" | 20 | <project name="meta-openembedded" |
| 20 | remote="oe" | 21 | remote="oe-mirror" |
| 21 | revision="fido" | 22 | revision="fido" |
| 22 | path="sources/meta-openembedded"/> | 23 | path="sources/meta-openembedded"/> |
| 23 | <project name="meta-qt5" | 24 | <project name="meta-qt5" |