summaryrefslogtreecommitdiffstats
path: root/meta-ivi-common
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-14 10:54:52 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-14 10:54:52 +0100
commitb6dc44f585b839ab1a2f0133b74958037fe1cb64 (patch)
tree5025d5422e79e229c255e886cf1bd177ec11f37d /meta-ivi-common
parent88a162a657936f14e8e1ac5d6a0c3b368d0e9a45 (diff)
parent07d0d613cbca9619e3ad5361d39ae0feafbcb168 (diff)
Merge remote-tracking branch 'agl/sandbox/locust2001/rocko' into HEAD
* agl/sandbox/locust2001/rocko: (33 commits) most: remove skb_put_data patch from SRC_URI linux-linaro-qcomlt: update to kernel 4.14 dragonboard-410c: update 96boards-tools recipe dragonboard-410c: remove ACCEPT_EULA setting 00_local.conf.agl.inc: Disable GObject Introspection Data linux-ti-staging: Remove linux-dtb.inc geoclue: Remove unnecessary dependency u-boot-ota: Fix build error with gcc7 linux-firmware: Remove duplicated lines Change image type to wic.vmdk glibc: Arrange patch file netboot.bbclass: Remove image_types_uboot inheritance meta-agl-bsp/classes: Remove bbclass files rygel: Arrange rocko security-manager: Fix build error that causes gcc v7.0 cynara: Fix build error that causes gcc v7.0 libcap: Fix warning mesa: Arrange the recipe libmicrohttpd: Remove the recipe connman: Arrange patch file ... Bug-AGL: SPEC-1181 Change-Id: I8fa84553664fd3d7495b42c7198744f05eebcce0 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-ivi-common')
-rw-r--r--meta-ivi-common/recipes-test/freetype/freetype_2.8.bbappend (renamed from meta-ivi-common/recipes-test/freetype/freetype_2.7.1.bbappend)4
-rw-r--r--meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb3
-rw-r--r--meta-ivi-common/recipes-test/wayland/wayland-fits_%.bbappend5
-rw-r--r--meta-ivi-common/recipes-test/wayland/wayland-fits_git.bbappend2
4 files changed, 2 insertions, 12 deletions
diff --git a/meta-ivi-common/recipes-test/freetype/freetype_2.7.1.bbappend b/meta-ivi-common/recipes-test/freetype/freetype_2.8.bbappend
index 0593cf573..282ce784a 100644
--- a/meta-ivi-common/recipes-test/freetype/freetype_2.7.1.bbappend
+++ b/meta-ivi-common/recipes-test/freetype/freetype_2.8.bbappend
@@ -4,8 +4,8 @@ SRC_URI =+ "${SOURCEFORGE_MIRROR}/freetype/ft2demos-${PV}.tar.bz2;name=ft2demos
file://0001-Makefile-dont-build-gfx-demos.patch;patchdir=../ft2demos-${PV} \
file://0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch;patchdir=../ft2demos-${PV} \
"
-SRC_URI[ft2demos.md5sum] = "5c10cb35bec755dbd3f7999e0f97aee3"
-SRC_URI[ft2demos.sha256sum] = "d3f8a0d5a3f0d58701133458a8c1d3f97f658869f3c904b1fda447ed3b290ecd"
+SRC_URI[ft2demos.md5sum] = "61db5831e213acb843f0fc6d10186054"
+SRC_URI[ft2demos.sha256sum] = "2b6ce0d36bcb43fcc8aac07a0287982d855571ee271c3803c768e501f9c1a233"
PACKAGES =+ "${PN}-demos"
diff --git a/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb b/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb
index bd42820fc..44fabae06 100644
--- a/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb
+++ b/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb
@@ -34,9 +34,6 @@ RDEPENDS_${PN} += "\
"
# to be added, but needs LICENSE_FLAGS_WHITELIST="non-commercial"
# netperf
-# wayland-fits is broken in jethro, https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg46505.html
-# http://errors.yoctoproject.org/Errors/Details/35141/
-# wayland-fits
# FTBS, SPEC-316
# himeno
diff --git a/meta-ivi-common/recipes-test/wayland/wayland-fits_%.bbappend b/meta-ivi-common/recipes-test/wayland/wayland-fits_%.bbappend
deleted file mode 100644
index 772f81b0f..000000000
--- a/meta-ivi-common/recipes-test/wayland/wayland-fits_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# Disable GTK+ and EFL tests
-PACKAGECONFIG = ""
-
-# UInput driver is necessary on QEMU
-RDEPENDS_${PN}_append_qemux86-64 = " kernel-module-uinput"
diff --git a/meta-ivi-common/recipes-test/wayland/wayland-fits_git.bbappend b/meta-ivi-common/recipes-test/wayland/wayland-fits_git.bbappend
deleted file mode 100644
index 84c7cfdbe..000000000
--- a/meta-ivi-common/recipes-test/wayland/wayland-fits_git.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Updating to latest version is necessary for Weston >= 1.9.0
-SRCREV = "f108335e374772ae2818a30ae37fe6fcda81980f"