Merge remote-tracking branch 'origin/stable' into dizzy

* origin/stable:
  Update checksum for Noto fonts release 1.002
  toradex: add support for u-boot update on colibri vf
  Update Colibri-VF recpies to use latest meta-toradex (V2.3)
  Fix Linux Kernel 3.18 build with Colibri-VF
  scripts: use correct upload path
  toradex: update toradex meta layer
  Change mirror of hunspell dictionaries
  Install CJK fonts on eLinux image

Conflicts:
	conf/distro/include/colibri-vf.conf
	meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
	recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
	scripts/manifest.xml
	scripts/upload.sh

Change-Id: I38f7fc045264d13e3a1c6c4afd4e7355ac8f56c9

2 files changed, 24 insertions, 0 deletions

diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb
new file mode 100644
index 0000000..266010c
--- /dev/null
+++ b/recipes/fonts/otf-noto.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Noto Sans CJK"
+SECTION = "fonts"
+HOMEPAGE = "http://www.google.com/get/noto"
+LICENSE = "Apache-2.0"
+# see https://code.google.com/p/noto/issues/detail?id=331
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+inherit allarch fontcache
+
+SRC_URI = "http://www.google.com/get/noto/pkgs/NotoSansCJKSC-hinted.zip"
+
+SRC_URI[md5sum] = "9c59b0a684b03d3220dc05c6f7d4a097"
+SRC_URI[sha256sum] = "c815b154a57877bfc3c9baa9650f22217e509bddc73f5433f640d875ae6f35e0"
+
+do_install() {
+    install -m 0644 -d ${D}${datadir}/fonts/otf/noto
+    install -m 0644 ${WORKDIR}/*.otf ${D}${datadir}/fonts/otf/noto
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} += "${datadir}/fonts/otf/noto"
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index a038b86..c5078c2 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -51,6 +51,7 @@ RDEPENDS_${PN} = "\
         ttf-dejavu-common \
         ttf-dejavu-sans \
         dbus-session-init \
+        otf-noto \
         libmysqlclient \
         libpq \
         ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \