summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2015-08-18 03:12:01 (GMT)
committerGeorge Nita <george.nita@enea.com>2015-08-18 03:12:01 (GMT)
commitaedac614e462f2c11ea7ce7de02e5aa2267a3e3b (patch)
tree5d8cfeea89bdebb0b431572ae62f1a8fc3efaa83
parentb314259dfc9cb978bf583d1ed6e67ca04bcc4cb1 (diff)
parent4cf1db3c9cd687932e5cec4b4c632c73eb910414 (diff)
downloadmeta-intel-aedac614e462f2c11ea7ce7de02e5aa2267a3e3b.tar.gz
Merge remote-tracking branch 'origin/master' into master-enea
-rw-r--r--common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.11.bb (renamed from common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb)10
-rw-r--r--meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf2
2 files changed, 9 insertions, 3 deletions
diff --git a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.11.bb
index b98fc75..1997264 100644
--- a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb
+++ b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.11.bb
@@ -3,12 +3,18 @@ require ${COREBASE}/meta/recipes-graphics/xorg-app/xorg-app-common.inc
3SUMMARY = "Intel GPU tools" 3SUMMARY = "Intel GPU tools"
4DESCRIPTION = "Variety of small tools for testing intel graphics." 4DESCRIPTION = "Variety of small tools for testing intel graphics."
5 5
6SRC_URI[md5sum] = "1e768f2b1edc8613911b1d33bb361a7f" 6SRC_URI[md5sum] = "836e9fd084f63da2a29fe81a47eb3db8"
7SRC_URI[sha256sum] = "1de4c28ae0fe1e6c198ab559dbffcec6762798dc4adbdfdac54b2c7a9b0a1ed3" 7SRC_URI[sha256sum] = "48823450452b57c52c74e00c8c763ed7cdd0c81cc877e8c2f619f7f6c45dade4"
8 8
9LIC_FILES_CHKSUM = "file://COPYING;md5=0918806acfedc3e8c0488f2dd61616dd" 9LIC_FILES_CHKSUM = "file://COPYING;md5=0918806acfedc3e8c0488f2dd61616dd"
10 10
11inherit autotools gtk-doc
12
11DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr" 13DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr"
14RDEPENDS_${PN} += "bash"
15
16PACKAGECONFIG ??= ""
17PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind,libunwind"
12 18
13EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger --disable-dumper" 19EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger --disable-dumper"
14COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" 20COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
diff --git a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
index 994181f..d6e6216 100644
--- a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
+++ b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
@@ -8,7 +8,7 @@
8# a Shark Bay development kit. 8# a Shark Bay development kit.
9 9
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 10PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
11PREFERRED_VERSION_linux-yocto ?= "3.14%" 11PREFERRED_VERSION_linux-yocto ?= "3.19%"
12 12
13MACHINE_FEATURES += "pcbios efi va-impl-intel" 13MACHINE_FEATURES += "pcbios efi va-impl-intel"
14 14