diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-22 15:02:09 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-22 15:56:17 +0300 |
| commit | 650460f8f125d18ae03c0622e3dd93630efb0fc7 (patch) | |
| tree | cccae5089a35efb860e9bbe0ae9c20be114bf35a /recipes/ostree | |
| parent | f668dddf1f95318b14737c6eb17dabbca213ca22 (diff) | |
| parent | 2b9e77c40609da75fa44e3376341f484e0ab0288 (diff) | |
| download | meta-boot2qt-650460f8f125d18ae03c0622e3dd93630efb0fc7.tar.gz | |
Merge remote-tracking branch 'origin/jethro' into merge
* origin/jethro:
Rename last references to b2qt-utils
Rename b2qt-utils to qtdeviceutilities
toradex: apply u-boot and flashing script changes to colibri-imx7
nitrogen6x: add Nitrogen6QP_MAX and SOMv2 support
qt5: update submodules
toradex: use latest u-boot and flashing scripts
kontron: update to SMARC-sAMX6i BSP release v2.0, RC2
Use code.qt.io with git protocol instead of codereview
Use new repo url for utils and appcontroller
kontron: patch kernel to support newer vivante drivers
Fetch only external repos for repo mirror
qt5: update submodules
Add rsync to image
Fix raspberry3 build error in perl deployment
rcar-gen2: USB fixups
ostree: Added dependency for systemd
qtquickcompiler: update revision
qtquickcompiler: update revision
Fix typo in RPi overlay config
Update meta layers
Conflicts:
conf/distro/include/toradex.inc
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
recipes/ostree/ostree.bb
recipes/samba/samba_4.1.12.bbappend
scripts/manifest_jethro.xml
Change-Id: I6b6ec105394f03fb57d8f922e358fef51de1e848
Diffstat (limited to 'recipes/ostree')
| -rw-r--r-- | recipes/ostree/ostree.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb index f38088c..75d5bd5 100644 --- a/recipes/ostree/ostree.bb +++ b/recipes/ostree/ostree.bb | |||
| @@ -49,7 +49,7 @@ SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0" | |||
| 49 | 49 | ||
| 50 | S = "${WORKDIR}/git" | 50 | S = "${WORKDIR}/git" |
| 51 | 51 | ||
| 52 | DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz" | 52 | DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd" |
| 53 | # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image. | 53 | # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image. |
| 54 | # The production image do not require bash for proper working. | 54 | # The production image do not require bash for proper working. |
| 55 | RDEPENDS_${PN} += "bash" | 55 | RDEPENDS_${PN} += "bash" |